Ivan Tashkinov
|
81f1c6bc47
|
[#1335] Added CHANGELOG.md entry.
|
2019-11-20 15:57:51 +03:00 |
|
rinpatch
|
dc8830da27
|
changelog: add 1.1.6 entries from stable
|
2019-11-20 00:01:58 +03:00 |
|
Egor Kislitsyn
|
36686f5245
|
Support authentication via x-admin-token HTTP header
|
2019-11-19 15:58:20 +07:00 |
|
rinpatch
|
da28bf8fdd
|
Sync the changelogs between develop and stable
|
2019-11-16 01:02:08 +03:00 |
|
lain
|
075789c442
|
Apply suggestion to CHANGELOG.md
|
2019-11-15 12:31:09 +00:00 |
|
Ariadne Conill
|
2469880a2b
|
add changelog entry for MRF ObjectAgePolicy
|
2019-11-14 19:49:25 -06: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 |
|
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 |
|
kaniini
|
2cc043591c
|
Merge branch 'feature/static-fe' into 'develop'
Static frontend
See merge request pleroma/pleroma!1917
|
2019-11-11 19:10:44 +00:00 |
|
rinpatch
|
827b938502
|
Add a changelog entry for !1940
|
2019-11-11 17:05:30 +03:00 |
|
Maxim Filippov
|
46787b9fe1
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-11 19:18:12 +09:00 |
|
Maxim Filippov
|
1649d6f689
|
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
|
2019-11-11 19:16:04 +09:00 |
|
Maxim Filippov
|
31343e4321
|
Code style fixes
|
2019-11-11 19:06:09 +09:00 |
|
Maxim Filippov
|
b2e8371e6a
|
Apply suggestion to CHANGELOG.md
|
2019-11-11 09:55:00 +00:00 |
|
rinpatch
|
4499a7a075
|
Disable attachment links by default
Closes #1394
|
2019-11-10 15:02:47 +03:00 |
|
lain
|
a88e834dba
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-11-10 11:32:50 +00:00 |
|
Maksim Pechnikov
|
9d0b989521
|
add subject to atom feed
|
2019-11-10 11:10:20 +03:00 |
|
Phil Hagelberg
|
6ef8049664
|
Add changelog entry, cheatsheet docs, and alphabetize.
|
2019-11-09 18:09:29 -08:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-08 18:30:49 +09:00 |
|
eugenijm
|
7888803ffe
|
Mastodon API: Add the recipients parameter to GET /api/v1/conversations
|
2019-11-07 08:26:24 +03:00 |
|
Ivan Tashkinov
|
66c502879b
|
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.
|
2019-11-06 17:19:32 +03:00 |
|
Maxim Filippov
|
2cbfa256fd
|
Merge branch 'develop' into feature/multiple-users-force-password-reset
|
2019-11-05 11:36:47 +10:00 |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-05 02:12:48 +03:00 |
|
eugenijm
|
ed29be24cb
|
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
|
2019-11-04 18:36:16 +03:00 |
|
Maxim Filippov
|
10e9ba6340
|
Apply suggestion to CHANGELOG.md
|
2019-11-01 17:25:41 +00:00 |
|
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
2019-11-01 18:45:47 +03:00 |
|
Maxim Filippov
|
791bcfd90f
|
Merge branch 'develop' into feature/store-statuses-data-inside-flag
|
2019-10-27 16:11:25 +03:00 |
|
Maxim Filippov
|
8eff05d4c6
|
Strip status data from Flag (when federating or closing/resolving report)
|
2019-10-27 16:05:32 +03:00 |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
2019-10-23 17:22:42 +03:00 |
|
Maksim Pechnikov
|
31d6ef6f92
|
update changelog
|
2019-10-21 11:53:11 +03:00 |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
2019-10-20 20:43:18 +03:00 |
|
eugenijm
|
52ed2f8f2d
|
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
|
2019-10-19 15:24:06 +03:00 |
|
rinpatch
|
0341f6f779
|
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
|
2019-10-18 21:40:07 +00:00 |
|
rinpatch
|
901bf0fb8c
|
pleroma_ctl: Fix attempting to use RPC for config generation
|
2019-10-19 00:37:39 +03:00 |
|
Maxim Filippov
|
019147f115
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 18:35:58 +02:00 |
|
Ariadne Conill
|
4e270964d7
|
update changelog
|
2019-10-18 14:50:09 +00:00 |
|
rinpatch
|
c2f1cc4f16
|
Fix wrong list level in the changelog
|
2019-10-18 15:56:14 +03:00 |
|
rinpatch
|
09c1e7a82e
|
Sync the changelog from stable and collapse the API sections
|
2019-10-18 15:46:51 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3c6fd0bb99
|
upload.ex: Remove deprecated configuration
|
2019-10-18 12:34:09 +02:00 |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 10:24:29 +02:00 |
|
eugenijm
|
359dd1890e
|
Mastodon API: Mark the conversation as read for the author when they send a new direct message
|
2019-10-17 16:49:39 +03:00 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
2019-10-15 17:33:29 +02:00 |
|
|
|
3b1bc079af
|
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
|
2019-10-14 19:40:40 +00:00 |
|
rinpatch
|
d1e969842d
|
Add a changelog entry for branch-moving
|
2019-10-14 18:42:30 +03:00 |
|
eugenijm
|
a97b642289
|
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
|
2019-10-14 02:57:21 +03:00 |
|
Maxim Filippov
|
cc6875b582
|
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
|
2019-10-11 19:12:29 +03:00 |
|
Maxim Filippov
|
c0aca32dd0
|
Merge branch 'develop' into feature/multiple-users-activation-permissions
|
2019-10-11 15:59:35 +03:00 |
|
