8eecc708ef
fix wide2x emojis within nicknames
2020-07-09 09:03:24 +00:00
123352ffa1
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
2020-07-08 22:50:15 +03:00
013e2c5057
Use instances table instead of Cachex
2020-07-08 06:28:39 +02:00
4c9295adcc
Update frontend
2020-07-07 17:13:23 +02:00
f787eb1acf
Update frontend
2020-07-06 12:20:20 +02:00
30d0df8e2f
Update frontend
2020-07-06 12:17:08 +02:00
208baf157a
ActivityPub: Add new 'capabilities' to user.
2020-07-06 11:38:40 +02:00
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
465ddcfd20
migration to delete migrated tesla setting
2020-07-06 09:12:29 +03:00
8289ec67a8
Litepub: Add acceptsChatMessages to schema.
2020-07-03 13:39:21 +02:00
37fdb05058
User, Migration: Change `accepts_chat_messages` to be nullable
...
This is to model the ambiguous state of most users.
2020-07-03 13:12:23 +02:00
8ad166e8e3
Migrations: Add `accepts_chat_messages` to users.
2020-07-03 12:46:28 +02:00
a5d611abc2
Update AdminFE build to utilize new MRF metadata
2020-07-02 10:16:19 -05:00
d69af7f742
Rename user.settings column
...
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
b950fb01db
Merge branch 'develop' into refactor/notification_settings
2020-06-26 10:23:19 -05:00
d9e4623628
Update AdminFE build
2020-06-25 14:55:00 -05:00
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
88ccade1cb
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
...
admin api status count per instance
See merge request pleroma/pleroma!2500
2020-06-24 10:42:07 +00:00
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
cb96c82f70
moving to mrf namespace migration fix
2020-06-23 20:28:48 +03:00
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
b7f297f0bd
Merge branch 'issue/1798' into 'develop'
...
[#1798 ] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
2020-06-23 10:54:15 +00:00
b0a40fc2e4
added verify RUM settings before start app
2020-06-22 17:27:49 +03:00
68c812eb2e
Translated using Weblate (Italian)
...
Currently translated at 0.9% (1 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2020-06-22 11:34:18 +00:00
4f5af68b3e
Added translation using Weblate (Italian)
2020-06-22 11:34:18 +00:00
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
02a5648feb
fixed migration the settings to DB
2020-06-17 09:15:35 +03:00
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
2020-06-14 18:27:11 +03:00
e313aa0977
static-fe.css: Restore and move to /priv/static/static-fe
2020-06-12 20:42:43 +03:00
e1bc37d118
MigrationHelper: Move notification backfilling to own module.
2020-06-09 09:20:55 +02:00
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
eabf9317b5
Migrations: Add index on client_id and client_secret for apps.
...
Greatly speeds up app lookup.
2020-06-08 01:20:48 +03:00
3687788cf2
Merge branch 'notification-fixes' into 'develop'
...
Notification performance fixes
See merge request pleroma/pleroma!2595
2020-06-08 00:58:31 +03:00
1a11f0e453
Chats: Change id to flake id.
2020-06-07 14:25:30 +02:00
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
9189b489ee
Migrations: Move Notification migration code to helper
2020-06-06 15:33:02 +02:00
9fa3f0b156
Notification: Change type of `type` to an enum.
2020-06-06 13:08:45 +02:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
7b79871e97
Migrations: Add chat_id, seen index to ChatMessageReferences
...
This ensures fast count of unseen messages
2020-06-03 14:34:33 +02:00
1e9efcf7c3
Migrations: Fix migration module name
2020-06-03 14:27:54 +02:00
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
8edead7c1d
Migration: Remove superfluous imports
2020-06-03 13:19:38 +02:00
6413e06a86
Migrations: Add unique index to ChatMessageReferences.
2020-06-03 13:13:44 +02:00
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
2020-06-03 12:30:12 +02:00
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
2020-06-02 14:14:23 +00:00
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
2020-06-02 14:04:34 +00:00
6cd2fa2a4c
Migrations: Add a migration to backfill notification types.
2020-06-02 15:13:19 +02:00
904295d53b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 14:28:01 +02:00
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
81fb45a71b
Translated using Weblate (Dutch)
...
Currently translated at 29.2% (31 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
2020-06-02 08:49:35 +00:00
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
2020-06-01 17:38:57 +04:00
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-29 12:36:17 +02:00
d4b20c96c4
Migrate old notification settings to new variants
2020-05-28 15:34:11 -05:00
d28b9708d2
Update AdminFE build, re-enables emoji packs
2020-05-27 13:50:24 -05:00
91f73a7592
Merge branch 'notification-fixes' into 'develop'
...
Notification performance fixes
See merge request pleroma/pleroma!2595
2020-05-27 13:45:14 +00:00
73f222d76a
Migrations: Make user_id index on notifications better for query.
2020-05-27 12:56:15 +02:00
acba7043be
Migrations: Add index on client_id and client_secret for apps.
...
Greatly speeds up app lookup.
2020-05-26 16:46:57 +02:00
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-25 13:57:27 +02:00
fabc11bf9a
priv/static: Add a warning discouraging admins from modifying the static files directly
2020-05-22 17:33:19 +03:00
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-21 15:00:05 +02:00
c2dd4639d6
MastoFE: update to bundle-2020-05-20
2020-05-20 07:55:14 +02:00
1be6b3056e
Use indexed split_part/3 to get a hostname rather than ts_ functions
2020-05-18 12:38:16 +03:00
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
9c17109765
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-17 12:14:49 +02:00
4b6190baec
Translated using Weblate (Polish)
...
Currently translated at 65.0% (69 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-17 07:49:01 +00:00
5725e03f55
Added translation using Weblate (Dutch)
2020-05-17 07:49:01 +00:00
21c85a106c
Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'
...
PleromaFE bundle supporting `with_relationships` param
See merge request pleroma/pleroma!2530
2020-05-17 07:26:56 +00:00
aeacfb2479
Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
...
Synchronize PleromaFE settings
See merge request pleroma/pleroma!2532
2020-05-15 14:37:38 +00:00
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-15 13:33:04 +02:00
0d074751b5
Translated using Weblate (Polish)
...
Currently translated at 61.3% (65 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14 16:07:45 +00:00
08f5e49395
Translated using Weblate (Polish)
...
Currently translated at 55.6% (59 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14 16:07:45 +00:00
c2e57f2981
Added translation using Weblate (Polish)
2020-05-14 16:07:45 +00:00
3525400eb2
Sync FE static/config.json
2020-05-13 15:57:39 -05:00
8a383707ae
Merge develop
2020-05-13 19:56:40 +03:00
74912dd9ee
PleromaFE bundle supporting `with_relationships` param.
...
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49
2020-05-13 19:20:21 +03:00
5f5681282e
Translated using Weblate (French)
...
Currently translated at 100.0% (90 of 90 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
2020-05-13 13:38:40 +00:00
3a63f84c45
pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7
2020-05-13 00:33:38 +03:00
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-12 13:13:43 +02:00
2ead4e108a
Merge branch 'migration-fix-markers' into 'develop'
...
Markers migration: Fix migration for very large list of markers
See merge request pleroma/pleroma!2511
2020-05-11 22:13:08 +00:00
952c6b29a1
Gettext: remove english messages and update the pot file
...
Having an English file doesn't make any sense, since English
is the source language for error messages. Also Weblate complains about it
2020-05-12 00:40:13 +03:00
f6aa0b4a07
Migration: Fix typo
2020-05-11 22:03:29 +02:00
f71376e30e
Migration: Enum.chunk is deprecated.
2020-05-11 22:00:01 +02:00
d8dd945a03
Markers migration: Fix migration for very large list of markers
2020-05-11 21:52:47 +02:00
c272669909
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-10 12:32:57 +02:00
2ff79f9aae
insert skeletons migration: fix for non-local locals
...
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
2020-05-10 01:09:00 +03:00
0ad89762a1
insert skeletons migration: fix for non-local locals
...
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
2020-05-09 22:07:35 +03:00
d73e8b6b12
Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
...
PleromaFE bundle dropping requirement for embedded account relationships
See merge request pleroma/pleroma!2494
2020-05-09 15:30:39 +00:00
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-09 11:31:34 +03:00
cbe383ae83
Update stats admin endpoint
2020-05-09 11:30:37 +03:00
6a291b1834
Restore deleted icons. No idea how this happened.
2020-05-08 14:22:49 -05:00
0c2b09a9ba
Add migration for counter_cache table update
2020-05-08 22:08:11 +03:00
0e1bda55e8
PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
...
7a0e554daf
2020-05-08 21:33:56 +03:00
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-08 13:13:37 +02:00
b078e0567d
Merge branch 'develop' into issue/1276-2
2020-05-08 08:51:09 +03:00
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-07 15:05:40 +02:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-06 11:44:30 +02:00
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-04 10:43:20 +02:00
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
e55876409b
Deactivate local users on deletion instead of deleting the record
...
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-02 19:05:13 +03:00
f08c8d9932
pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3
2020-05-02 18:59:12 +03:00
f1bba5c787
PleromaFE bundle supporting follow request notifications.
...
5f90b6a384
2020-05-02 14:37:40 +03:00
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
2020-05-02 08:28:42 +02:00
06fbb95715
Update AdminFE build in preparation for the 2.0.3 release
2020-05-01 21:56:48 +03:00
57b31e79c2
Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
2020-05-01 17:59:29 +03:00
138e6ece1b
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-05-01 14:31:26 +03:00
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
61889e00fc
Deactivate local users on deletion instead of deleting the record
...
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-01 00:38:58 +03:00
3ead44a9aa
Update AdminFE build in preparation for the 2.0.3 release
2020-04-29 15:49:48 -05:00
1d6338f2d3
Litepub: Add ChatMessage.
2020-04-22 12:52:39 +02:00
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-20 12:37:17 +02:00
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
2020-04-18 06:59:23 +00:00
d698ecef9b
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
2020-04-17 22:48:40 +00:00
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
2020-04-17 23:57:22 +02:00
24e0db6310
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
2020-04-17 13:22:25 -05:00
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-17 15:51:24 +02:00
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
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
2020-04-17 14:32:15 +02:00
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
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-15 14:41:43 +02:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
7c060432fc
Revert "Merge branch 'marker-update-fix' into 'develop'"
...
This reverts merge request !2380
2020-04-14 16:31:30 +00:00
d8b12ffd59
Marker update migration: Don't try to update virtual field.
2020-04-14 15:06:09 +02:00
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
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
ad92cef844
fix Oban migration
2020-04-10 21:27:50 +03:00
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
d9f36965f6
pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f
2020-04-08 16:26:06 +03:00
c0a630d42f
Update AdminFE build in preparation for Pleroma 2.0.2
2020-04-08 00:29:19 +03:00
19335be24c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-06 17:50:31 +02:00
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
fd97b0e634
Chats: Basic implementation.
2020-04-02 15:19:09 +02:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
fd932b14a7
Merge branch 'update/adminfe-20200331' into 'develop'
...
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
2020-04-01 17:12:59 +00:00
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
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
219d3aaa2d
Update AdminFE build in preparation for Pleroma 2.0.2
2020-03-31 13:05:16 -05:00
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
2020-03-31 09:21:42 +03:00
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
5a34dca8ed
Add emoji support in statuses in staticfe
2020-03-23 14:03:31 +04:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
cb8236cda6
Add embeddable posts
2020-03-20 21:46:26 +04:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
9d09755291
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-16 00:15:11 +03:00
aa4407be93
Update AdminFE
2020-03-15 17:01:16 +03:00
963df689b9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
2020-03-15 16:55:00 +03:00
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
2966377cb9
Update AdminFE
2020-03-13 21:55:08 +03:00
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
a747eb6df9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
2020-03-11 06:35:26 +01:00
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
e7c49d51d7
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
2020-03-07 18:18:43 +03:00
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
15d36b7f5f
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
...
This reverts merge request !2274
2020-03-06 15:56:41 +00:00
e25bacabb1
Remove EmojiPacks from AdminFE build
...
Once more, with feeling
2020-03-06 09:54:38 -06:00
d283c9abc1
Remove emoji support from AdminFE
2020-03-06 07:53:33 -06:00
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
2020-03-05 23:41:47 +03:00
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
2a850abbeb
MastoFE: Bundle 2020-01-20
2020-02-29 06:41:13 +01:00
bdd603e9f3
Merge branch 'develop' into update/pleroma-fe-20200228
2020-02-28 16:18:09 -06:00
c28de93912
Update PleromaFE bundle for the 2.0 release
2020-02-28 16:15:12 -06:00
3d24a0917b
Update AdminFE build
...
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
2020-02-28 12:32:44 -06:00
554bc88e8a
Update AdminFE build
2020-02-25 11:08:35 -06:00
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
2020-02-24 21:46:37 +03:00
2d5cf0f8cd
Migrations: Make them not fail for old databases
2020-02-20 16:44:31 +01:00
6a97c1b9ff
Update adminFE build
2020-02-17 15:50:45 -06:00
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03:00
f9eb35d48e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
2020-02-11 10:33:41 -06:00
de0fea4634
Update AdminFE build
2020-02-11 10:24:38 -06:00
60de311164
Update frontend
2020-02-11 13:59:04 +01:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
f13b7878b4
Merge branch 'rename_emoji_reactios' into 'develop'
...
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
2020-02-07 10:35:37 +00:00
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
fed9b0d1e0
Update FE bundle
2020-02-06 10:59:41 -06:00
ba5e8a6444
Merge branch 'develop' into issue/1276
2020-01-28 21:11:13 +03:00
f5bfb29d3b
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
2020-01-28 18:39:02 +01:00
6fab5fe7f8
Merge branch 'translation/errors-french' into 'develop'
...
Translation/errors french
See merge request pleroma/pleroma!1457
2020-01-28 13:26:28 +00:00
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
bd3f3756fb
Update MastoFE bundle to 2020-01-22
2020-01-22 16:00:23 +01:00
32a643a159
Merge branch 'develop' into admin-be
2020-01-22 11:22:31 +03:00
7ee2f86d76
Revert "Update AdminFE build"
...
This reverts commit 6395ad942c
2020-01-22 08:21:35 +00:00
2860bee604
Last AdminFE update was accidentally built from master, not develop
2020-01-21 15:09:16 -06:00
bc2ebdcfd6
Update AdminFE build
2020-01-21 13:41:22 -06:00
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
d1e9768e10
[ #1478 ] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
2020-01-15 18:38:18 +03:00
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
2020-01-10 19:34:19 +03:00
6395ad942c
Update AdminFE build
2020-01-10 15:52:02 +03:00
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
fd3c23af63
Update AdminFE build
2020-01-09 10:00:15 -06:00
2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
2019-12-12 18:43:21 +00:00
756a029edf
Update frontend
2019-12-12 17:05:22 +01:00
2792672793
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
...
This reverts merge request !2055
2019-12-12 09:37:02 +00:00
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
84f0aec9aa
Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
2019-12-11 19:48:00 +03:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
2019-12-08 20:35:41 +03:00
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
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
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
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
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
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
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
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
2019-11-21 16:47:52 +03:00
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
2019-11-21 13:13:14 +00:00
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-20 15:47:11 +03:00
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
0fe08346db
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
2019-11-19 23:28:34 +03:00
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03:00
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-15 21:40:14 +03:00
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
e6d7e27bd6
Add `allow_following_move` setting to User
2019-11-12 18:45:28 +07:00
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
274cc18e8a
Visually separate header.
2019-11-09 18:08:08 -08:00
1dc785b74b
Move static-fe CSS to a separate file.
2019-11-09 18:07:50 -08:00
3cc2437598
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
2019-11-09 01:49:36 +03:00
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
57995fa8cf
fix migrate
...
update migrate
2019-11-03 20:44:59 +03:00
9d8da9ea15
Merge branch 'fix/migration-schema' into 'develop'
...
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
2019-11-02 15:07:47 +00:00
fd8099fb68
Merge branch 'develop' into issue/1276
2019-10-31 21:09:46 +03:00
e14cae25aa
Merge branch 'refactor/db-add-defaults' into 'develop'
...
Set defaults to fields with NULL values
Closes #1358
See merge request pleroma/pleroma!1914
2019-10-31 13:34:57 +00:00
1b82eb6d41
move sql (update_markers) from migrate to mix task
2019-10-30 23:22:38 +03:00
d719078699
Merge branch 'develop' into issue/1276
2019-10-30 23:07:18 +03:00
8bb6da7cd6
Remove following column from the migrations
2019-10-30 18:34:14 +03:00
c546da7cfe
Fix bookmark migration using a query with a schema
...
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
2019-10-30 12:59:14 +03:00
40d5fb6ef8
Add a migration to fix blocked follows
2019-10-30 15:52:37 +07:00
b27a92e8fa
Merge branch 'develop' into issue/1276
2019-10-29 22:23:19 +03:00
3e09b7c5ae
Fix two migrations sharing the same module name
...
This makes ecto execute only the latter one.
2019-10-29 16:56:24 +03:00
5334190056
Migrate missing follow requests
2019-10-29 19:22:34 +09:00
435d220700
Move setDefaultsToTables to past to run before notNull migrations
2019-10-28 19:17:50 +03:00
4b0893631f
Complete defaults
2019-10-28 19:16:19 +03:00
4270861085
Merge branch 'develop' into feature/move-activity
2019-10-28 15:10:47 +07:00
3c86a0ab24
Fix `SetNotNullForUsers` migration
2019-10-28 14:45:50 +07:00
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
0be9cb086b
Add migration
2019-10-27 19:29:35 +03:00
060adfd762
Merge branch 'improve-user-info-migration' into 'develop'
...
User info migration improvements
See merge request pleroma/pleroma!1887
2019-10-27 05:33:41 +00:00
fbadd36cc0
Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'
...
Add NOT NULL constraints for users table
See merge request pleroma/pleroma!1910
2019-10-27 05:32:01 +00:00
a9cadf3905
Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'
...
Add NOT NULL constraints for user_invite_tokens table
See merge request pleroma/pleroma!1909
2019-10-27 05:31:52 +00:00
4a72d39ca6
Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'
...
Add NOT NULL constraints for thread_mutes table
See merge request pleroma/pleroma!1908
2019-10-27 05:31:41 +00:00
e94144669a
Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'
...
Add NOT NULL constraints for scheduled_activities table
See merge request pleroma/pleroma!1907
2019-10-27 05:31:31 +00:00
9e084771c6
Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'
...
Add NOT NULL constraints for registrations table
See merge request pleroma/pleroma!1906
2019-10-27 05:31:21 +00:00
3ac6160299
Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'
...
Add NOT NULL constraints for push_subscriptions table
See merge request pleroma/pleroma!1905
2019-10-27 05:31:09 +00:00
26daaa9f04
Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'
...
Add NOT NULL constraints for password_reset_tokens table
See merge request pleroma/pleroma!1904
2019-10-27 05:30:59 +00:00
1fc591fcfc
Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
...
Add NOT NULL constraints for objects table
See merge request pleroma/pleroma!1903
2019-10-27 05:30:47 +00:00
8b204b4d71
Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'
...
Add NOT NULL constraints for oauth_authorizations table
See merge request pleroma/pleroma!1902
2019-10-27 05:30:36 +00:00
fe97493d91
Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'
...
Add NOT NULL constraints for oauth_tokens table
See merge request pleroma/pleroma!1901
2019-10-27 05:30:25 +00:00
84e992d85b
Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
...
Add NOT NULL constraints for notifications table
See merge request pleroma/pleroma!1900
2019-10-27 05:30:09 +00:00
19a625459b
Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
...
Add NOT NULL constraints for moderation_log table
See merge request pleroma/pleroma!1899
2019-10-27 05:29:56 +00:00
79702b54b6
Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'
...
Add NOT NULL constraints for markers table
See merge request pleroma/pleroma!1898
2019-10-27 05:29:45 +00:00
2e7e43c853
Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'
...
Add NOT NULL constraints for lists table
See merge request pleroma/pleroma!1897
2019-10-27 05:29:33 +00:00
75dab79183
Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'
...
Add NOT NULL constraints for instances table
See merge request pleroma/pleroma!1896
2019-10-27 05:29:18 +00:00
24699b991a
Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
...
Add NOT NULL constraints for filters table
See merge request pleroma/pleroma!1895
2019-10-27 05:29:05 +00:00
3ac8eb4046
Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'
...
Add NOT NULL constraints for conversation_participations table
See merge request pleroma/pleroma!1894
2019-10-27 05:28:45 +00:00
6be16b8617
Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'
...
Add NOT NULL constraints for conversation_participation_recipient_ships table
See merge request pleroma/pleroma!1893
2019-10-27 05:28:32 +00:00
b05fbc890e
Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'
...
Add NOT NULL constraints for config table
See merge request pleroma/pleroma!1892
2019-10-27 05:28:18 +00:00
8785d7ba5d
Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'
...
Add NOT NULL constraints for bookmarks table
See merge request pleroma/pleroma!1891
2019-10-27 05:28:03 +00:00
93f6f173ce
Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'
...
Add NOT NULL constraints for apps table
See merge request pleroma/pleroma!1890
2019-10-27 05:27:43 +00:00
5cb5f9a270
Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'
...
Add NOT NULL constraints for activity_expirations table
See merge request pleroma/pleroma!1889
2019-10-27 05:27:24 +00:00
175f6c8355
Add migration
2019-10-26 22:59:24 +03:00
bdb2039453
Add migration
2019-10-26 22:58:37 +03:00
f5f9197fce
Add migration
2019-10-26 22:57:43 +03:00
2e608f7cbf
Add migration
2019-10-26 22:56:48 +03:00
2810729218
Add migration
2019-10-26 22:55:29 +03:00
cf72b7649e
Add migration
2019-10-26 22:54:37 +03:00
a4cf664385
Add migration
2019-10-26 22:53:41 +03:00
776c31267f
Add migration
2019-10-26 22:52:49 +03:00
c0b0fb19c8
Add migration
2019-10-26 22:50:52 +03:00
5fece5f8bc
Put correct migration
2019-10-26 22:49:37 +03:00
d58cca5f0a
Add migration
2019-10-26 22:46:09 +03:00
cf0fa124a2
Add migration
2019-10-26 22:45:24 +03:00
13cc52dc60
Add migration
2019-10-26 22:44:42 +03:00
Dym Sohin