266 commits

Author	SHA1	Message	Date
sadposter	4709928b06	thing	2020-03-03 11:14:58 +00:00
sadposter	fae0d4ba9d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-02-20 13:50:56 +00:00
Mark Felder	6a97c1b9ff	Update adminFE build	2020-02-17 15:50:45 -06:00
Mark Felder	f9eb35d48e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211	2020-02-11 10:33:41 -06:00
Mark Felder	de0fea4634	Update AdminFE build	2020-02-11 10:24:38 -06:00
lain	60de311164	Update frontend	2020-02-11 13:59:04 +01:00
sadposter	1b03dc2031	fe	2020-02-09 18:19:14 +00:00
sadposter	7de32e2c8b	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-02-09 18:12:40 +00:00
sadposter	57b3925a88	fe	2020-02-09 18:12:09 +00:00
rinpatch	f13b7878b4	Merge branch 'rename_emoji_reactios' into 'develop' ... EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181	2020-02-07 10:35:37 +00:00
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
Mark Felder	fed9b0d1e0	Update FE bundle	2020-02-06 10:59:41 -06:00
sadposter	646016c403	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-01-29 11:05:19 +00:00
sadposter	ff552c5151	FE	2020-01-29 10:56:34 +00:00
lain	f5bfb29d3b	Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9	2020-01-28 18:39:02 +01:00
sadposter	4646d3c9d6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-01-23 11:55:07 +00:00
Haelwenn (lanodan) Monnier	bd3f3756fb	Update MastoFE bundle to 2020-01-22	2020-01-22 16:00:23 +01:00
Mark Felder	2860bee604	Last AdminFE update was accidentally built from master, not develop	2020-01-21 15:09:16 -06:00
Mark Felder	bc2ebdcfd6	Update AdminFE build	2020-01-21 13:41:22 -06:00
sadposter	4e069ce537	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-01-16 16:17:56 +00:00
sadposter	5664427d6c	branch	2020-01-16 16:13:51 +00:00
Ivan Tashkinov	d1e9768e10	[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.	2020-01-15 18:38:18 +03:00
Mark Felder	fd3c23af63	Update AdminFE build	2020-01-09 10:00:15 -06:00
sadposter	6f5844cf8e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-15 14:11:26 +00:00
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	2019-12-12 18:43:21 +00:00
sadposter	803bce3668	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-12 17:48:36 +00:00
lain	756a029edf	Update frontend	2019-12-12 17:05:22 +01:00
lain	2792672793	Revert "Merge branch 'admin-scope-support-code' into 'develop'" ... This reverts merge request !2055	2019-12-12 09:37:02 +00:00
Ivan Tashkinov	84f0aec9aa	Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.	2019-12-11 19:48:00 +03:00
sadposter	8ae4ae14f3	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-04 23:20:03 +00:00
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	2019-12-02 16:26:19 +00:00
sadposter	9d29a5063c	fe	2019-11-20 09:48:05 +00:00
sadposter	d8286a122a	stickers	2019-11-20 09:46:08 +00:00
rinpatch	0fe08346db	bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7	2019-11-19 23:28:34 +03:00
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	2019-11-14 16:39:45 +07:00
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	2019-11-14 08:47:10 +00:00
sadposter	2de30812ea	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-13 00:10:01 +00:00
sadposter	c4f66db63c	fe	2019-11-13 00:09:56 +00:00
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-11-10 11:32:50 +00:00
Phil Hagelberg	274cc18e8a	Visually separate header.	2019-11-09 18:08:08 -08:00
Phil Hagelberg	1dc785b74b	Move static-fe CSS to a separate file.	2019-11-09 18:07:50 -08:00
sadposter	55cc96bcf9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-09 19:11:33 +00:00
sadposter	058467d25c	fe	2019-11-09 19:10:22 +00:00
rinpatch	3cc2437598	Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642	2019-11-09 01:49:36 +03:00
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	2019-11-08 13:27:11 +01:00
sadposter	83a9ec228e	tos	2019-10-30 09:26:23 +00:00
sadposter	e50d018bfe	fe	2019-10-29 11:01:50 +00:00
Egor Kislitsyn	b777083f3f	Add also_known_as field to Pleroma.User	2019-10-25 19:14:18 +07:00
sadposter	16107a0319	update tos	2019-10-25 12:08:34 +01:00
sadposter	85b9992f86	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-22 09:12:39 +01:00