Commit graph

791 commits

Author SHA1 Message Date
lain 8ad166e8e3 Migrations: Add accepts_chat_messages to users. 2020-07-03 12:46:28 +02:00
Mark Felder a5d611abc2 Update AdminFE build to utilize new MRF metadata 2020-07-02 10:16:19 -05:00
Mark Felder d69af7f742 Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
Mark Felder 69848d5c97 Rename notification "privacy_option" setting 2020-06-26 12:45:46 -05:00
Mark Felder fd5e797379 Simplify notification filtering settings further 2020-06-26 11:24:28 -05:00
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings 2020-06-26 10:23:19 -05:00
Mark Felder d9e4623628 Update AdminFE build 2020-06-25 14:55:00 -05:00
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings 2020-06-25 14:26:21 -05:00
lain 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
Roman Chvanikov 1471b70ef1 Merge develop 2020-06-23 20:56:55 +03:00
Alexander Strizhakov cb96c82f70
moving to mrf namespace migration fix 2020-06-23 20:28:48 +03:00
Haelwenn 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
lain 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
Maksim Pechnikov b0a40fc2e4 added verify RUM settings before start app 2020-06-22 17:27:49 +03:00
Ben Is 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
Ben Is 4f5af68b3e Added translation using Weblate (Italian) 2020-06-22 11:34:18 +00:00
rinpatch 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
Maksim Pechnikov 02a5648feb fixed migration the settings to DB 2020-06-17 09:15:35 +03:00
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
eugenijm 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
lain e1bc37d118 MigrationHelper: Move notification backfilling to own module. 2020-06-09 09:20:55 +02:00
Roman Chvanikov 604a83ae3e merge develop 2020-06-08 19:21:07 +03:00
lain 1a11f0e453 Chats: Change id to flake id. 2020-06-07 14:25:30 +02:00
Haelwenn (lanodan) Monnier 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
lain 9189b489ee Migrations: Move Notification migration code to helper 2020-06-06 15:33:02 +02:00
lain 9fa3f0b156 Notification: Change type of type to an enum. 2020-06-06 13:08:45 +02:00
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-05 16:53:56 +02:00
lain 00748e9650 ChatMessageReferences: Change seen -> unread 2020-06-04 17:14:42 +02:00
lain 7b79871e97 Migrations: Add chat_id, seen index to ChatMessageReferences
This ensures fast count of unseen messages
2020-06-03 14:34:33 +02:00
lain 1e9efcf7c3 Migrations: Fix migration module name 2020-06-03 14:27:54 +02:00
lain 7f5c5b11a5 Chats: Remove unread from the db, calculate from unseen messages. 2020-06-03 14:26:50 +02:00
lain 8edead7c1d Migration: Remove superfluous imports 2020-06-03 13:19:38 +02:00
lain 6413e06a86 Migrations: Add unique index to ChatMessageReferences. 2020-06-03 13:13:44 +02:00
lain aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller. 2020-06-03 12:30:12 +02:00
lain 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
lain 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
lain 6cd2fa2a4c Migrations: Add a migration to backfill notification types. 2020-06-02 15:13:19 +02:00
lain 904295d53b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-02 14:28:01 +02:00
lain 805ab86933 Notifications: Make notifications save their type. 2020-06-02 13:24:34 +02:00
Fristi 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
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains 2020-06-01 21:17:32 +03:00
Egor Kislitsyn 6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts 2020-06-01 17:38:57 +04:00
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-29 12:36:17 +02:00
Mark Felder d4b20c96c4 Migrate old notification settings to new variants 2020-05-28 15:34:11 -05:00
Mark Felder d28b9708d2 Update AdminFE build, re-enables emoji packs 2020-05-27 13:50:24 -05:00
rinpatch 91f73a7592 Merge branch 'notification-fixes' into 'develop'
Notification performance fixes

See merge request pleroma/pleroma!2595
2020-05-27 13:45:14 +00:00
lain 73f222d76a Migrations: Make user_id index on notifications better for query. 2020-05-27 12:56:15 +02:00
lain 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
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-25 13:57:27 +02:00
rinpatch fabc11bf9a priv/static: Add a warning discouraging admins from modifying the static files directly 2020-05-22 17:33:19 +03:00
lain 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-21 15:00:05 +02:00
Haelwenn (lanodan) Monnier c2dd4639d6
MastoFE: update to bundle-2020-05-20 2020-05-20 07:55:14 +02:00
Roman Chvanikov 1be6b3056e Use indexed split_part/3 to get a hostname rather than ts_ functions 2020-05-18 12:38:16 +03:00
Roman Chvanikov 01bd6a1e54 Merge branch 'develop' into feature/admin-api-status-count-per-instance 2020-05-18 11:56:27 +03:00
lain 9c17109765 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-17 12:14:49 +02:00
Jędrzej Tomaszewski 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
Fristi 5725e03f55 Added translation using Weblate (Dutch) 2020-05-17 07:49:01 +00:00
lain 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
lain 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
lain f012c3a202 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-15 13:33:04 +02:00
Michał Sidor 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
Michał Sidor 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
Michał Sidor c2e57f2981 Added translation using Weblate (Polish) 2020-05-14 16:07:45 +00:00
Mark Felder 3525400eb2 Sync FE static/config.json 2020-05-13 15:57:39 -05:00
Roman Chvanikov 8a383707ae Merge develop 2020-05-13 19:56:40 +03:00
Ivan Tashkinov 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
Haelwenn (lanodan) Monnier 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
lain dcb5cda324 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-12 13:13:43 +02:00
rinpatch 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
rinpatch 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
lain f6aa0b4a07 Migration: Fix typo 2020-05-11 22:03:29 +02:00
lain f71376e30e Migration: Enum.chunk is deprecated. 2020-05-11 22:00:01 +02:00
lain d8dd945a03 Markers migration: Fix migration for very large list of markers 2020-05-11 21:52:47 +02:00
lain c272669909 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-10 12:32:57 +02:00
rinpatch 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
rinpatch 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
Roman Chvanikov 942093683a Merge branch 'develop' into feature/admin-api-status-count-per-instance 2020-05-09 11:31:34 +03:00
Roman Chvanikov cbe383ae83 Update stats admin endpoint 2020-05-09 11:30:37 +03:00
Mark Felder 6a291b1834 Restore deleted icons. No idea how this happened. 2020-05-08 14:22:49 -05:00
Roman Chvanikov 0c2b09a9ba Add migration for counter_cache table update 2020-05-08 22:08:11 +03:00
Ivan Tashkinov 0e1bda55e8 PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
7a0e554daf
2020-05-08 21:33:56 +03:00
lain 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
lain 205313e541 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 11:44:30 +02:00
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03:00
lain 8bed6ea922 User, Webfinger: Remove OStatus vestiges
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03:00
rinpatch 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
Ivan Tashkinov f1bba5c787 PleromaFE bundle supporting follow request notifications.
5f90b6a384
2020-05-02 14:37:40 +03:00
Haelwenn (lanodan) Monnier c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe 2020-05-02 08:28:42 +02:00
Ivan Tashkinov 57b31e79c2 Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (with_move). 2020-05-01 17:59:29 +03:00
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
Mark Felder 3ead44a9aa Update AdminFE build in preparation for the 2.0.3 release 2020-04-29 15:49:48 -05:00
lain 1d6338f2d3 Litepub: Add ChatMessage. 2020-04-22 12:52:39 +02:00
lain 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-20 12:37:17 +02:00
Haelwenn 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
Haelwenn d698ecef9b Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs 2020-04-17 22:48:40 +00:00