6c3273892f
Merge branch 'sync-stable/2.2.0' into 'develop'
...
Import stable commits into develop after releasing 2.2.0
Closes #2275 , #1516 , #2257 , #2242 , #1668 , and #2236
See merge request pleroma/pleroma!3151
2020-11-17 12:40:42 +00:00
77c239f309
Import stable commits into develop after releasing 2.2.0
...
Updates the frontend bundle and syncs the changelog.
2020-11-17 15:14:25 +03:00
26b74f4c58
Added translation using Weblate (Hebrew)
2020-11-17 11:15:01 +00:00
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
10528344c7
remove PurgeExpiredActivity from Oban db config
2020-11-13 09:07:08 +03:00
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad
2020-11-11 23:28:15 +03:00
25bd64b03a
Bundled FE: Remove title tag
2020-11-11 17:17:41 +01:00
ba3f3a5a56
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
...
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social
Closes #2270
See merge request pleroma/pleroma!3115
2020-11-03 13:12:39 +00:00
179936609f
favicon: Update to pleroma logo, provided by @shpuld
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
2020-11-03 09:52:17 +01:00
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +00:00
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
bd033aba48
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 45.2% (48 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
2020-10-22 20:34:02 +00:00
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
3cb9c88837
migration and warning for RemoteIp plug rename
2020-10-13 16:44:04 +03:00
eea879eb36
Update AdminFE build to latest develop
2020-10-13 07:51:48 -05:00
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
4f3a633745
Add `backups` table
2020-10-07 18:34:28 +04:00
1ae39441e6
Migrations: Nullify old unique index on users.uri
2020-09-30 14:17:21 +02:00
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
7bc561127d
Revert citext user URI migration
...
URI paths are not actually case-insesitive, which caused migration issues
on a number of databases.
Closes #2188
2020-09-28 18:34:03 +03:00
1e0f3f8514
User search: Make uri matches case insensitive.
2020-09-25 08:56:58 +02:00
f3c62b246d
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 24.5% (26 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
2020-09-20 14:48:49 +00:00
d72970a1fc
Added translation using Weblate (Chinese (Simplified))
2020-09-20 13:18:27 +00:00
065a4dddfd
Merge branch 'stable' into stable-sync/2.1.2
2020-09-17 22:19:49 +03:00
34afc2b074
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
2020-09-17 21:22:06 +03:00
6b088ed76a
Merge branch 'issue/2089' into 'develop'
...
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
2020-09-16 12:22:48 +00:00
c74fad9e06
Apply 1 suggestion(s) to 1 file(s)
2020-09-16 03:18:50 +00:00
0b5e72ecf0
Remove `:managed_config` option.
...
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
2020-09-14 18:04:16 +03:00
3e53ab4e98
added notification constraints
2020-09-14 14:08:12 +03:00
65f4e37ee1
remove old workers in oban migrations
2020-09-13 10:04:50 +03:00
6877bad44c
Translated using Weblate (Spanish)
...
Currently translated at 20.7% (22 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
2020-09-11 23:15:02 +00:00
e3ca0a7e2d
migration to remove old cron jobs
2020-09-11 09:09:28 +03:00
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
29c1178c2b
migration fix
2020-09-10 21:50:41 +03:00
6f2d114518
use another stream function in migration
2020-09-10 21:50:41 +03:00
5381d4b78b
drop activity_expirations table
2020-09-10 21:50:41 +03:00
5ad0cc4c86
move old expirations into Oban
2020-09-10 21:50:41 +03:00
629a8de9cb
deprecation warning
...
changed namespace for activity expiration configuration
2020-09-10 21:50:41 +03:00
eca42566ba
formatting
2020-09-10 16:01:20 +03:00
e11fca88d4
migration to move tokens expiration into Oban
2020-09-10 16:01:20 +03:00
c6647c08e1
migration and changelog
2020-09-10 16:01:20 +03:00
6ec1a9ded1
Translated using Weblate (Spanish)
...
Currently translated at 9.4% (10 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
2020-09-09 10:52:44 +00:00
rinpatch