kPherox
5bd0717de2
Add Sec-WebSocket-Protocol to response header
2019-10-15 21:09:44 +09:00
feld
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
e0da0d4f9e
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
...
Backport "Fix hiding branch name logic" to develop
See merge request pleroma/pleroma!1846
2019-10-14 19:17:06 +00:00
rinpatch
2f0ed5f6c4
Fix hiding branch name logic
2019-10-14 22:15:16 +03:00
rinpatch
8b39d6f93c
Merge branch 'master-to-stable' into 'develop'
...
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
2019-10-14 16:08:53 +00:00
rinpatch
17b8896c40
Correct version parser branch name detection
2019-10-14 18:45:16 +03:00
rinpatch
d1e969842d
Add a changelog entry for branch-moving
2019-10-14 18:42:30 +03:00
rinpatch
58fea88564
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
2019-10-14 18:39:56 +03:00
rinpatch
0e9243e8a2
Preparations for renaming master to stable
2019-10-14 18:38:51 +03:00
eugenijm
a97b642289
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
lain
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
2019-10-13 15:37:49 +00:00
rinpatch
930cbd6d05
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
2019-10-12 14:42:55 +00:00
rinpatch
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
2019-10-11 22:52:38 +03:00
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
Haelwenn
44afe4c887
Merge branch 'pleroma-ctl-enchancements' into 'develop'
...
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
2019-10-11 10:56:45 +00:00
lain
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
2019-10-11 12:53:09 +02:00
lain
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
2019-10-11 12:41:44 +02:00
rinpatch
b750135acd
pleroma_ctl: Make it possible to specify branches/flavours when updating
2019-10-11 13:22:21 +03:00
lain
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
2019-10-11 11:48:58 +02:00
lain
9b963064eb
Transmogrifier: Actually store who deleted a note.
2019-10-11 11:25:45 +02:00
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
lain
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
2019-10-10 17:17:33 +02:00
lain
ecd7ac855b
Benchmark config: Don't use the sql sandbox.
2019-10-10 15:42:54 +02:00
lain
b9b00e6e96
Gitlab CI: Run correct benchmark task.
2019-10-10 15:31:32 +02:00
lain
2629493804
Benchmark config: Database adjustments.
2019-10-10 15:01:06 +02:00
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
lain
02f8e2a8ab
Gitlab: Run benchmark in CI.
2019-10-10 14:24:54 +02:00
kaniini
9fd5176c35
Merge branch 'unicode-search' into 'develop'
...
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
2019-10-09 16:33:05 +00:00
kaniini
c9b3f0151b
Merge branch 'webfinger-mocks' into 'develop'
...
provide mocks for webfinger endpoints
See merge request pleroma/pleroma!1821
2019-10-09 16:32:28 +00:00
Steven Fuchs
dc6d20b68d
provide mocks for webfinger endpoints
2019-10-09 16:32:28 +00:00
lain
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
2019-10-09 15:10:08 +00:00
lain
f64dfd317f
Merge branch 'feature/count-statuses-task' into 'develop'
...
Add a task to re-count statuses for all users
Closes #1305
See merge request pleroma/pleroma!1823
2019-10-09 14:11:23 +00:00
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
lain
c1bae01376
Search: Add tests for unicode searches.
2019-10-09 16:03:45 +02:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
eugenijm
580a67f5ca
Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)
2019-10-09 07:27:09 +03:00
rinpatch
6355694309
Merge branch 'chore/format-migrations' into 'develop'
...
Enable `mix format` for migrations
See merge request pleroma/pleroma!1819
2019-10-08 12:28:10 +00:00
rinpatch
32808208be
Enable mix format for migrations
2019-10-08 15:16:39 +03:00
rinpatch
44e0c5cabb
Merge branch 'chore/bump-fe-122323f3' into 'develop'
...
Bump pleroma-fe bundle to 122323f35cpleroma/pleroma!1817
2019-10-07 14:54:24 +00:00
rinpatch
a502155274
Bump pleroma-fe bundle to 122323f35c
2019-10-07 17:42:33 +03:00
kaniini
380c67e2c3
Merge branch 'bugfix/exclude-replies' into 'develop'
...
mastodon api: fix exclude_replies (closes #1287 )
Closes #1287
See merge request pleroma/pleroma!1813
2019-10-07 12:43:21 +00:00
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 12:29:33 +00:00
kaniini
0a99f1e8c5
Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'
...
Extract RSS Feed functionality from OStatus
Closes #1243
See merge request pleroma/pleroma!1644
2019-10-07 12:20:41 +00:00
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
kaniini
5c32e6ee91
Merge branch 'chore/context-cleanups' into 'develop'
...
clean up bundled litepub schema (closes #1303 )
Closes #1303
See merge request pleroma/pleroma!1808
2019-10-07 11:34:50 +00:00
Ariadne Conill
19962d2022
clean up bundled litepub schema ( closes #1303 )
2019-10-07 11:33:58 +00:00
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
2019-10-07 10:19:24 +00:00
Haelwenn
15592f1abe
Merge branch '1260-rate-limited-auth-actions' into 'develop'
...
[#1260 ] Rate-limiting for create authentication and related requests
Closes #1260
See merge request pleroma/pleroma!1681
2019-10-07 09:16:42 +00:00
Ivan Tashkinov
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-07 11:06:30 +03:00
