898 Commits (afe9c152ab757237313cc15d97855ae39768ddc1)

Author	SHA1	Message	Date
Mark Felder	433c01b370	Merge branch 'develop' into refactor/notification_settings	4 years ago
lain	88ccade1cb	Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' ... admin api status count per instance See merge request pleroma/pleroma!2500	4 years ago
Roman Chvanikov	1471b70ef1	Merge develop	4 years ago
Alexander Strizhakov	cb96c82f70	moving to mrf namespace migration fix	4 years ago
Haelwenn	c7d69e9256	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' ... Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320	4 years ago
lain	b7f297f0bd	Merge branch 'issue/1798' into 'develop' ... [#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655	4 years ago
Maksim Pechnikov	b0a40fc2e4	added verify RUM settings before start app	4 years ago
Ben Is	68c812eb2e	Translated using Weblate (Italian) ... Currently translated at 0.9% (1 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/	4 years ago
Ben Is	4f5af68b3e	Added translation using Weblate (Italian)	4 years ago
rinpatch	4ec2fb967e	Merge branch 'features/users-raw_bio' into 'develop' ... User: Add raw_bio, storing unformatted bio See merge request pleroma/pleroma!2326	4 years ago
Maksim Pechnikov	02a5648feb	fixed migration the settings to DB	4 years ago
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	4 years ago
eugenijm	b15cfc3d36	Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page	4 years ago
Haelwenn (lanodan) Monnier	e313aa0977	static-fe.css: Restore and move to /priv/static/static-fe	4 years ago
lain	e1bc37d118	MigrationHelper: Move notification backfilling to own module.	4 years ago
Roman Chvanikov	604a83ae3e	merge develop	4 years ago
lain	eabf9317b5	Migrations: Add index on client_id and client_secret for apps. ... Greatly speeds up app lookup.	4 years ago
rinpatch	3687788cf2	Merge branch 'notification-fixes' into 'develop' ... Notification performance fixes See merge request pleroma/pleroma!2595	4 years ago
lain	1a11f0e453	Chats: Change id to flake id.	4 years ago
Haelwenn (lanodan) Monnier	e1b07402ab	User: Add raw_bio, storing unformatted bio ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1643	4 years ago
lain	9189b489ee	Migrations: Move Notification migration code to helper	4 years ago
lain	9fa3f0b156	Notification: Change type of `type` to an enum.	4 years ago
lain	a8ca030d85	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	00748e9650	ChatMessageReferences: Change seen -> unread	4 years ago
lain	7b79871e97	Migrations: Add chat_id, seen index to ChatMessageReferences ... This ensures fast count of unseen messages	4 years ago
lain	1e9efcf7c3	Migrations: Fix migration module name	4 years ago
lain	7f5c5b11a5	Chats: Remove `unread` from the db, calculate from unseen messages.	4 years ago
lain	8edead7c1d	Migration: Remove superfluous imports	4 years ago
lain	6413e06a86	Migrations: Add unique index to ChatMessageReferences.	4 years ago
lain	aa22fce8f4	ChatMessageReference: Introduce and switch in chat controller.	4 years ago
lain	879304dcd9	Merge branch 'replies-domain-block' into 'develop' ... Replies domain block Closes #1650 See merge request pleroma/pleroma!2622	4 years ago
lain	2860c66e88	Merge branch 'feature/embeddable-posts' into 'develop' ... Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319	4 years ago
lain	6cd2fa2a4c	Migrations: Add a migration to backfill notification types.	4 years ago
lain	904295d53b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	805ab86933	Notifications: Make notifications save their type.	4 years ago
Fristi	81fb45a71b	Translated using Weblate (Dutch) ... Currently translated at 29.2% (31 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/	4 years ago
Alexander Strizhakov	7e6ec778d9	exclude replies on blocked domains	4 years ago
Egor Kislitsyn	6b84c62d4a	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	4 years ago
lain	af6d01ec93	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Mark Felder	d4b20c96c4	Migrate old notification settings to new variants	4 years ago
Mark Felder	d28b9708d2	Update AdminFE build, re-enables emoji packs	4 years ago
rinpatch	91f73a7592	Merge branch 'notification-fixes' into 'develop' ... Notification performance fixes See merge request pleroma/pleroma!2595	4 years ago
lain	73f222d76a	Migrations: Make user_id index on notifications better for query.	4 years ago
lain	acba7043be	Migrations: Add index on client_id and client_secret for apps. ... Greatly speeds up app lookup.	4 years ago
lain	ee35bb5ac2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	fabc11bf9a	priv/static: Add a warning discouraging admins from modifying the static files directly	4 years ago
lain	814c3e5171	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn (lanodan) Monnier	c2dd4639d6	MastoFE: update to bundle-2020-05-20	4 years ago
Roman Chvanikov	1be6b3056e	Use indexed split_part/3 to get a hostname rather than ts_ functions	4 years ago
Roman Chvanikov	01bd6a1e54	Merge branch 'develop' into feature/admin-api-status-count-per-instance	4 years ago
lain	9c17109765	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Jędrzej Tomaszewski	4b6190baec	Translated using Weblate (Polish) ... Currently translated at 65.0% (69 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/	4 years ago
Fristi	5725e03f55	Added translation using Weblate (Dutch)	4 years ago
lain	21c85a106c	Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop' ... PleromaFE bundle supporting `with_relationships` param See merge request pleroma/pleroma!2530	4 years ago
lain	aeacfb2479	Merge branch 'chore/update-fe-settings-and-docs' into 'develop' ... Synchronize PleromaFE settings See merge request pleroma/pleroma!2532	4 years ago
lain	f012c3a202	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Michał Sidor	0d074751b5	Translated using Weblate (Polish) ... Currently translated at 61.3% (65 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/	4 years ago
Michał Sidor	08f5e49395	Translated using Weblate (Polish) ... Currently translated at 55.6% (59 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/	4 years ago
Michał Sidor	c2e57f2981	Added translation using Weblate (Polish)	4 years ago
Mark Felder	3525400eb2	Sync FE static/config.json	4 years ago
Roman Chvanikov	8a383707ae	Merge develop	4 years ago
Ivan Tashkinov	74912dd9ee	PleromaFE bundle supporting `with_relationships` param. ... https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49	4 years ago
Haelwenn (lanodan) Monnier	5f5681282e	Translated using Weblate (French) ... Currently translated at 100.0% (90 of 90 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/	4 years ago
rinpatch	3a63f84c45	pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7	4 years ago
lain	dcb5cda324	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	2ead4e108a	Merge branch 'migration-fix-markers' into 'develop' ... Markers migration: Fix migration for very large list of markers See merge request pleroma/pleroma!2511	4 years ago
rinpatch	952c6b29a1	Gettext: remove english messages and update the pot file ... Having an English file doesn't make any sense, since English is the source language for error messages. Also Weblate complains about it	4 years ago
lain	f6aa0b4a07	Migration: Fix typo	4 years ago
lain	f71376e30e	Migration: Enum.chunk is deprecated.	4 years ago
lain	d8dd945a03	Markers migration: Fix migration for very large list of markers	4 years ago
lain	c272669909	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	2ff79f9aae	insert skeletons migration: fix for non-local locals ... Apparently some instances have local users with local ap_ids that are marked as local: false. Needs more investigation into how that happened. In the meantime, the skeleton migration was patched to just ignore all known ap ids, not just locals. Doesn't seem to slow down the migration too much on patch.cx Closes #1746	4 years ago
rinpatch	0ad89762a1	insert skeletons migration: fix for non-local locals ... Apparently some instances have local users with local ap_ids that are marked as local: false. Needs more investigation into how that happened. In the meantime, the skeleton migration was patched to just ignore all known ap ids, not just locals. Doesn't seem to slow down the migration too much on patch.cx Closes #1746	4 years ago
rinpatch	d73e8b6b12	Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop' ... PleromaFE bundle dropping requirement for embedded account relationships See merge request pleroma/pleroma!2494	4 years ago
Roman Chvanikov	942093683a	Merge branch 'develop' into feature/admin-api-status-count-per-instance	4 years ago
Roman Chvanikov	cbe383ae83	Update stats admin endpoint	4 years ago
Mark Felder	6a291b1834	Restore deleted icons. No idea how this happened.	4 years ago
Roman Chvanikov	0c2b09a9ba	Add migration for counter_cache table update	4 years ago
Ivan Tashkinov	0e1bda55e8	PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications. ... 7a0e554daf	4 years ago
lain	7637ef4203	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	b078e0567d	Merge branch 'develop' into issue/1276-2	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	205313e541	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	fb38b7339c	Merge branch 'develop' into issue/1276-2	4 years ago
lain	8bed6ea922	User, Webfinger: Remove OStatus vestiges ... Mainly the `magic_key` field	4 years ago
lain	c40afe5ba0	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	fe7a0d660e	Merge branch 'develop' into issue/1276-2	4 years ago
rinpatch	e55876409b	Deactivate local users on deletion instead of deleting the record ... Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687	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
rinpatch	138e6ece1b	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	4 years ago
Maksim Pechnikov	a92c713d9c	Merge branch 'develop' into issue/1276-2	4 years ago
rinpatch	61889e00fc	Deactivate local users on deletion instead of deleting the record ... Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687	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
lain	139b9d1338	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn	79445ae5d2	Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403	4 years ago
Haelwenn	d698ecef9b	Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs	4 years ago
Haelwenn (lanodan) Monnier	eb61564005	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo	4 years ago
Mark Felder	24e0db6310	pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4	4 years ago
lain	8c2c325598	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	6936854878	Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398	4 years ago
Haelwenn (lanodan) Monnier	46f051048f	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering	4 years ago
Haelwenn	a17bfb5fab	Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252	4 years ago
rinpatch	942d7467ca	Merge branch 'develop' into features/remove-user-source_data	4 years ago
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	4 years ago
lain	44bfb491ea	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	4 years ago
lain	7c060432fc	Revert "Merge branch 'marker-update-fix' into 'develop'" ... This reverts merge request !2380	4 years ago
lain	d8b12ffd59	Marker update migration: Don't try to update virtual field.	5 years ago
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	5 years ago
rinpatch	5e365448f3	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	5 years ago
Maksim Pechnikov	ad92cef844	fix Oban migration	5 years ago
Haelwenn (lanodan) Monnier	e89078ac2a	User: remove source_data	5 years ago
Haelwenn (lanodan) Monnier	9172d719cc	profile emojis in User.emoji instead of source_data	5 years ago
Haelwenn (lanodan) Monnier	62656ab259	User: Move inbox & shared_inbox to own fields	5 years ago
Haelwenn (lanodan) Monnier	19eedb3d04	User: Move public_key from source_data to own field	5 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
lain	19335be24c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	5 years ago
Ivan Tashkinov	3fa51f7272	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex	5 years ago
lain	fd97b0e634	Chats: Basic implementation.	5 years ago
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	591f7015d9	update Oban package	5 years ago
feld	fd932b14a7	Merge branch 'update/adminfe-20200331' into 'develop' ... Update AdminFE build in preparation for Pleroma 2.0.2 See merge request pleroma/pleroma!2343	5 years ago
Ivan Tashkinov	98b96e45ab	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses ... # Conflicts: # CHANGELOG.md	5 years ago
Ivan Tashkinov	2f2bd7fe72	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. ... See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.	5 years ago
Mark Felder	219d3aaa2d	Update AdminFE build in preparation for Pleroma 2.0.2	5 years ago
Ivan Tashkinov	ea9c57b26e	[#2332] Misc. improvements per code change requests.	5 years ago
Ivan Tashkinov	9c94b6a327	[#2332] Misc. fixes per code change requests.	5 years ago
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	5 years ago
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	be9d18461a	FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).	5 years ago
lain	0adaab8e75	Bump copyright dates.	5 years ago
Egor Kislitsyn	5a34dca8ed	Add emoji support in statuses in staticfe	5 years ago
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	5 years ago
Egor Kislitsyn	cb8236cda6	Add embeddable posts	5 years ago
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	5 years ago
rinpatch	9d09755291	rip out fetch_initial_posts ... Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422	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
rinpatch	e87a32bcd7	rip out fetch_initial_posts ... Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422	5 years ago
Mark Felder	2966377cb9	Update AdminFE	5 years ago
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	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
Alexander Strizhakov	d9f8941dac	Merge branch 'develop' into gun	5 years ago
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	5 years ago
rinpatch	e7c49d51d7	pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af	5 years ago
rinpatch	6cf1958b02	moderation log: fix improperly migrated data ... Some of the actions used to have a user map as a subject, which was then changed to an array of user maps. However instead of migrating old data there was just a hack to transform it every time, moreover this hack didn't include all possible actions, which resulted in crashes. This commit fixes the crashes by introducing a proper database migration for old data. Closes #1606	5 years ago
feld	15d36b7f5f	Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" ... This reverts merge request !2274	5 years ago
Mark Felder	e25bacabb1	Remove EmojiPacks from AdminFE build ... Once more, with feeling	5 years ago
Mark Felder	d283c9abc1	Remove emoji support from AdminFE	5 years ago
rinpatch	a65ee8ead6	pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd	5 years ago
Alexander Strizhakov	22d52f5691	same copyright date format	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
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	5 years ago
eugenijm	7ad5c51f23	Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope	5 years ago
lain	2d5cf0f8cd	Migrations: Make them not fail for old databases	5 years ago
Mark Felder	6a97c1b9ff	Update adminFE build	5 years ago
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	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
Maksim Pechnikov	cd040691bd	maked `unread_count` as virtual field	5 years ago
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	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
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	5 years ago
lain	f5bfb29d3b	Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9	5 years ago
lain	6fab5fe7f8	Merge branch 'translation/errors-french' into 'develop' ... Translation/errors french See merge request pleroma/pleroma!1457	5 years ago
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	5 years ago
feld	be27777156	Merge branch 'admin-be' into 'develop' ... Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976	5 years ago
Haelwenn (lanodan) Monnier	bd3f3756fb	Update MastoFE bundle to 2020-01-22	5 years ago
Alexander Strizhakov	32a643a159	Merge branch 'develop' into admin-be	5 years ago
Alexander Strizhakov	7ee2f86d76	Revert "Update AdminFE build" ... This reverts commit 6395ad942c	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
Alexander Strizhakov	503d966e9f	Merge branch 'develop' into admin-be	5 years ago
Ivan Tashkinov	d1e9768e10	[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.	5 years ago
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	5 years ago
Alexander Strizhakov	6395ad942c	Update AdminFE build	5 years ago
Ivan Tashkinov	6c94b7498b	[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.	5 years ago
Mark Felder	fd3c23af63	Update AdminFE build	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
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
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	5 years ago
Ivan Tashkinov	84f0aec9aa	Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.	5 years ago
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	5 years ago
rinpatch	d6c89068f3	HTML: Compile Scrubbers on boot ... This makes it possible to configure their behavior on OTP releases.	5 years ago