Commit Graph

691 Commits (af6d01ec93a07cd896bc4f0a2c2cf437c6fd51fc)

Author SHA1 Message Date
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Mark Felder d28b9708d2 Update AdminFE build, re-enables emoji packs
4 years ago
rinpatch 91f73a7592 Merge branch 'notification-fixes' into 'develop'
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.
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
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)
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'
4 years ago
lain aeacfb2479 Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
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)
4 years ago
Michał Sidor 08f5e49395 Translated using Weblate (Polish)
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
Ivan Tashkinov 74912dd9ee PleromaFE bundle supporting `with_relationships` param.
4 years ago
Haelwenn (lanodan) Monnier 5f5681282e Translated using Weblate (French)
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'
4 years ago
rinpatch 952c6b29a1 Gettext: remove english messages and update the pot file
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 0ad89762a1 insert skeletons migration: fix for non-local locals
4 years ago
rinpatch d73e8b6b12 Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
4 years ago
Mark Felder 6a291b1834 Restore deleted icons. No idea how this happened.
4 years ago
Ivan Tashkinov 0e1bda55e8 PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
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
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
4 years ago
Ivan Tashkinov f1bba5c787 PleromaFE bundle supporting follow request notifications.
4 years ago
Haelwenn (lanodan) Monnier c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
Ivan Tashkinov 57b31e79c2 Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
4 years ago
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2
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'
4 years ago