summaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2020-06-02Merge branch 'feature/embeddable-posts' into 'develop'lain
Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319
2020-06-02Translated using Weblate (Dutch)Fristi
Currently translated at 29.2% (31 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
2020-06-01Merge remote-tracking branch 'origin/develop' into feature/embeddable-postsEgor Kislitsyn
2020-05-27Update AdminFE build, re-enables emoji packsMark Felder
2020-05-27Merge branch 'notification-fixes' into 'develop'rinpatch
Notification performance fixes See merge request pleroma/pleroma!2595
2020-05-27Migrations: Make user_id index on notifications better for query.lain
2020-05-26Migrations: Add index on client_id and client_secret for apps.lain
Greatly speeds up app lookup.
2020-05-22priv/static: Add a warning discouraging admins from modifying the static ↵rinpatch
files directly
2020-05-20MastoFE: update to bundle-2020-05-20Haelwenn (lanodan) Monnier
2020-05-17Translated using Weblate (Polish)Jędrzej Tomaszewski
Currently translated at 65.0% (69 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-17Added translation using Weblate (Dutch)Fristi
2020-05-17Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'lain
PleromaFE bundle supporting `with_relationships` param See merge request pleroma/pleroma!2530
2020-05-15Merge branch 'chore/update-fe-settings-and-docs' into 'develop'lain
Synchronize PleromaFE settings See merge request pleroma/pleroma!2532
2020-05-14Translated using Weblate (Polish)Michał Sidor
Currently translated at 61.3% (65 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14Translated using Weblate (Polish)Michał Sidor
Currently translated at 55.6% (59 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14Added translation using Weblate (Polish)Michał Sidor
2020-05-13Sync FE static/config.jsonMark Felder
2020-05-13PleromaFE bundle supporting `with_relationships` param.Ivan Tashkinov
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49
2020-05-13Translated using Weblate (French)Haelwenn (lanodan) Monnier
Currently translated at 100.0% (90 of 90 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
2020-05-11Merge branch 'migration-fix-markers' into 'develop'rinpatch
Markers migration: Fix migration for very large list of markers See merge request pleroma/pleroma!2511
2020-05-12Gettext: remove english messages and update the pot filerinpatch
Having an English file doesn't make any sense, since English is the source language for error messages. Also Weblate complains about it
2020-05-11Migration: Fix typolain
2020-05-11Migration: Enum.chunk is deprecated.lain
2020-05-11Markers migration: Fix migration for very large list of markerslain
2020-05-09insert skeletons migration: fix for non-local localsrinpatch
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
2020-05-09Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'rinpatch
PleromaFE bundle dropping requirement for embedded account relationships See merge request pleroma/pleroma!2494
2020-05-08Restore deleted icons. No idea how this happened.Mark Felder
2020-05-08PleromaFE bundle dropping requirement for embedded account relationships in ↵Ivan Tashkinov
statuses / notifications. https://git.pleroma.social/pleroma/pleroma-fe/-/commit/7a0e554daf843fe9e98053e79ec0114c380ededb
2020-05-08Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-06Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-05User, Webfinger: Remove OStatus vestigeslain
Mainly the `magic_key` field
2020-05-04Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-02Deactivate local users on deletion instead of deleting the recordrinpatch
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
2020-05-02PleromaFE bundle supporting follow request notifications.Ivan Tashkinov
https://git.pleroma.social/pleroma/pleroma-fe/-/commit/5f90b6a384583a00769eeca3a6c6e2deec8bdd24
2020-05-02static-fe.css: Restore and move to /priv/static/static-feHaelwenn (lanodan) Monnier
2020-05-01Updated PleromaFE bundle to prevent notifications loading issue due to ↵Ivan Tashkinov
unsupported parameter (`with_move`).
2020-05-01Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-04-29Update AdminFE build in preparation for the 2.0.3 releaseMark Felder
2020-04-18Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'Haelwenn
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403
2020-04-17Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exsHaelwenn
2020-04-17migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, ↵Haelwenn (lanodan) Monnier
electric bongaloo
2020-04-17pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4Mark Felder
2020-04-17Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'rinpatch
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398
2020-04-17migrations/20200406100225_users_add_emoji: Fix tag to Emoji filteringHaelwenn (lanodan) Monnier
2020-04-17Merge branch 'feature/1584-client-captcha-options' into 'develop'Haelwenn
Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252
2020-04-16Merge branch 'develop' into features/remove-user-source_datarinpatch
2020-04-15added an endpoint for getting unread notification countMaksim Pechnikov
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
This reverts merge request !1877
2020-04-14Revert "Merge branch 'marker-update-fix' into 'develop'"lain
This reverts merge request !2380
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 05:05:16 +0000