139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
79445ae5d2
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
4 years ago
d698ecef9b
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
4 years ago
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
4 years ago
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
4 years ago
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
4 years ago
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
7c060432fc
Revert "Merge branch 'marker-update-fix' into 'develop'"
...
This reverts merge request !2380
5 years ago
d8b12ffd59
Marker update migration: Don't try to update virtual field.
5 years ago
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
ad92cef844
fix Oban migration
5 years ago
e89078ac2a
User: remove source_data
5 years ago
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
19eedb3d04
User: Move public_key from source_data to own field
5 years ago
fd97b0e634
Chats: Basic implementation.
5 years ago
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
591f7015d9
update Oban package
5 years ago
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
5 years ago
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
5 years ago
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
0adaab8e75
Bump copyright dates.
5 years ago
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
e87a32bcd7
rip out fetch_initial_posts
...
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
5 years ago
d9f8941dac
Merge branch 'develop' into gun
5 years ago
6cf1958b02
moderation log: fix improperly migrated data
...
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
5 years ago
22d52f5691
same copyright date format
5 years ago
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
2d5cf0f8cd
Migrations: Make them not fail for old databases
5 years ago
cd040691bd
maked `unread_count` as virtual field
5 years ago
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
4b60d41db9
Add report notes
5 years ago
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
lain