Commit graph

7789 commits

Author SHA1 Message Date
Egor Kislitsyn
ee6805850c Set log level to debug for not important messages 2019-12-11 17:47:19 +07:00
minibikini
43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
# Conflicts:
#   CHANGELOG.md
2019-12-10 13:38:25 +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
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
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
Egor Kislitsyn
84f891ea3e Add Pleroma.Utils.compile_dir/1 2019-12-09 18:23:07 +07: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
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
lain
a280be34e3 Merge branch 'fix/mrf-delete' into 'develop'
ActivityPub: Fix deletes being exempt from MRF

Closes #1461

See merge request pleroma/pleroma!2037
2019-12-06 13:48:37 +00:00
lain
e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
2019-12-06 14:25:13 +01:00
Egor Kislitsyn
a75d4a41e0 Add a test for custom runtime modules 2019-12-06 17:05:09 +07:00
Egor Kislitsyn
e4292cbfad Use Kernel.inspect/2 to print loaded custom modules 2019-12-06 15:16:39 +07:00
Egor Kislitsyn
157bceeda9 Move runtime configuration from :instance to :modules 2019-12-06 15:04:46 +07:00
rinpatch
cdff5b8267 Merge branch 'develop' into fix/mrf-delete 2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc ActivityPub: Fix deletes being exempt from MRF
Closes #1461
2019-12-05 21:45:57 +03:00
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
2019-12-05 17:16:23 +00:00
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
2019-12-05 13:34:34 +00:00
Egor Kislitsyn
1f3c452d86 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-05 20:29:25 +07:00
Egor Kislitsyn
1216b546c6 Fix credo warning 2019-12-05 20:29:17 +07:00