AkkomaGang/akkoma
AkkomaGang/akkoma
13
63
Fork 84
Code Issues 162 Pull requests 12 Packages Projects 2 Releases 14 Wiki Activity
11002 commits 25 branches 107 tags 317 MiB
Commit graph

785 commits

Author SHA1 Message Date
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
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
Alex Gleason a62f17da17
Add approval_pending field to User 2020-07-12 20:27:14 -05:00
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-10 12:26:53 +02:00
lain 328062308a Update frontend 2020-07-10 11:41:10 +02:00
Haelwenn 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
Ben Is 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
Ben Is 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
lain 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
Dym Sohin ab773fa5c9 [static-fe] limit according to- and within- existing ruleset 2020-07-09 09:37:50 +00:00
lain 8594181597 Update static-fe.css 2020-07-09 09:30:15 +00:00
Dym Sohin 8eecc708ef fix wide2x emojis within nicknames 2020-07-09 09:03:24 +00:00
Ivan Tashkinov 123352ffa1 Removed unused trigram index on users. Fixed users_fts_index usage. 2020-07-08 22:50:15 +03:00
Haelwenn (lanodan) Monnier 013e2c5057
Use instances table instead of Cachex 2020-07-08 06:28:39 +02:00
lain 4c9295adcc Update frontend 2020-07-07 17:13:23 +02:00
lain f787eb1acf Update frontend 2020-07-06 12:20:20 +02:00
lain 30d0df8e2f Update frontend 2020-07-06 12:17:08 +02:00
lain 208baf157a ActivityPub: Add new 'capabilities' to user. 2020-07-06 11:38:40 +02:00
lain 74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-06 11:27:06 +02:00
Alexander Strizhakov 465ddcfd20
migration to delete migrated tesla setting 2020-07-06 09:12:29 +03:00
lain 8289ec67a8 Litepub: Add acceptsChatMessages to schema. 2020-07-03 13:39:21 +02:00
lain 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
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