401 Commits (3b8bf8464f0d9948383ab2e21b870265aa6f8422)

Author	SHA1	Message	Date
sadposter	e18958a5d7	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
sadposter	9eede61d00	fe	4 years ago
lain	fb2d284d28	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	4 years ago
lain	c40afe5ba0	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	f08c8d9932	pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3	4 years ago
Ivan Tashkinov	f1bba5c787	PleromaFE bundle supporting follow request notifications. ... 5f90b6a384	4 years ago
Haelwenn (lanodan) Monnier	c6ddfa8f95	static-fe.css: Restore and move to /priv/static/static-fe	4 years ago
Mark Felder	06fbb95715	Update AdminFE build in preparation for the 2.0.3 release	4 years ago
Ivan Tashkinov	57b31e79c2	Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).	4 years ago
Mark Felder	3ead44a9aa	Update AdminFE build in preparation for the 2.0.3 release	4 years ago
lain	1d6338f2d3	Litepub: Add ChatMessage.	4 years ago
sadposter	eee32fd993	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	4 years ago
Mark Felder	24e0db6310	pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4	4 years ago
rinpatch	d9f36965f6	pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f	5 years ago
Mark Felder	c0a630d42f	Update AdminFE build in preparation for Pleroma 2.0.2	5 years ago
sadposter	8cec5796ae	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Mark Felder	219d3aaa2d	Update AdminFE build in preparation for Pleroma 2.0.2	5 years ago
sadposter	931d663a3a	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Egor Kislitsyn	5a34dca8ed	Add emoji support in statuses in staticfe	5 years ago
Egor Kislitsyn	cb8236cda6	Add embeddable posts	5 years ago
Mark Felder	aa4407be93	Update AdminFE	5 years ago
Haelwenn (lanodan) Monnier	963df689b9	static-fe.css: Restore from before a65ee8ea ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1616	5 years ago
Mark Felder	2966377cb9	Update AdminFE	5 years ago
Haelwenn (lanodan) Monnier	a747eb6df9	static-fe.css: Restore from before a65ee8ea ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1616	5 years ago
sadposter	5f625c9136	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
rinpatch	e7c49d51d7	pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af	5 years ago
Mark Felder	e25bacabb1	Remove EmojiPacks from AdminFE build ... Once more, with feeling	5 years ago
rinpatch	a65ee8ead6	pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd	5 years ago
sadposter	3508f698b9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	4709928b06	thing	5 years ago
Haelwenn (lanodan) Monnier	2a850abbeb	MastoFE: Bundle 2020-01-20	5 years ago
Mark Felder	bdd603e9f3	Merge branch 'develop' into update/pleroma-fe-20200228	5 years ago
Mark Felder	c28de93912	Update PleromaFE bundle for the 2.0 release	5 years ago
Mark Felder	3d24a0917b	Update AdminFE build ... - Removed Grouped Reports; API needs proper architecture/refactor - Cannot set Tesla adapter in AdminFE as it's not safe yet - Layout/rendering improvements	5 years ago
Mark Felder	554bc88e8a	Update AdminFE build	5 years ago
sadposter	fae0d4ba9d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Mark Felder	6a97c1b9ff	Update adminFE build	5 years ago
Mark Felder	f9eb35d48e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211	5 years ago
Mark Felder	de0fea4634	Update AdminFE build	5 years ago
lain	60de311164	Update frontend	5 years ago
sadposter	1b03dc2031	fe	5 years ago
sadposter	7de32e2c8b	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	57b3925a88	fe	5 years ago
rinpatch	f13b7878b4	Merge branch 'rename_emoji_reactios' into 'develop' ... EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181	5 years ago
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	5 years ago
Mark Felder	fed9b0d1e0	Update FE bundle	5 years ago
sadposter	646016c403	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	ff552c5151	FE	5 years ago
lain	f5bfb29d3b	Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9	5 years ago
sadposter	4646d3c9d6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Haelwenn (lanodan) Monnier	bd3f3756fb	Update MastoFE bundle to 2020-01-22	5 years ago
Mark Felder	2860bee604	Last AdminFE update was accidentally built from master, not develop	5 years ago
Mark Felder	bc2ebdcfd6	Update AdminFE build	5 years ago
sadposter	4e069ce537	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	5664427d6c	branch	5 years ago
Ivan Tashkinov	d1e9768e10	[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.	5 years ago
Mark Felder	fd3c23af63	Update AdminFE build	5 years ago
sadposter	6f5844cf8e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
lain	2f31cef71f	Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060	5 years ago
sadposter	803bce3668	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
lain	756a029edf	Update frontend	5 years ago
lain	2792672793	Revert "Merge branch 'admin-scope-support-code' into 'develop'" ... This reverts merge request !2055	5 years ago
Ivan Tashkinov	84f0aec9aa	Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.	5 years ago
sadposter	8ae4ae14f3	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	5 years ago
sadposter	9d29a5063c	fe	5 years ago
sadposter	d8286a122a	stickers	5 years ago
rinpatch	0fe08346db	bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	5 years ago
sadposter	2de30812ea	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	c4f66db63c	fe	5 years ago
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
Phil Hagelberg	274cc18e8a	Visually separate header.	5 years ago
Phil Hagelberg	1dc785b74b	Move static-fe CSS to a separate file.	5 years ago
sadposter	55cc96bcf9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	058467d25c	fe	5 years ago
rinpatch	3cc2437598	Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642	5 years ago
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
sadposter	83a9ec228e	tos	5 years ago
sadposter	e50d018bfe	fe	5 years ago
Egor Kislitsyn	b777083f3f	Add `also_known_as` field to Pleroma.User	5 years ago
sadposter	16107a0319	update tos	5 years ago
sadposter	85b9992f86	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	5 years ago
sadposter	1eec8d3dee	frontend	5 years ago
lain	d7f9679ff2	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
sadposter	58f9ce0deb	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
rinpatch	a502155274	Bump pleroma-fe bundle to 122323f35c	5 years ago
lain	e8395bedd2	Merge branch 'develop' into 'reactions' ... # Conflicts: # priv/static/schemas/litepub-0.1.jsonld	5 years ago
Ariadne Conill	19962d2022	clean up bundled litepub schema (closes #1303)	5 years ago
sadposter	8550e0ff0a	stickers	5 years ago
sadposter	59e6b48553	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	76c84720f7	stickers	5 years ago
lain	557223b2b5	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
Mark Felder	a562cb2c34	Update AdminFE bundle	5 years ago
Ariadne Conill	28be12b38e	update admin fe	5 years ago
lain	0aef18bcf4	Litepub Context: Add EmojiReaction.	5 years ago
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	5 years ago
sadposter	1e11b97c1b	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	5 years ago
sadposter	f82d9e1359	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	31f932bdfb	eva	5 years ago
Haelwenn (lanodan) Monnier	5820dc40fc	litepub-0.1.jsonld: Add uploadMedia	5 years ago
Haelwenn (lanodan) Monnier	646bf01608	Update AdminFE bundle	5 years ago
sadposter	63782e770b	add stickers	5 years ago
sadposter	b4512ddb6f	thing	5 years ago
sadposter	f1e1ba71ce	update tos	5 years ago
sadposter	8046440a16	update fe	5 years ago
sadposter	cc5b65bd21	add lato	5 years ago
sadposter	94076a23e4	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
rinpatch	16e6be340d	Update frontend bundle to e75ac9dd	5 years ago
sadposter	5b385962eb	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Mark Felder	24a731a9a6	Update AdminFE ... Now permits server configuration. Consider this ALPHA.	5 years ago
sadposter	8abd779bcc	TOS	5 years ago
sadposter	6f8e4f5dcf	TOS	5 years ago
sadposter	325372b1e1	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Hakaba Hitoyo	39c7bbe18f	Remove longfox emoji set	5 years ago
sadposter	32ce409514	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Egor Kislitsyn	04f18a144b	Add `listMessage` to to the JSON-LD context	5 years ago
sadposter	357b1eac0f	theme	5 years ago
sadposter	4d8f97453b	Add activity get mix task	5 years ago
sadposter	87ba9d1bab	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
lain	efad26bbb9	Update frontend.	5 years ago
sadposter	8050baf7bf	Update pleroma FE	5 years ago
sadposter	0843f3e0b6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
rinpatch	cfb5be3ced	Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop' ... Update mastofe to bundle-2019-06-26 See merge request pleroma/pleroma!1341	5 years ago
Haelwenn (lanodan) Monnier	451931d36f	Update mastofe to bundle-2019-06-26	5 years ago
sadposter	3a71016699	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Mark Felder	7b9e21e8a2	Update adminFE to latest build	5 years ago
sadposter	6f380ee337	merge	5 years ago
rinpatch	431a41b459	Update bundled pleroma-fe to c4fcdc71	5 years ago
sadposter	4cda6ed358	change panel	5 years ago
sadposter	febd2fdfd3	add emojo	5 years ago
sadposter	d19b99009b	add instance resources	5 years ago
sadposter	c0b7bc2927	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
sadposter	7f40b66d51	add emojo	5 years ago
lambda	16cb9e5f1c	Merge branch 'mascot/pleroma-tan-shy' into 'develop' ... pleroma-fox-tan-shy.png: Add another version of pleroma-tan See merge request pleroma/pleroma!1139	5 years ago
sadposter	cf2741e067	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Haelwenn (lanodan) Monnier	566a968ab3	pleroma-fox-tan-shy.png: Add another version of pleroma-tan ... Commissioned by https://shitposter.club/users/moonman and drawn by https://shpposter.club/users/Nightingalle Intended to be used when mastofe crashes out and allows to report a bug among other things. Should require a bit of modification on mastofe to use the image as it's more of a vanilla flavour thing.	5 years ago
sadposter	4c11429520	Add mayushii	5 years ago
feld	c953ae8c3d	Initial bundle of basic AdminFE ... Due to CSP headers we only allow connecting to self. If you want to host AdminFE on a separate domain without CSP headers you will be able to connect to any public Pleroma host.	5 years ago
Sadposter	fa632f9c37	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	5 years ago
Sadposter	4b521119dc	Add compressed background	5 years ago
William Pitcock	52bdfced32	update pleroma frontend	5 years ago
Ekaterina Vaartis	c26724cc55	Remove finmoji and add a way to download emojis in packs ... These packs are stored in a git repo on pleroma gitlab	6 years ago
Sadposter	c02d52c9f7	Update instance panel	6 years ago
Sadposter	b134bd83ca	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	6 years ago
Sadposter	d5e5e87d01	Update emojo	6 years ago