Maxim Filippov
|
b88dbc17c8
|
Fix tests
|
2019-11-19 22:50:24 +09:00 |
|
lain
|
bf89e0bf38
|
Merge branch 'feature/admin-api/support-token-header' into 'develop'
Admin API: Support authentication via `x-admin-token` HTTP header
Closes #1430
See merge request pleroma/pleroma!1993
|
2019-11-19 13:16:49 +00: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 |
|
Maksim Pechnikov
|
7d727dbfec
|
added test
|
2019-11-18 22:32:43 +03:00 |
|
Maksim Pechnikov
|
5cee51fac5
|
fix order by for fetch_favorites
|
2019-11-18 21:34:54 +03: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 |
|
Ivan Tashkinov
|
aad6576130
|
[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
|
2019-11-18 20:38:56 +03:00 |
|
feld
|
06151776c0
|
Merge branch 'docs/remove_activation_status_endpoint' into 'develop'
Remove deprecated endpoint from docs that is fully removed from backend now
See merge request pleroma/pleroma!1992
|
2019-11-18 16:16:27 +00:00 |
|
feld
|
adacf1b5e1
|
Remove deprecated endpoint from docs that is fully removed from backend now
|
2019-11-18 16:16:27 +00:00 |
|
Maksim Pechnikov
|
0937895182
|
updated fetch_favorites
|
2019-11-18 16:56:47 +03:00 |
|
Maksim Pechnikov
|
9da4c88b49
|
fix test
|
2019-11-18 10:00:48 +03:00 |
|
Maksim Pechnikov
|
4beb3ce5c5
|
/api/v1/favourites: added sorting for activites by adds to favorites
|
2019-11-18 09:44:08 +03:00 |
|
rinpatch
|
4df2d64b9f
|
Merge branch 'chore/bump-fast-sanitize' into 'develop'
Bump fast_sanitize
See merge request pleroma/pleroma!1988
|
2019-11-16 17:49:49 +00:00 |
|
rinpatch
|
fad296e432
|
Bump fast_sanitize
|
2019-11-16 19:19:25 +03:00 |
|
Maxim Filippov
|
c506cc48ef
|
Admin API: Error when trying to update reports in the "old" format
|
2019-11-16 18:44:48 +09:00 |
|
rinpatch
|
a869c718ab
|
Merge branch 'chore/changelog-sync-' into 'develop'
Sync the changelogs between develop and stable
See merge request pleroma/pleroma!1985
|
2019-11-15 22:03:28 +00:00 |
|
rinpatch
|
da28bf8fdd
|
Sync the changelogs between develop and stable
|
2019-11-16 01:02:08 +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 |
|
rinpatch
|
9e3868425a
|
Merge branch 'mix-task-warning' into 'develop'
Documentation: Add warning about database mix tasks.
See merge request pleroma/pleroma!1984
|
2019-11-15 19:38:52 +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 |
|
lain
|
234c27cb20
|
Documentation: Add warning about database mix tasks.
|
2019-11-15 14:30:59 +01:00 |
|
lain
|
f17e0f8e4f
|
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
|
2019-11-15 14:13:21 +01:00 |
|
lain
|
13b6aefd59
|
Merge branch 'feature/mrf-object-age-policy' into 'develop'
MRF: add ObjectAgePolicy
See merge request pleroma/pleroma!1982
|
2019-11-15 12:44:54 +00:00 |
|
lain
|
075789c442
|
Apply suggestion to CHANGELOG.md
|
2019-11-15 12:31:09 +00:00 |
|
kPherox
|
72d2557e11
|
Add fieldsLimit to metadata of nodeinfo
|
2019-11-15 18:52:31 +09:00 |
|
Ariadne Conill
|
7c59bc9ef9
|
fix credo
|
2019-11-14 20:18:45 -06:00 |
|
Ariadne Conill
|
eecd64cc07
|
object age policy: remove debug logging
|
2019-11-14 19:56:14 -06:00 |
|
Ariadne Conill
|
2469880a2b
|
add changelog entry for MRF ObjectAgePolicy
|
2019-11-14 19:49:25 -06:00 |
|
Ariadne Conill
|
5705cf0e3e
|
MRF: add ObjectAgePolicy which deals with old posts being imported
|
2019-11-14 19:48:10 -06:00 |
|
Ariadne Conill
|
29f49bf5fa
|
docs: document MRF ObjectAgePolicy
|
2019-11-14 19:47:54 -06:00 |
|
Ariadne Conill
|
1d33eeca72
|
config: add configuration for MRF ObjectAgePolicy
|
2019-11-14 18:26:06 -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 |
|
rinpatch
|
09b4f7269e
|
Merge branch 'fix/conversations-rendering' into 'develop'
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
|
2019-11-14 14:40:37 +00:00 |
|
rinpatch
|
94f1cfced8
|
format the code
|
2019-11-14 17:26:59 +03:00 |
|
feld
|
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 |
|
rinpatch
|
574369b42d
|
Merge branch 'ci/disable-trace' into 'develop'
ci: disable --trace for unit tests
See merge request pleroma/pleroma!1980
|
2019-11-14 13:26:15 +00:00 |
|
rinpatch
|
2861f97e46
|
ci: disable --trace for unit tests
it is mostly useless, but makes failures harder to find
|
2019-11-14 16:06:08 +03:00 |
|
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
2019-11-14 16:39:45 +07:00 |
|
rinpatch
|
6085c71bd1
|
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
|
2019-11-14 08:47:10 +00:00 |
|
lain
|
7a322713c3
|
Update CHANGELOG.md
|
2019-11-14 08:21:06 +00:00 |
|
lain
|
f74bb1d0fc
|
Merge branch 'static-fe-object-id' into 'develop'
Redirect object/activity ID to notice in static-fe
Closes #1412
See merge request pleroma/pleroma!1977
|
2019-11-13 17:37:48 +00:00 |
|
Phil Hagelberg
|
3c60adbc1f
|
Support redirecting by activity UUID in static FE as well.
|
2019-11-13 08:22:11 -08:00 |
|
Phil Hagelberg
|
0867cb083e
|
Support redirecting by object ID in static FE.
This matches the behavior of pleroma-fe better.
Fixes #1412.
|
2019-11-13 08:02:02 -08:00 |
|
lain
|
60cc5a7750
|
Merge branch 'fix-rate-limiter-test' into 'develop'
Fix random fails of the rate limiter tests (hopefully)
See merge request pleroma/pleroma!1978
|
2019-11-13 14:27:37 +00:00 |
|
rinpatch
|
24d5f9cbe0
|
Merge branch 'fix-docs-formatting' into 'develop'
Fix formatting in OpenBSD install manual
See merge request pleroma/pleroma!1979
|
2019-11-13 12:08:11 +00:00 |
|