lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-17 15:51:24 +02:00
rinpatch
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
2020-04-17 13:40:25 +00:00
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
2020-04-17 14:32:15 +02:00
Haelwenn
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
2020-04-17 09:19:35 +00:00
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
lain
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-15 14:41:43 +02:00
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
lain
7c060432fc
Revert "Merge branch 'marker-update-fix' into 'develop'"
...
This reverts merge request !2380
2020-04-14 16:31:30 +00:00
lain
d8b12ffd59
Marker update migration: Don't try to update virtual field.
2020-04-14 15:06:09 +02:00
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
Maksim Pechnikov
ad92cef844
fix Oban migration
2020-04-10 21:27:50 +03:00
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
lain
fd97b0e634
Chats: Basic implementation.
2020-04-02 15:19:09 +02:00
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
Maksim Pechnikov
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
Ivan Tashkinov
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.
2020-04-01 19:49:09 +03:00
Ivan Tashkinov
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
2020-03-31 09:21:42 +03:00
Ivan Tashkinov
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
lain
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
rinpatch
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
2020-03-15 15:59:17 +03:00
Alexander Strizhakov
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
rinpatch
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
2020-03-07 17:00:58 +03:00
Alexander Strizhakov
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
eugenijm
7ad5c51f23
Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope
2020-02-24 21:46:37 +03:00
lain
2d5cf0f8cd
Migrations: Make them not fail for old databases
2020-02-20 16:44:31 +01:00
Maksim Pechnikov
cd040691bd
maked unread_count as virtual field
2020-02-10 09:01:45 +03:00
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
Maxim Filippov
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
rinpatch
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
2019-11-30 10:42:51 +00:00
Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
lain
f0bdbe3f61
Migrations: Set users.following_count to NOT NULL
...
Also set following_count for local users to the correct value and for remote
users to 0.
2019-11-28 17:01:43 +01:00
Ivan Tashkinov
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
