Commit Graph

652 Commits (e4323141056afc47c2bef7352aaca90edc467a64)

Author SHA1 Message Date
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
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
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
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
Haelwenn 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
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
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
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'
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 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
5 years ago
lain 7c060432fc Revert "Merge branch 'marker-update-fix' into 'develop'"
5 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'
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
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
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'
5 years ago
Ivan Tashkinov 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
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
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
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun
5 years ago