aboutsummaryrefslogtreecommitdiff
path: root/priv/repo
AgeCommit message (Collapse)Author
2020-05-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-08Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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-01Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-04-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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-15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
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
2020-04-14Marker update migration: Don't try to update virtual field.lain
2020-04-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-04-10fix Oban migrationMaksim Pechnikov
2020-04-10User: remove source_dataHaelwenn (lanodan) Monnier
2020-04-10profile emojis in User.emoji instead of source_dataHaelwenn (lanodan) Monnier
2020-04-10User: Move inbox & shared_inbox to own fieldsHaelwenn (lanodan) Monnier
2020-04-10User: Move public_key from source_data to own fieldHaelwenn (lanodan) Monnier
2020-04-02Chats: Basic implementation.lain
2020-04-02Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-02update Oban packageMaksim Pechnikov
2020-04-01Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses # Conflicts: # CHANGELOG.md
2020-04-01Ability to control the output of account/pleroma/relationship in statuses in ↵Ivan Tashkinov
order to improve the rendering performance. See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-03-31[#2332] Misc. improvements per code change requests.Ivan Tashkinov
2020-03-30[#2332] Misc. fixes per code change requests.Ivan Tashkinov
2020-03-29Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-28FollowingRelationship storage & performance optimizations (state turned ↵Ivan Tashkinov
`ecto_enum`-driven integer, reorganized indices etc.).
2020-03-26Bump copyright dates.lain
2020-03-23creating trusted app from adminFE & mix taskAlexander Strizhakov
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-15rip out fetch_initial_postsrinpatch
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
2020-03-09Merge branch 'develop' into gunAlexander Strizhakov
2020-03-07moderation log: fix improperly migrated datarinpatch
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
2020-03-04same copyright date formatAlexander Strizhakov
2020-02-25Merge branch 'develop' into issue/1276Maksim Pechnikov