minibikini
|
43d9c06a2a
|
Merge branch 'develop' into 'feature/custom-runtime-modules'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
lain
|
54b1b2c9c0
|
Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'
[ActivityPub] Configurable ActivityPub actor type
See merge request pleroma/pleroma!2005
|
5 years ago |
|
Hakaba Hitoyo
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
5 years ago |
|
Egor Kislitsyn
|
a37bd5c255
|
Change log level
|
5 years ago |
|
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
|
5 years ago |
|
Maksim Pechnikov
|
9dfaa0b832
|
fix loads config variable with large value from db
|
5 years ago |
|
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
|
5 years ago |
|
rinpatch
|
632dab5d30
|
Merge branch 'user-timelines-changelog' into 'develop'
Changelog: Update with user timeline change info.
See merge request pleroma/pleroma!2049
|
5 years ago |
|
rinpatch
|
f4b7f32d51
|
status search: prefer the status fetched by url over other results
|
5 years ago |
|
Egor Kislitsyn
|
b7a57d8e38
|
Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
|
5 years ago |
|
Egor Kislitsyn
|
c098dec473
|
Merge branch 'develop' into feature/custom-runtime-modules
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
lain
|
f3c2363f4a
|
Merge branch 'fix/user-list-task' into 'develop'
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
|
5 years ago |
|
lain
|
e4ea0e20b3
|
Merge branch 'issue/1342' into 'develop'
[#1342] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
|
5 years ago |
|
lain
|
4692919ea6
|
Update pleroma_api.md
|
5 years ago |
|
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
|
5 years ago |
|
lain
|
a5e28bf214
|
Merge branch 'develop' into 'fix/oauth-compile-time'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
lain
|
49110f0498
|
Merge branch 'feature/otp-configurable-scrubbers' into 'develop'
HTML: Compile Scrubbers on boot
See merge request pleroma/pleroma!2043
|
5 years ago |
|
lain
|
eb7f412b26
|
Changelog: Update with user timeline change info.
|
5 years ago |
|
Egor Kislitsyn
|
78299ab182
|
Set Plug.Logger to log at `:debug` level
|
5 years ago |
|
Egor Kislitsyn
|
ed92784e7c
|
Set Logger level to :info in prod
|
5 years ago |
|
Egor Kislitsyn
|
84f891ea3e
|
Add Pleroma.Utils.compile_dir/1
|
5 years ago |
|
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
|
5 years ago |
|
rinpatch
|
1e2bb450db
|
Merge branch 'move-api-docs' into 'develop'
Document `with_move` parameter of the notification API
See merge request pleroma/pleroma!2047
|
5 years ago |
|
Egor Kislitsyn
|
b4027e7187
|
Document `with_move` parameter of the notification API
|
5 years ago |
|
rinpatch
|
eb9ea8475b
|
docs: add OTP/From source tabs to CLI tasks
|
5 years ago |
|
Maksim Pechnikov
|
e260a16c05
|
update docs
|
5 years ago |
|
Maksim Pechnikov
|
dfae1d705f
|
update changelog
|
5 years ago |
|
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
5 years ago |
|
rinpatch
|
3c45ed4f47
|
OTP: Fix runtime upload limit config being ignored
Closes #1109
|
5 years ago |
|
rinpatch
|
d6c89068f3
|
HTML: Compile Scrubbers on boot
This makes it possible to configure their behavior on OTP releases.
|
5 years ago |
|
rinpatch
|
bd3aa8500c
|
OAuth token cleanup: Get rid of compile-time configuration
|
5 years ago |
|
rinpatch
|
af5fef1f22
|
Merge branch 'fix/clause-never-matches' into 'develop'
Fix never matching clause
See merge request pleroma/pleroma!2042
|
5 years ago |
|
rinpatch
|
a21340caa1
|
Fix never matching clause
`length/1` is only used with lists.
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
rinpatch
|
6cb31edd76
|
Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
|
5 years ago |
|
lain
|
a280be34e3
|
Merge branch 'fix/mrf-delete' into 'develop'
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
See merge request pleroma/pleroma!2037
|
5 years ago |
|
lain
|
e8cee4d9a0
|
ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
|
5 years ago |
|
Egor Kislitsyn
|
a75d4a41e0
|
Add a test for custom runtime modules
|
5 years ago |
|
Egor Kislitsyn
|
e4292cbfad
|
Use Kernel.inspect/2 to print loaded custom modules
|
5 years ago |
|
Egor Kislitsyn
|
157bceeda9
|
Move runtime configuration from `:instance` to `:modules`
|
5 years ago |
|
rinpatch
|
cdff5b8267
|
Merge branch 'develop' into fix/mrf-delete
|
5 years ago |
|
rinpatch
|
9f99640cfc
|
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
|
5 years ago |
|
lain
|
67d8df04a4
|
Merge branch '1335-user-api-id-fields-relations' into 'develop'
[#1335] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
|
5 years ago |
|
feld
|
d0bd4348b3
|
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
|
5 years ago |
|
Egor Kislitsyn
|
1f3c452d86
|
Merge branch 'develop' into feature/custom-runtime-modules
|
5 years ago |
|
Egor Kislitsyn
|
1216b546c6
|
Fix credo warning
|
5 years ago |
|
Egor Kislitsyn
|
48ae3c4347
|
Add support for custom modules
|
5 years ago |
