rinpatch
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
Guy Sheffer
26b74f4c58
Added translation using Weblate (Hebrew)
2020-11-17 11:15:01 +00:00
lain
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
Ilja
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
Maksim Pechnikov
1830b6aae5
added error messages for posix error code
2020-11-13 15:21:59 +03:00
Alexander Strizhakov
10528344c7
remove PurgeExpiredActivity from Oban db config
2020-11-13 09:07:08 +03:00
rinpatch
b4c6b262d6
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad
2020-11-11 23:28:15 +03:00
lain
25bd64b03a
Bundled FE: Remove title tag
2020-11-11 17:17:41 +01:00
Alexander Strizhakov
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
lain
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
Haelwenn (lanodan) Monnier
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
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
Haelwenn
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
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
shironeko
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
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
Mark Felder
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
Mark Felder
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
Mark Felder
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
Mark Felder
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
Mark Felder
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
Alexander Strizhakov
3cb9c88837
migration and warning for RemoteIp plug rename
2020-10-13 16:44:04 +03:00
Mark Felder
eea879eb36
Update AdminFE build to latest develop
2020-10-13 07:51:48 -05:00
Mark Felder
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
Egor Kislitsyn
4f3a633745
Add `backups` table
2020-10-07 18:34:28 +04:00
lain
1ae39441e6
Migrations: Nullify old unique index on users.uri
2020-09-30 14:17:21 +02:00
lain
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
rinpatch
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
lain
1e0f3f8514
User search: Make uri matches case insensitive.
2020-09-25 08:56:58 +02:00
Kana
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
Kana
d72970a1fc
Added translation using Weblate (Chinese (Simplified))
2020-09-20 13:18:27 +00:00
rinpatch
065a4dddfd
Merge branch 'stable' into stable-sync/2.1.2
2020-09-17 22:19:49 +03:00
rinpatch
34afc2b074
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
2020-09-17 21:22:06 +03:00
lain
6b088ed76a
Merge branch 'issue/2089' into 'develop'
...
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
2020-09-16 12:22:48 +00:00
Maksim
c74fad9e06
Apply 1 suggestion(s) to 1 file(s)
2020-09-16 03:18:50 +00:00
rinpatch
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
Maksim Pechnikov
3e53ab4e98
added notification constraints
2020-09-14 14:08:12 +03:00
Alexander Strizhakov
65f4e37ee1
remove old workers in oban migrations
2020-09-13 10:04:50 +03:00
tarteka
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
Alexander Strizhakov
e3ca0a7e2d
migration to remove old cron jobs
2020-09-11 09:09:28 +03:00
Alexander Strizhakov
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
Alexander Strizhakov
29c1178c2b
migration fix
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
6f2d114518
use another stream function in migration
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
5381d4b78b
drop activity_expirations table
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
5ad0cc4c86
move old expirations into Oban
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
629a8de9cb
deprecation warning
...
changed namespace for activity expiration configuration
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
eca42566ba
formatting
2020-09-10 16:01:20 +03:00
Alexander Strizhakov
e11fca88d4
migration to move tokens expiration into Oban
2020-09-10 16:01:20 +03:00
Alexander Strizhakov
c6647c08e1
migration and changelog
2020-09-10 16:01:20 +03:00
tarteka
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
tarteka
ace94bfcc8
Added translation using Weblate (Spanish)
2020-09-09 09:49:27 +00:00
rinpatch
5ef840ed9c
Merge branch 'stable' into stable-sync/2.1.1
2020-09-08 20:34:02 +03:00
rinpatch
7528a7e447
pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
2020-09-08 19:45:44 +03:00
Alexander Strizhakov
8a3d43044a
migrations for renaming gun timeout options
2020-09-07 19:59:17 +03:00
Alexander Strizhakov
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
rinpatch
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
2020-09-01 10:45:42 +03:00
Maksim Pechnikov
0d5088c2b8
remove `unread_conversation_count` from User
2020-09-01 09:37:08 +03:00
lain
0b621a834a
Chats: Add cascading delete on both referenced users.
...
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
2020-08-31 16:48:17 +02:00
lain
82bf27172c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-27 15:38:03 +02:00
Mark Felder
f1b9e3595d
Update AdminFE build in preparation for 2.1.0 release
2020-08-26 15:43:34 -05:00
lain
ea2b5c07e3
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-25 15:38:12 +02:00
rinpatch
f06444a289
Merge branch 'invisible-index' into 'develop'
...
Migrations: Add an index on the `invisible` field on users.
See merge request pleroma/pleroma!2895
2020-08-17 12:38:14 +00:00
lain
5ea752dab2
Migrations: Add an index on the `invisible` field on users.
2020-08-17 14:11:36 +02:00
Mark Felder
f510dc30b4
Update AdminFE bundle for 2.1.0 release
2020-08-14 12:48:49 -05:00
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
lain
5bcf15d553
Update frontend
2020-08-13 16:04:34 +02:00
lain
aaf7bd89a7
Migrations: Fix Logger requirements.
2020-08-13 12:32:05 +02:00
Mark Felder
b89fc1f227
Add warning to the migration
2020-08-12 11:13:24 -05:00
Alexander Strizhakov
57b455de5a
leave expirations with Create and Note types
2020-08-12 12:41:47 +03:00
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
Mark Felder
ff4e282aad
Ensure ap_id column in users table cannot be null
2020-08-11 10:27:07 -05:00
Egor Kislitsyn
304ed35743
Set `users.approval_pending` default to `false`
2020-08-11 17:21:17 +04:00
Mark Felder
024b7ce0b7
Merge branch 'develop' into fix/activity-expirations-again
2020-08-10 11:32:24 -05:00
rinpatch
15fa3b6bd8
20200802170532_fix_legacy_tags: chunk the user query
2020-08-10 11:56:37 +03:00
rinpatch
a818587467
20200802170532_fix_legacy_tags: Select only fields the migration needs
...
Selecting the full struct will break as soon as a new field is added.
2020-08-10 11:55:58 +03:00
Mark Felder
761cc5b4a2
Don't filter on local
2020-08-08 12:44:18 -05:00
Mark Felder
2e7c5fe2de
Add migration to remove invalid activity expirations
2020-08-08 12:33:37 -05:00
lain
7755f49e28
Merge branch 'migrate-legacy-tags' into 'develop'
...
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
See merge request pleroma/pleroma!2836
2020-08-05 16:03:11 +00:00
lain
474aba984f
Merge branch 'unique-app-id' into 'develop'
...
Add unique index for apps.client_id, fixes #2022
Closes #2022
See merge request pleroma/pleroma!2844
2020-08-05 09:08:50 +00:00
Mark Felder
079e410d6e
Add a migration to clean up activity_expirations table
2020-08-04 14:58:42 -05:00
Alex Gleason
184742af5e
Unique apps.client_id for new installations, fixes #2022
2020-08-04 13:31:40 -05:00
Alex Gleason
c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
2020-08-02 13:42:23 -05:00
Alex Gleason
6f44a0ee84
Add configurable registration_reason limit
2020-07-27 15:13:34 -05:00
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
Maksim Pechnikov
643664d583
added migrate old settings to new
2020-07-25 09:16:43 +03:00
Alex Gleason
c7a0016f9f
Migration to fix malformed Pleroma.Formatter config
2020-07-22 14:32:45 -05:00
Alex Gleason
67389b77af
Add AutolinkerToLinkify migration test
2020-07-22 14:32:24 -05:00
Alex Gleason
7045db5a50
Fix linkify ConfigDB migration
2020-07-22 11:38:55 -05:00
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
Alex Gleason
613e096389
Migrate :auto_linker --> Pleroma.Formatter in ConfigDB
2020-07-16 16:35:03 -05:00
Alex Gleason
02cc42e72c
Squash User approval migrations
2020-07-15 17:08:46 -05:00
Mark Felder
34d1d3e93e
Update FE bundle
2020-07-15 09:38:56 -05:00
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
feld
2909dc873b
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
...
[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
2020-07-14 16:48:26 +00:00
rinpatch
8d56fb6d22
Migrate in-db config after updating to Oban 2.0
2020-07-14 13:15:46 +03:00
Ivan Tashkinov
cf3f8cb72a
[ #1940 ] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
2020-07-19 21:35:57 +03:00