summaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2022-01-14Merge remote-tracking branch 'origin/stable' into mergebackAlex Gleason
2022-01-11Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdfrinpatch
2021-12-29`mix format`Ivan Tashkinov
2021-12-29Added index on [:target_id, :relationship_type] to :user_relationships ↵Ivan Tashkinov
(speeds up `Notification.exclude_blockers/_`).
2021-12-27Apps: add user_id indexAlex Gleason
2021-12-27Merge remote-tracking branch 'origin/develop' into apps-api-endpointAlex Gleason
2021-12-26MastoAPI: Profile directorymarcin mikołajczak
2021-12-25Merge branch 'account-notes' into 'develop'Alex Gleason
MastoAPI: Add user notes on accounts See merge request pleroma/pleroma!3540
2021-12-19Merge branch 'live-dashboard' into 'develop'Alex Gleason
Add Phoenix LiveDashboard See merge request pleroma/pleroma!3566
2021-12-19Merge branch 'v2-suggestions' into 'develop'Alex Gleason
V2 suggestions See merge request pleroma/pleroma!3547
2021-12-15Merge remote-tracking branch 'origin/develop' into live-dashboardlive-dashboardAlex Gleason
2021-12-15Add Phoenix LiveDashboardAlex Gleason
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-11-29Force pinned_objects to be empty, not nullNEETzsche
2021-11-26v2 Suggestions: add index on is_suggested columnAlex Gleason
2021-11-26v2 Suggestions: rudimentary API responseAlex Gleason
2021-11-21Lintmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21MastoAPI: Add user notes on accountsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-10-06Translated using Weblate (Japanese)Ryo Ueno
Currently translated at 21.6% (23 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/
2021-10-06Added translation using Weblate (Japanese)Ryo Ueno
2021-10-06Translated using Weblate (Vietnamese)Hồ Nhất Duy
Currently translated at 100.0% (106 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/vi/
2021-10-06Added translation using Weblate (Vietnamese)Hồ Nhất Duy
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 64.1% (68 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 61.3% (65 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 59.4% (63 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 55.6% (59 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 50.9% (54 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Translated using Weblate (Indonesian)@liimee
Currently translated at 4.7% (5 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/id/
2021-10-06Added translation using Weblate (Indonesian)@liimee
2021-10-06Translated using Weblate (Polish)marcin mikołajczak
Currently translated at 100.0% (104 of 104 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2021-10-06CI: Bump lint stage to elixir-1.12Haelwenn (lanodan) Monnier
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
2021-09-07Merge branch 'remove/mastofe' into 'develop'Haelwenn
Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392
2021-08-25GET /api/v1/apps endpointSean King
2021-08-13Translated using Weblate (Polish)marcin mikołajczak
Currently translated at 98.0% (102 of 104 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2021-08-13Translated using Weblate (Polish)marcin mikołajczak
Currently translated at 75.0% (78 of 104 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2021-08-09Merge branch 'poll-notification' into 'develop'Haelwenn
MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484
2021-08-09Merge branch 'simple_policy_reasons_for_instance_specific_policies' into ↵Haelwenn
'develop' Simple policy reasons for instance specific policies See merge request pleroma/pleroma!3314
2021-08-08Update PleromaFE Bundle (2.4.0)Haelwenn (lanodan) Monnier
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
2021-08-06Add database migrationsIlja
* SimplePolicy * quarentine * transparency_exclusions
2021-08-01Update AdminFE bundleHaelwenn (lanodan) Monnier
2021-07-18Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixesAlex Gleason
2021-07-17MastodonAPI: Support poll notificationAlex Gleason
2021-07-10Merge develop branch upstreamSean King
2021-06-07Merge branch 'develop' into 'fix/prune-hashtags'feld
# Conflicts: # CHANGELOG.md
2021-06-04Fix merge conflicts with upstreamSean King
2021-06-01Add RenameInstanceChat migrationRoman Chvanikov
2021-05-30Translated using Weblate (Chinese (Traditional))Snow
Currently translated at 5.6% (6 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/
2021-05-30Translated using Weblate (Chinese (Traditional))Snow
Currently translated at 0.9% (1 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hant/
2021-05-30Added translation using Weblate (Chinese (Traditional))Snow
2021-05-08migration: add on_delete: :delete_all to hashtags object_id fkfaried nawaz
2021-04-30Merge remote-tracking branch 'upstream/develop' into earmarkAlex Gleason