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 |
|
|
|
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 |
|
|
|
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 |
|
rinpatch
|
990cd7ef5d
|
Merge branch 'feat/docs-otp-source-picker' into 'develop'
docs: add OTP/From source tabs to CLI tasks
See merge request pleroma/pleroma!2046
|
2019-12-09 10:27:43 +00:00 |
|
rinpatch
|
1e2bb450db
|
Merge branch 'move-api-docs' into 'develop'
Document `with_move` parameter of the notification API
See merge request pleroma/pleroma!2047
|
2019-12-09 10:16:26 +00:00 |
|
Egor Kislitsyn
|
b4027e7187
|
Document with_move parameter of the notification API
|
2019-12-09 14:46:06 +07:00 |
|
rinpatch
|
eb9ea8475b
|
docs: add OTP/From source tabs to CLI tasks
|
2019-12-09 04:07:16 +03:00 |
|
Maksim Pechnikov
|
e260a16c05
|
update docs
|
2019-12-08 22:09:15 +03:00 |
|
Maksim Pechnikov
|
dfae1d705f
|
update changelog
|
2019-12-08 21:46:20 +03:00 |
|
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
2019-12-08 21:25:26 +03:00 |
|
rinpatch
|
3c45ed4f47
|
OTP: Fix runtime upload limit config being ignored
Closes #1109
|
2019-12-08 21:08:25 +03:00 |
|
rinpatch
|
d6c89068f3
|
HTML: Compile Scrubbers on boot
This makes it possible to configure their behavior on OTP releases.
|
2019-12-08 20:35:41 +03:00 |
|
rinpatch
|
bd3aa8500c
|
OAuth token cleanup: Get rid of compile-time configuration
|
2019-12-08 20:03:33 +03:00 |
|
rinpatch
|
af5fef1f22
|
Merge branch 'fix/clause-never-matches' into 'develop'
Fix never matching clause
See merge request pleroma/pleroma!2042
|
2019-12-08 13:50:57 +00:00 |
|
rinpatch
|
a21340caa1
|
Fix never matching clause
`length/1` is only used with lists.
|
2019-12-08 16:46:18 +03:00 |
|
rinpatch
|
8404f8c8fb
|
Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
|
2019-12-08 13:07:05 +00:00 |
|
rinpatch
|
29a3f70cba
|
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
|
2019-12-08 11:23:31 +00:00 |
|
Maxim Filippov
|
cc36a8ea90
|
Fix test
|
2019-12-08 11:35:38 +03:00 |
|
Maxim Filippov
|
00c38cf28d
|
Docs
|
2019-12-08 11:29:33 +03:00 |
|
Maxim Filippov
|
a7f77785c2
|
Implement report notes destruction
|
2019-12-08 11:27:23 +03:00 |
|
Ivan Tashkinov
|
1770602747
|
[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
|
2019-12-07 17:49:53 +03:00 |
|
Ivan Tashkinov
|
40e1817f70
|
[#1427] Fixes / improvements of admin scopes support. Added tests.
|
2019-12-06 20:33:47 +03:00 |
|
rinpatch
|
6cb31edd76
|
Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
|
2019-12-06 15:36:30 +00:00 |
|
