paulyd/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
9909 commits 9 branches 75 tags 294 MiB
Commit graph

9909 commits

This branch
This branch
All branches
Author SHA1 Message Date
stwf
75e886b506 fix config 2020-06-03 17:32:03 -04:00
stwf
906ac57ba8 Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data 
# Conflicts:
#	lib/pleroma/web/preload/status_net.ex
 2020-06-03 17:25:53 -04:00
stwf
5677b21e82 clean up 2020-06-03 17:24:35 -04:00
stwf
3b8180d7d1 add status_net/config 2020-06-03 16:34:03 -04:00
stwf
dbcc1b105e encode data properly 2020-06-03 16:34:03 -04:00
stwf
29ae5bb771 preload data into index.html 2020-06-03 16:34:03 -04:00
stwf
aa26dc6a13 add status_net/config 2020-06-03 13:40:48 -04:00
lain
d6693a9102 Merge branch 'openapi/admin/reports' into 'develop' 
Add OpenAPI spec for AdminAPI.ReportController

See merge request pleroma/pleroma!2628
 2020-06-03 17:00:59 +00:00
Egor Kislitsyn
c16315d055
Add OpenAPI spec for AdminAPI.ReportController 2020-06-03 19:17:05 +04:00
Egor Kislitsyn
9d572f2f66
Move report actions to AdminAPI.ReportController 2020-06-03 19:17:04 +04:00
Haelwenn
18b050dfd1 Merge branch 'openapi/update-admin-api/status' into 'develop' 
Update OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2624
 2020-06-03 14:04:12 +00:00
lain
d28d88766b Merge branch 'admin-api/account-view' into 'develop' 
Use AdminAPI.StatusView in api/admin/users

Closes #1836

See merge request pleroma/pleroma!2627
 2020-06-03 11:28:56 +00:00
Egor Kislitsyn
8a43611e01
Use AdminAPI.StatusView in api/admin/users 2020-06-03 14:53:46 +04:00
lain
12c2b3b831 Merge branch 'patch-3' into 'develop' 
docs: clients.md: Add Husky

See merge request pleroma/pleroma!2626
 2020-06-03 07:18:32 +00:00
Alibek Omarov
030240ee8f docs: clients.md: Add Husky 2020-06-03 04:36:09 +00:00
feld
6c1c2cddec Merge branch 'fix/1794-hashtag-search-results' into 'develop' 
[#1794] Improvements to hashtags extraction from search query

Closes #1794

See merge request pleroma/pleroma!2611
 2020-06-02 16:30:03 +00:00
Egor Kislitsyn
7922e63825
Update OpenAPI spec for AdminAPI.StatusController 2020-06-02 19:08:09 +04:00
stwf
f73b2063f4 encode data properly 2020-06-02 10:18:06 -04:00
lain
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
lain
5da38c15cd Merge branch 'openapi/admin/oauth-apps' into 'develop' 
Add OpenAPI spec for AdminAPI.OAuthAppContoller

See merge request pleroma/pleroma!2582
 2020-06-02 14:13:24 +00:00
lain
6977500ef7 Merge branch 'tagline' into 'develop' 
Update default instance description

See merge request pleroma/pleroma!2600
 2020-06-02 14:10:53 +00:00
lain
022d975a39 Merge branch 'openapi/admin/invites' into 'develop' 
Add OpenAPI spec for AdminAPI.InviteController

See merge request pleroma/pleroma!2585
 2020-06-02 14:10:21 +00:00
lain
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
lain
cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop' 
Do not include activities of invisible users unless explicitly requested

Closes #1833

See merge request pleroma/pleroma!2620
 2020-06-02 11:32:03 +00:00
rinpatch
165a4b2a69 Do not include activities of invisible users unless explicitly requested 
Closes #1833
 2020-06-02 13:34:12 +03:00
lain
2db7a0d6b6 Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!2623
 2020-06-02 09:15:56 +00:00
Fristi
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
lain
d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop' 
another view for account in admin-fe status_show

Closes #1783

See merge request pleroma/pleroma!2543
 2020-06-02 08:49:24 +00:00
Alexander Strizhakov
19f468c5bc
replies filtering for blocked domains 2020-06-02 09:00:10 +03:00
rinpatch
6fb900a496 Merge branch 'user-updates' into 'develop' 
AccountController: Federate user account changes.

Closes pleroma-support#33 and #1801

See merge request pleroma/pleroma!2617
 2020-06-01 20:48:11 +00:00
rinpatch
d67b8a96c7 Merge branch 'only-creates-in-public-tl' into 'develop' 
TimelineController: Only return `Create` in public timelines.

Closes #1833 and #1821

See merge request pleroma/pleroma!2618
 2020-06-01 20:45:59 +00:00
Alexander Strizhakov
7e6ec778d9
exclude replies on blocked domains 2020-06-01 21:17:32 +03:00
Egor Kislitsyn
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts 2020-06-01 17:38:57 +04:00
lain
fa37bfff99 Merge branch 'default-to-hackney-again' into 'develop' 
Config: Default to Hackney again

See merge request pleroma/pleroma!2619
 2020-06-01 13:24:03 +00:00
lain
ac31f687c0 Config: Default to Hackney again 
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
 2020-06-01 13:35:39 +02:00
lain
d4d4b92f75 TimelineController: Only return Create in public timelines. 2020-06-01 13:17:56 +02:00
lain
9460983032 AccountController: Federate user account changes. 
Hotfixy commit, will be moved to the pipeline.
 2020-06-01 13:03:22 +02:00
Haelwenn
e96765df6b Merge branch 'chore/bump-hackney' into 'develop' 
mix.lock: update hackney to 1.16.0

Closes #1612

See merge request pleroma/pleroma!2614
 2020-05-30 15:51:19 +00:00
lain
beeeed5b58 Merge branch 'test/fix-config-setting-in-user-test' into 'develop' 
Fix config setting to not affect other tests

See merge request pleroma/pleroma!2615
 2020-05-30 14:03:43 +00:00
Roman Chvanikov
b973d0b2f0 Fix config setting to not affect other tests 2020-05-30 16:47:09 +03:00
rinpatch
0cb7b0ea84 hackney adapter helper: support tlsv1.3 and remove custom opts 
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
 2020-05-30 15:36:55 +03:00
lain
b004c427a0 Merge branch 'conversation-pagination' into 'develop' 
Conversation pagination

See merge request pleroma/pleroma!2601
 2020-05-30 10:02:37 +00:00
Steven Fuchs
6d4b80822b Conversation pagination 2020-05-30 10:02:37 +00:00
Ivan Tashkinov
24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test. 2020-05-30 10:29:08 +03:00
Ivan Tashkinov
78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results 2020-05-30 08:51:38 +03:00
rinpatch
d23b3701d8 Merge branch 'bugfix/csp-unproxied' into 'develop' 
http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610
 2020-05-29 21:23:49 +00:00
rinpatch
32ba2b7f9f Merge branch 'media-docs' into 'develop' 
Docs: Attachement limitations in MastoAPI differences

See merge request pleroma/pleroma!2607
 2020-05-29 21:20:36 +00:00
rinpatch
d2a1975e56 mix.lock: update hackney to 1.16.0 
Closes #1612
 2020-05-30 00:18:17 +03:00
rinpatch
109af93227 Apply suggestion to lib/pleroma/plugs/http_security_plug.ex 2020-05-29 21:15:07 +00:00
lain
f361264e1a Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop' 
fix unused var warning in streamer test

See merge request pleroma/pleroma!2612
 2020-05-29 20:31:07 +00:00