f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
3cfc20083e
scrubbers/default: Add ruby element and it's childs
...
This allows to format Japanese furigana (aka ruby) notation.
Present in XHTML 1.1, HTML 5 and later. Absent in XHTML 1.0, HTML 4 and earlier.
See https://www.w3.org/TR/ruby/
2020-11-25 00:40:21 +01:00
d5f5d01495
Translated using Weblate (Hebrew)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/he/
2020-11-21 18:12:07 +00:00
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
2020-11-19 20:32:32 +00:00
3c00af82dc
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:37 +00:00
137b7f9e28
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:30 +00:00
e91e2399ee
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:22 +00:00
ce11f0bc33
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:09 +00:00
ad7fc35252
Update AdminFE build to pleroma/admin-fe@5b38aea279
2020-11-17 17:01:34 -06:00
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
1830b6aae5
added error messages for posix error code
2020-11-13 15:21:59 +03: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
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
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
ace94bfcc8
Added translation using Weblate (Spanish)
2020-09-09 09:49:27 +00:00
5ef840ed9c
Merge branch 'stable' into stable-sync/2.1.1
2020-09-08 20:34:02 +03:00
7528a7e447
pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
2020-09-08 19:45:44 +03:00
8a3d43044a
migrations for renaming gun timeout options
2020-09-07 19:59:17 +03:00
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
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
0d5088c2b8
remove `unread_conversation_count` from User
2020-09-01 09:37:08 +03:00
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
82bf27172c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-27 15:38:03 +02:00
f1b9e3595d
Update AdminFE build in preparation for 2.1.0 release
2020-08-26 15:43:34 -05:00
ea2b5c07e3
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-25 15:38:12 +02:00
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
5ea752dab2
Migrations: Add an index on the `invisible` field on users.
2020-08-17 14:11:36 +02:00
f510dc30b4
Update AdminFE bundle for 2.1.0 release
2020-08-14 12:48:49 -05: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
5bcf15d553
Update frontend
2020-08-13 16:04:34 +02:00
aaf7bd89a7
Migrations: Fix Logger requirements.
2020-08-13 12:32:05 +02:00
b89fc1f227
Add warning to the migration
2020-08-12 11:13:24 -05:00
57b455de5a
leave expirations with Create and Note types
2020-08-12 12:41:47 +03:00
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
ff4e282aad
Ensure ap_id column in users table cannot be null
2020-08-11 10:27:07 -05:00
304ed35743
Set `users.approval_pending` default to `false`
2020-08-11 17:21:17 +04:00
024b7ce0b7
Merge branch 'develop' into fix/activity-expirations-again
2020-08-10 11:32:24 -05:00
15fa3b6bd8
20200802170532_fix_legacy_tags: chunk the user query
2020-08-10 11:56:37 +03:00
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
761cc5b4a2
Don't filter on local
2020-08-08 12:44:18 -05:00
2e7c5fe2de
Add migration to remove invalid activity expirations
2020-08-08 12:33:37 -05:00
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
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
079e410d6e
Add a migration to clean up activity_expirations table
2020-08-04 14:58:42 -05:00
184742af5e
Unique apps.client_id for new installations, fixes #2022
2020-08-04 13:31:40 -05:00
c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
2020-08-02 13:42:23 -05:00
6f44a0ee84
Add configurable registration_reason limit
2020-07-27 15:13:34 -05:00
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
643664d583
added migrate old settings to new
2020-07-25 09:16:43 +03:00
c7a0016f9f
Migration to fix malformed Pleroma.Formatter config
2020-07-22 14:32:45 -05:00
67389b77af
Add AutolinkerToLinkify migration test
2020-07-22 14:32:24 -05:00
7045db5a50
Fix linkify ConfigDB migration
2020-07-22 11:38:55 -05:00
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
613e096389
Migrate :auto_linker --> Pleroma.Formatter in ConfigDB
2020-07-16 16:35:03 -05:00
02cc42e72c
Squash User approval migrations
2020-07-15 17:08:46 -05:00
34d1d3e93e
Update FE bundle
2020-07-15 09:38:56 -05:00
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
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
8d56fb6d22
Migrate in-db config after updating to Oban 2.0
2020-07-14 13:15:46 +03:00
cf3f8cb72a
[ #1940 ] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
2020-07-19 21:35:57 +03:00
5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
2020-07-14 00:22:12 -05:00
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
a62f17da17
Add `approval_pending` field to User
2020-07-12 20:27:14 -05:00
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
328062308a
Update frontend
2020-07-10 11:41:10 +02:00
5ea6387572
Merge branch 'user-search-nickname-rank-boost' into 'develop'
...
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
2020-07-10 08:49:14 +00:00
b6de9b1987
Translated using Weblate (Italian)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2020-07-10 08:27:50 +00:00
11c9654a32
Translated using Weblate (Polish)
...
Currently translated at 66.0% (70 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-07-10 08:27:50 +00:00
f4469dc741
Merge branch 'features/favicons' into 'develop'
...
Add support for remote favicons
See merge request pleroma/pleroma!2261
2020-07-09 13:09:31 +00:00
ab773fa5c9
[static-fe] limit according to- and within- existing ruleset
2020-07-09 09:37:50 +00:00
8594181597
Update static-fe.css
2020-07-09 09:30:15 +00:00
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
Ivan Tashkinov