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 |
|
Maksim Pechnikov
|
ed7f850ad2
|
fix test
|
2019-12-04 16:22:01 +03: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
|
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 |
|
kPherox
|
1915b23e72
|
test missing first field
|
2019-11-30 15:43:12 +09:00 |
|
Egor Kislitsyn
|
a98cda7758
|
Fix Pleroma.HTML.extract_first_external_url/2
|
2019-11-29 15:49:35 +07:00 |
|
Ivan Tashkinov
|
52cc7de82c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
|
2019-11-29 10:17:59 +03:00 |
|
lain
|
98990d2d61
|
Merge branch 'fed-testing-updates' into 'develop'
Add federated test infrastructure
See merge request pleroma/pleroma!2014
|
2019-11-28 14:34:07 +00:00 |
|
lain
|
8627fb0bb5
|
Merge branch 'cleanup-tests-output' into 'develop'
Cleanup tests output
See merge request pleroma/pleroma!2018
|
2019-11-28 12:19:15 +00:00 |
|
Egor Kislitsyn
|
c4b468a95b
|
Cleanup tests output
|
2019-11-28 16:44:48 +07:00 |
|
lain
|
50b152766f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
|
2019-11-27 14:48:28 +01:00 |
|
lain
|
f36724efb1
|
User: Never return nil for user follower counts.
|
2019-11-27 14:13:36 +01:00 |
|
Egor Kislitsyn
|
f595cfe623
|
Remove User.user_info/2
|
2019-11-27 19:43:47 +07:00 |
|
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
2019-11-27 17:52:02 +07:00 |
|
stwf
|
bd1984f054
|
update tests and Oban
|
2019-11-26 15:24:34 -05:00 |
|
lain
|
717d246491
|
Tests: Don't run federated tests by default
|
2019-11-26 15:03:16 -05:00 |
|
Chris McCord
|
f01881e82a
|
Add federated test infrastructure
|
2019-11-26 15:01:35 -05:00 |
|
Ivan Tashkinov
|
c8d3c3bfec
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
|
2019-11-26 10:42:36 +03:00 |
|
lain
|
dc9090810d
|
Merge branch 'fix/ap-disable-remote-render' into 'develop'
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
|
2019-11-25 15:23:45 +00:00 |
|
rinpatch
|
4b10804f21
|
OStatus controller: don't serve json at /notice/, redirect instead
|
2019-11-25 17:55:17 +03:00 |
|
rinpatch
|
02f7383891
|
ActivityPub controller: do not render remote users
|
2019-11-25 17:19:33 +03:00 |
|
|
|
5f981178d0
|
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
|
2019-11-25 13:29:53 +00:00 |
|
Sadposter
|
d3656c2725
|
add ability to set a custom user-agent string
|
2019-11-25 09:53:11 +00:00 |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:46:18 +09:00 |
|
Maxim Filippov
|
fd24467b92
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:43:11 +09:00 |
|
Ivan Tashkinov
|
1636cc5b7e
|
Removed users.info and remaining usages.
|
2019-11-23 14:06:19 +03:00 |
|
lain
|
bd62946020
|
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
|
2019-11-22 15:39:19 +00:00 |
|
Ivan Tashkinov
|
cad9b325e5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
|
2019-11-21 16:47:52 +03:00 |
|
lain
|
8feb5dcb42
|
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
|
2019-11-21 13:13:14 +00:00 |
|
Egor Kislitsyn
|
d38ab4bb89
|
Fix user.following_count
|
2019-11-21 16:31:13 +07:00 |
|
Ivan Tashkinov
|
4f88b1b435
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-20 15:47:11 +03:00 |
|
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
2019-11-20 15:46:11 +03:00 |
|
Egor Kislitsyn
|
63711258ce
|
Fix sporadically failing test
|
2019-11-20 14:25:00 +07:00 |
|
Ivan Tashkinov
|
565f261338
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-19 23:22:47 +03:00 |
|
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
2019-11-19 23:22:10 +03:00 |
|
Maxim Filippov
|
b88dbc17c8
|
Fix tests
|
2019-11-19 22:50:24 +09:00 |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
2019-11-19 20:14:02 +09:00 |
|
Egor Kislitsyn
|
36686f5245
|
Support authentication via x-admin-token HTTP header
|
2019-11-19 15:58:20 +07:00 |
|
Ivan Tashkinov
|
3aaf3aa2c2
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-18 20:43:19 +03:00 |
|
kaniini
|
81cba405af
|
Merge branch 'nodeinfo-fields-limit' into 'develop'
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
|
2019-11-15 20:29:38 +00:00 |
|
Ivan Tashkinov
|
01d9c093c3
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
2019-11-15 21:40:14 +03:00 |
|
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized users.mutes as relation to UserMute entity.
|
2019-11-15 21:38:54 +03:00 |
|
kPherox
|
c9a06b14ab
|
Add test
|
2019-11-15 23:55:28 +09:00 |
|
rinpatch
|
22554ac5ca
|
Merge branch 'bugfix/1395-email-activation' into 'develop'
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
|
2019-11-15 14:11:48 +00:00 |
|
Ariadne Conill
|
7c59bc9ef9
|
fix credo
|
2019-11-14 20:18:45 -06:00 |
|
Ariadne Conill
|
5705cf0e3e
|
MRF: add ObjectAgePolicy which deals with old posts being imported
|
2019-11-14 19:48:10 -06:00 |
|
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-14 23:45:29 +09:00 |
|
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
2019-11-14 23:44:07 +09:00 |
|
|
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
2019-11-14 13:35:41 +00:00 |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
2019-11-14 16:39:45 +07:00 |
|
