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 |
|
Egor Kislitsyn
|
761ad0b48e
|
Split CreateFollowingRelationships to multiple migrations
|
2019-10-08 20:27:42 +07:00 |
|
Egor Kislitsyn
|
6291eaa590
|
Update CreateFollowingRelationships
|
2019-10-08 20:19:38 +07: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 |
|
Egor Kislitsyn
|
12ebeef130
|
Add CreateFollowingRelationships migration
|
2019-10-08 18:05:23 +07:00 |
|
rinpatch
|
44e0c5cabb
|
Merge branch 'chore/bump-fe-122323f3' into 'develop'
Bump pleroma-fe bundle to 122323f35c
See merge request pleroma/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 |
|
Maxim Filippov
|
aa7fd616c7
|
Line is too long!
|
2019-10-07 16:03:23 +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 |
|
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-10-07 15:41:41 +03:00 |
|
Maxim Filippov
|
7aceaa517b
|
Admin API: Reports, grouped by status
|
2019-10-07 15:39:07 +03:00 |
|
lain
|
6c278cfe09
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-07 12:31:51 +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 |
|
lain
|
e8395bedd2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
|
2019-10-07 12:10:27 +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 |
|
lain
|
d580eedfe9
|
Linting.
|
2019-10-07 12:40:33 +02:00 |
|
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-07 12:30:59 +02: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 |
|
lain
|
91e90aa807
|
Merge branch 'misskey-compat' into 'reactions'
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
|
2019-10-07 07:25:27 +00:00 |
|
Haelwenn
|
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 |
|
Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
2019-10-07 03:49:57 +02:00 |
|
kaniini
|
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 |
|
rinpatch
|
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 |
|
kaniini
|
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 |
|
rinpatch
|
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 |
|
Ivan Tashkinov
|
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 |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of user.info
|
2019-10-06 16:56:36 +03:00 |
|
Ivan Tashkinov
|
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 |
|
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-06 08:11:47 +00:00 |
|
Ivan Tashkinov
|
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 |
|
Haelwenn
|
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 |
|
kaniini
|
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 |
|
kaniini
|
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 |
|
kaniini
|
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 |
|
eugenijm
|
8249924485
|
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
|
2019-10-05 20:12:00 +03:00 |
|