sadposter
|
1c44d476e7
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-09-07 09:57:00 +01: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 |
|
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 |
|
sadposter
|
7ac5f210ea
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-30 02:05:25 +01: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 |
|
sadposter
|
166db7a3b6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-24 17:04:51 +01: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 |
|
sadposter
|
735ceb2115
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-13 20:03:33 +01:00 |
|
|
|
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 |
|
sadposter
|
992deaa09b
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-01 19:32:31 +01: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 |
|
|
|
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 |
|
Alex Gleason
|
5ddf0415c4
|
Accept reason in POST /api/v1/accounts and store in DB
|
2020-07-14 00:22:12 -05:00 |
|
Mark Felder
|
80c21100db
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-13 13:32:21 -05:00 |
|
