66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
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
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
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
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
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
2019-10-11 12:53:09 +02:00
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
2019-10-11 12:41:44 +02:00
b750135acd
pleroma_ctl: Make it possible to specify branches/flavours when updating
2019-10-11 13:22:21 +03:00
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
2019-10-11 11:48:58 +02:00
9b963064eb
Transmogrifier: Actually store who deleted a note.
2019-10-11 11:25:45 +02:00
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
2019-10-10 17:17:33 +02:00
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
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
dc6d20b68d
provide mocks for webfinger endpoints
2019-10-09 16:32:28 +00:00
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
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
c1bae01376
Search: Add tests for unicode searches.
2019-10-09 16:03:45 +02:00
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
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
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
32808208be
Enable `mix format` for migrations
2019-10-08 15:16:39 +03:00
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
a502155274
Bump pleroma-fe bundle to 122323f35c
2019-10-07 17:42:33 +03:00
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
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 12:29:33 +00:00
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
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
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
19962d2022
clean up bundled litepub schema ( closes #1303 )
2019-10-07 11:33:58 +00:00
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
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
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
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
2019-10-07 02:14:45 +00:00
58aeabd020
mrf/simple_policy: check actor against accept/reject
2019-10-07 03:49:57 +02:00
25cffffaf1
Merge branch 'fix/bad-migration' into 'develop'
...
Fix muted notification migration only working with a schema
See merge request pleroma/pleroma!1803
2019-10-06 15:15:00 +00:00
ee88afb2e2
Fix muted notification migration only working with a schema
...
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
2019-10-06 18:06:04 +03:00
2411d09215
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
...
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
2019-10-06 14:32:56 +00:00
125f96e706
Fix the use of queries with a schema in a migration
2019-10-06 17:23:43 +03:00
09a3b993fe
Merge branch 'fix/report-email' into 'develop'
...
Fix/report email
Closes #1300
See merge request pleroma/pleroma!1800
2019-10-06 14:13:04 +00:00
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
2019-10-06 14:13:04 +00:00
b93856874d
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 17:12:17 +03:00
fefbd31c6e
Move local keys out of `user.info`
2019-10-06 16:56:36 +03:00
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-06 09:30:49 +03:00
9e34919dcd
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
...
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
2019-10-06 04:41:06 +00:00
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
2019-10-05 19:28:53 +00:00
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
2019-10-05 19:28:29 +00:00
17ff4b43cb
Merge branch 'unread-conversation-count' into 'develop'
...
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
2019-10-05 19:28:07 +00:00
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-05 20:12:00 +03:00
0ee6100c8d
Merge branch 'update-activity-fixes' into 'develop'
...
Update activity fixes
Closes #1298
See merge request pleroma/pleroma!1795
2019-10-05 15:51:19 +00:00
Maksim Pechnikov