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 |
|
Ivan Tashkinov
|
93a80ee915
|
[#1427] Bugfix for enforce_oauth_admin_scope_usage . Admin API documentation entry.
|
2019-12-06 16:56:23 +03: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 |
|
Maxim Filippov
|
08c89fd2b8
|
Fix incorrect report count
|
2019-12-06 17:17:24 +09: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 |
|
Maksim Pechnikov
|
22fc271e23
|
init tag feed
|
2019-12-06 09:33:40 +03:00 |
|
Ivan Tashkinov
|
13926537b6
|
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
|
2019-12-06 00:26:31 +03:00 |
|
Ivan Tashkinov
|
af42c00cff
|
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
|
2019-12-06 00:25:44 +03: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 |
|
Egor Kislitsyn
|
48ae3c4347
|
Add support for custom modules
|
2019-12-05 20:18:25 +07:00 |
|
Maksim Pechnikov
|
3fe7a1fd35
|
Merge branch 'develop' into issue/1342
|
2019-12-05 15:46:27 +03:00 |
|
Maksim Pechnikov
|
e21afdb7c7
|
Merge branch 'develop' into issue/1411
|
2019-12-05 12:18:59 +03:00 |
|
Egor Kislitsyn
|
d4953474ac
|
Merge branch 'develop' into improve-move-notificaions-api
|
2019-12-05 14:55:48 +07:00 |
|
Maxim Filippov
|
4453a9cb73
|
Add failing test, which exposes a bug
|
2019-12-05 12:07:53 +09:00 |
|
Ivan Tashkinov
|
d3bce89edd
|
[#1335] Merge issue fix.
|
2019-12-04 19:41:14 +03:00 |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
2019-12-04 18:56:31 +03:00 |
|
lain
|
228bf4d214
|
Merge branch 'fix_test' into 'develop'
[#1457] fix test
See merge request pleroma/pleroma!2035
|
2019-12-04 13:25:12 +00:00 |
|
lain
|
24599c519f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
|
2019-12-04 14:25:00 +01:00 |
|
Maksim Pechnikov
|
ed7f850ad2
|
fix test
|
2019-12-04 16:22:01 +03:00 |
|
lain
|
9487995e8b
|
Cheat Sheet: Addg chat_limit information.
|
2019-12-04 12:51:06 +01:00 |
|
lain
|
21353a8ee9
|
Changelog: Add information about chat limit.
|
2019-12-04 12:49:46 +01:00 |
|
lain
|
aa97fe8f17
|
ChatChannel: Ignore messages that are too long.
|
2019-12-04 12:48:34 +01:00 |
|
Egor Kislitsyn
|
05fb8d0084
|
Fix Pleroma.FollowingRelationship.move_following/2
|
2019-12-03 22:31:12 +07:00 |
|
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
2019-12-04 00:26:37 +09:00 |
|
Egor Kislitsyn
|
624e720aa4
|
Add with_move query param to the notifications API
|
2019-12-03 22:13:38 +07:00 |
|
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
2019-12-02 16:26:19 +00:00 |
|
rinpatch
|
d468cba2d5
|
Merge branch 'update-floki' into 'develop'
Update Floki dependency
See merge request pleroma/pleroma!2028
|
2019-12-02 11:18:58 +00:00 |
|
Egor Kislitsyn
|
356a936ecb
|
Fix mix pleroma.user list task
|
2019-12-02 18:11:45 +07:00 |
|
Egor Kislitsyn
|
cf52106e05
|
Update Floki dependency
|
2019-12-02 13:38:35 +07:00 |
|
Maksim Pechnikov
|
88f7cf51d4
|
Merge branch 'develop' into issue/1411
|
2019-12-01 16:18:16 +03:00 |
|
rinpatch
|
0d24ab04c5
|
Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field
See merge request pleroma/pleroma!2006
|
2019-11-30 10:42:51 +00:00 |
|