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 |
|
Mark Felder
|
df469b4468
|
Benchmark env uses test database so we should be able to use test.secret.exs
|
2019-12-11 12:52:57 -06: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 |
|
Egor Kislitsyn
|
1a6e30d32e
|
Update CHANGELOG
|
2019-12-11 22:32:53 +07:00 |
|
Egor Kislitsyn
|
ee6805850c
|
Set log level to debug for not important messages
|
2019-12-11 17:47:19 +07: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 |
|
|
|
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 |
|
minibikini
|
43d9c06a2a
|
Merge branch 'develop' into 'feature/custom-runtime-modules'
# Conflicts:
# CHANGELOG.md
|
2019-12-10 13:38:25 +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 |
|
Egor Kislitsyn
|
a37bd5c255
|
Change log level
|
2019-12-10 15:08:57 +07: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 |
|
Egor Kislitsyn
|
b7a57d8e38
|
Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
|
2019-12-10 00:38:01 +07:00 |
|
Egor Kislitsyn
|
c098dec473
|
Merge branch 'develop' into feature/custom-runtime-modules
|
2019-12-10 00:16:43 +07:00 |
|
rinpatch
|
d237e9b11d
|
docs: drop CentOS 7 install guide
|
2019-12-09 20:11:39 +03:00 |
|
rinpatch
|
8dbe2dfde1
|
docs: use tabs and improve grammar in OTP install guide
|
2019-12-09 20:09:47 +03:00 |
|
rinpatch
|
0a8b32a661
|
docs: remove overoptimistic OTP benefits and use tabs in migration from source
|
2019-12-09 20:08:31 +03:00 |
|
rinpatch
|
b0505b2cc7
|
docs: fix incorrect display in digest task docs
|
2019-12-09 20:07:43 +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 |
|
Egor Kislitsyn
|
78299ab182
|
Set Plug.Logger to log at :debug level
|
2019-12-09 19:12:24 +07:00 |
|
Egor Kislitsyn
|
ed92784e7c
|
Set Logger level to :info in prod
|
2019-12-09 19:11:54 +07:00 |
|
