fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-13 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
8924 commits 26 branches 107 tags 316 MiB
Commit graph

8924 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivan Tashkinov 6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests. 2020-02-27 18:46:05 +03:00
Egor Kislitsyn cb60a9c42f
Do not fail when user has no email 2020-02-27 17:27:49 +04:00
eugenijm 4ab07cf0d5 Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses 2020-02-26 22:35:57 +03:00
eugenijm e2a6a40367 Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only) 2020-02-26 20:21:38 +03:00
Alexander Strizhakov 2076c9f8c8
unnecessary groups 2020-02-26 19:50:07 +03:00
Egor Kislitsyn f446744a6a
Allow account registration without an email 2020-02-26 20:13:53 +04:00
lain fda6f35a46 Merge branch 'feat/instance-gen-improvements' into 'develop' 
small instance.gen task improvements

See merge request pleroma/pleroma!2245
 2020-02-26 08:26:16 +00:00
rinpatch 3bbfebd1c2 instance.gen task: make example instance name less confusing 
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
 2020-02-26 00:32:34 +03:00
rinpatch 359faa8645 instance.gen task: remind to transfer the config to the database after 
migrations
 2020-02-25 22:13:08 +03:00
rinpatch cfa28dee32 instance.gen task: make instance name default to the domain 2020-02-25 21:59:37 +03:00
rinpatch 8b4d1a0b29 Merge branch 'fix/dialyzer-warnings' into 'develop' 
Fix Dialyzer warnings

See merge request pleroma/pleroma!2242
 2020-02-25 18:56:37 +00:00
feld 2cd253f6d5 Merge branch 'merge/admin-fe-20200225' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2244
 2020-02-25 17:14:54 +00:00
Mark Felder 554bc88e8a Update AdminFE build 2020-02-25 11:08:35 -06:00
feld 97dae77240 Merge branch 'token-web-push-test' into 'develop' 
Add a test to ensure OAuth tokens are tied to Push subscriptions

Closes #1551

See merge request pleroma/pleroma!2241
 2020-02-25 16:06:06 +00:00
Alexander Strizhakov 6b012ddd69
some docs 2020-02-25 19:01:29 +03:00
Egor Kislitsyn 22018adae6
Fix Dialyzer warnings 2020-02-25 18:34:56 +04:00
Egor Kislitsyn c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions 2020-02-25 18:04:28 +04:00
lain 87e8d792bd Merge branch 'test-fix' into 'develop' 
Compile fix in tests

See merge request pleroma/pleroma!2239
 2020-02-25 12:26:39 +00:00
Alexander Strizhakov 3eccdd15aa
compile fix 2020-02-25 15:19:52 +03:00
lain e4804137b3 Document database default changes 2020-02-25 11:53:51 +01:00
lain f71aa644b1 Add :unnamed option to default database configuration 2020-02-25 11:53:30 +01:00
rinpatch 035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop' 
instance.gen task: fix crash when using custom static directory

Closes #1082

See merge request pleroma/pleroma!2237
 2020-02-24 20:52:10 +00:00
rinpatch 5e4fe0e8f7 instance.gen task: fix crash when using custom static directory 
Closes #1082
 2020-02-24 23:42:24 +03:00
Haelwenn 908b6ee49a Merge branch 'status-visibility-count-stats' into 'develop' 
Status count by visibility scope (`GET /api/pleroma/admin/stats` )

See merge request pleroma/pleroma!2097
 2020-02-24 19:21:29 +00:00
eugenijm 7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
lain d240ce41b5 Merge branch 'theming_your_instance' into 'develop' 
DOCS Theming your instance

See merge request pleroma/pleroma!2232
 2020-02-24 17:48:18 +00:00
Ilja c0146f4859 DOCS Theming your instance 
I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance
 2020-02-24 17:48:18 +00:00
Alexander Strizhakov 8efae966b1
open conn in separate task 2020-02-24 19:56:27 +03:00
lain 81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' 
Bugfix: return invalid when answer_data is nil

Closes #1585

See merge request pleroma/pleroma!2236
 2020-02-24 14:54:22 +00:00
Haelwenn 1e1156b645 Merge branch '1505-threads-federation' into 'develop' 
[#1505] Threads / replies federation

Closes #1505

See merge request pleroma/pleroma!2129
 2020-02-24 07:28:35 +00:00
Haelwenn (lanodan) Monnier f9fe6a9e30
Captcha: return invalid when answer_data is nil 2020-02-24 02:49:53 +01:00
Haelwenn (lanodan) Monnier ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native 2020-02-24 01:27:16 +01:00
Ivan Tashkinov 0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances. 2020-02-22 19:48:41 +03:00
feld 1961a680ec Merge branch 'fix/missing-config-settings' into 'develop' 
Add missing invites_enabled and account_activation_required settings

See merge request pleroma/pleroma!2234
 2020-02-22 15:35:33 +00:00
Mark Felder 9fe60c3b9c Add missing invites_enabled and account_activation_required settings 2020-02-22 09:29:05 -06:00
lain c05cbc47f9 Better advice for vacuuming after restoring. 2020-02-22 13:14:30 +00:00
Ivan Tashkinov 8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	CHANGELOG.md
#	config/config.exs
 2020-02-22 09:31:43 +03:00
lain 114e7b764e Merge branch 'patch-1' into 'develop' 
added why doing a vacuum after restoring a backup is so important

See merge request pleroma/pleroma!2230
 2020-02-21 19:34:45 +00:00
Igeljäger 1ed485ec1d added why doing a vacuum after restoring a backup is so important 2020-02-21 15:30:52 +00:00
Alexander Strizhakov d44f9e3b6c
fix for timeout clause 2020-02-21 16:56:55 +03:00
Alexander Strizhakov f604f9e470
hackney pool timeout 2020-02-21 14:33:55 +03:00
Alexander Strizhakov 6806df80dd
don't log info ssl messages 2020-02-21 14:28:16 +03:00
Alexander Strizhakov ad8f26c0a4
more info in Connections.checkin timout errors 2020-02-21 12:53:40 +03:00
Alexander Strizhakov a03c420b84
by default don't use gun retries 
remove conn depends on retry setting from config
 2020-02-21 12:32:42 +03:00
Alexander Strizhakov 3849bbb60d
temp using tesla from fork 2020-02-21 12:30:37 +03:00
Alexander Strizhakov 13918cb545
Merge branch 'develop' into gun 2020-02-21 10:02:37 +03:00
Haelwenn 292031f6dd Merge branch 'migration-fixes-20' into 'develop' 
Migrations: Make them not fail for old databases

See merge request pleroma/pleroma!2227
 2020-02-20 23:53:52 +00:00
Haelwenn 499d9405d5 Merge branch 'fix/gin-fuzzy' into 'develop' 
Improve GIN full text search performance

See merge request pleroma/pleroma!2228
 2020-02-20 23:52:45 +00:00
Haelwenn c5570e0493 Merge branch 'single_emoji_reaction' into 'develop' 
Single emoji reaction

Closes #1578

See merge request pleroma/pleroma!2226
 2020-02-20 23:50:40 +00:00
Mark Felder b6bb73f43e Apply database session parameter to improve GIN full text search 2020-02-20 15:34:10 -06:00