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

7831 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Hagelberg 02c3031e99 Don't log when users or objects are deleted. 2019-12-13 12:05:53 -08:00
lain 8ad6d2784c Merge branch 'uguu' into 'develop' 
Update frontend

See merge request pleroma/pleroma!2062
 2019-12-12 16:40:39 +00:00
lain 756a029edf Update frontend 2019-12-12 17:05:22 +01:00
lain f44794d273 Merge branch '1427-oauth-graceful-admin-scope' into 'develop' 
[#1427] Graceful clearance of OAuth admin scopes for non-admin users

Closes #1427

See merge request pleroma/pleroma!2061
 2019-12-12 13:26:39 +00:00
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). 
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
 2019-12-12 16:00:06 +03:00
lain 79532a7f7c Merge branch 'revert-bca1512d' into 'develop' 
Revert "Merge branch 'admin-scope-support-code' into 'develop'"

See merge request pleroma/pleroma!2059
 2019-12-12 09:46:16 +00:00
lain 2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'" 
This reverts merge request !2055
 2019-12-12 09:37:02 +00:00
lain 68a667a465 Merge branch 'test-timeout' into 'develop' 
Fix intermittent failures in federated testing

See merge request pleroma/pleroma!2058
 2019-12-12 09:31:50 +00:00
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' 
AdminAPI: Merge account views for list instance statuses

See merge request pleroma/pleroma!2054
 2019-12-12 09:28:27 +00:00
feld 2aa609db8a Merge branch 'feature/report-notes' into 'develop' 
AdminAPI: Add report notes

See merge request pleroma/pleroma!2031
 2019-12-11 23:45:44 +00:00
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
feld fd697cf209 Merge branch 'issue/1411' into 'develop' 
[#1411] /api/v1/favourites: added sorting for activites by adds to favorites

See merge request pleroma/pleroma!1991
 2019-12-11 22:37:16 +00:00
Mark Felder 0867064441 Document the favorites timeline order change 2019-12-11 15:03:54 -06:00
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411 2019-12-11 15:02:53 -06:00
stwf 63ffa0e3ed try local sheduling 2019-12-11 14:57:33 -05:00
rinpatch 92b4a1aa1b Merge branch 'chore/fast_sanitize_bump' into 'develop' 
mix.lock: update fast_sanitize

See merge request pleroma/pleroma!2056
 2019-12-11 17:57:41 +00:00
rinpatch c01b39579d mix.lock: update fast_sanitize 
the new version uses html-spec compliant fragment parsing instead of
just wrapping the fragment in the <body> tag.
 2019-12-11 20:44:45 +03:00
rinpatch bca1512dae Merge branch 'admin-scope-support-code' into 'develop' 
FE bundle updates: admin-fe and pleroma-fe

See merge request pleroma/pleroma!2055
 2019-12-11 17:38:16 +00:00
Ivan Tashkinov 84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. 2019-12-11 19:48:00 +03:00
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses 2019-12-11 18:57:36 +03:00
rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop' 
make follows take precedence over domain blocks

See merge request pleroma/pleroma!2019
 2019-12-11 09:57:00 +00:00
Sadposter 1ad96d667a remove single-step pipe 2019-12-11 09:08:20 +00:00
lain 1f498ba2bb Merge branch '1427-oauth-admin-scopes' into 'develop' 
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests

Closes #1427

See merge request pleroma/pleroma!2053
 2019-12-11 08:50:43 +00:00
Ivan Tashkinov 3920244be5 [#1427] Fixed :admin option handling in OAuthScopesPlug, added tests. 2019-12-11 11:42:02 +03:00
Sadposter 457821adb0 Apply suggestion to lib/pleroma/user.ex 2019-12-10 18:49:41 +00:00
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop' 
Do not apply http signature pipeline to the unsubscribe route

See merge request pleroma/pleroma!2052
 2019-12-10 17:25:56 +00:00
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence' 
# Conflicts:
#   lib/pleroma/user.ex
 2019-12-10 16:54:25 +00:00
Sadposter 5abee19b63 make analysis happy 2019-12-10 16:50:58 +00:00
Sadposter 25f774f7c1 format activity_pub.ex 2019-12-10 16:41:43 +00:00
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities 2019-12-10 16:40:12 +00:00
Egor Kislitsyn 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route 2019-12-10 22:36:03 +07:00
lain aac0187ec1 Merge branch '1427-oauth-admin-scopes' into 'develop' 
[#1427] OAuth admin scopes

Closes #1427

See merge request pleroma/pleroma!2025
 2019-12-10 13:44:06 +00:00
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes' 
# Conflicts:
#   CHANGELOG.md
 2019-12-10 13:34:54 +00:00
lain 54b1b2c9c0 Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop' 
[ActivityPub] Configurable ActivityPub actor type

See merge request pleroma/pleroma!2005
 2019-12-10 13:19:26 +00:00
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes 
# Conflicts:
#	CHANGELOG.md
 2019-12-10 08:55:14 +03:00
rinpatch 99623b4eca Merge branch 'fix/load_config' into 'develop' 
fixed loads a config variable with large value from db

See merge request pleroma/pleroma!2051
 2019-12-09 20:35:05 +00:00
Maksim Pechnikov 9dfaa0b832 fix loads config variable with large value from db 2019-12-09 22:29:44 +03:00
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop' 
status search: prefer the status fetched by url over other results

See merge request pleroma/pleroma!2050
 2019-12-09 17:55:48 +00:00
rinpatch 632dab5d30 Merge branch 'user-timelines-changelog' into 'develop' 
Changelog: Update with user timeline change info.

See merge request pleroma/pleroma!2049
 2019-12-09 17:50:00 +00:00
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results 2019-12-09 20:45:04 +03:00
lain 0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop' 
OTP: Fix runtime upload limit config being ignored

Closes #1109

See merge request pleroma/pleroma!2045
 2019-12-09 15:10:05 +00:00
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop' 
Fix exclude_visibilities filter for followers-only Like notifications

See merge request pleroma/pleroma!1957
 2019-12-09 14:55:42 +00:00
lain f3c2363f4a Merge branch 'fix/user-list-task' into 'develop' 
Fix `mix pleroma.user list` task

See merge request pleroma/pleroma!2029
 2019-12-09 14:44:56 +00:00
lain e4ea0e20b3 Merge branch 'issue/1342' into 'develop' 
[#1342] Added privacy option to push notifications

See merge request pleroma/pleroma!1920
 2019-12-09 14:30:35 +00:00
lain 4692919ea6 Update pleroma_api.md 2019-12-09 14:15:59 +00:00
lain 8d2ca85cea Merge branch 'fix/oauth-compile-time' into 'develop' 
OAuth token cleanup: Get rid of compile-time configuration

See merge request pleroma/pleroma!2044
 2019-12-09 13:59:35 +00:00
lain a5e28bf214 Merge branch 'develop' into 'fix/oauth-compile-time' 
# Conflicts:
#   CHANGELOG.md
 2019-12-09 13:52:01 +00:00
lain 49110f0498 Merge branch 'feature/otp-configurable-scrubbers' into 'develop' 
HTML: Compile Scrubbers on boot

See merge request pleroma/pleroma!2043
 2019-12-09 13:51:09 +00:00
lain eb7f412b26 Changelog: Update with user timeline change info. 2019-12-09 14:43:57 +01:00