lain
|
d7f9679ff2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
lain
|
02f8e2a8ab
|
Gitlab: Run benchmark in CI.
|
5 years ago |
|
Maxim Filippov
|
24eecc3cb4
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
kaniini
|
9fd5176c35
|
Merge branch 'unicode-search' into 'develop'
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
|
5 years ago |
|
kaniini
|
c9b3f0151b
|
Merge branch 'webfinger-mocks' into 'develop'
provide mocks for webfinger endpoints
See merge request pleroma/pleroma!1821
|
5 years ago |
|
Steven Fuchs
|
dc6d20b68d
|
provide mocks for webfinger endpoints
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
5 years ago |
|
lain
|
c1bae01376
|
Search: Add tests for unicode searches.
|
5 years ago |
|
Egor Kislitsyn
|
d537bfd4e1
|
Add a task to re-count statuses for all users
|
5 years ago |
|
eugenijm
|
580a67f5ca
|
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
|
5 years ago |
|
Egor Kislitsyn
|
761ad0b48e
|
Split CreateFollowingRelationships to multiple migrations
|
5 years ago |
|
Egor Kislitsyn
|
6291eaa590
|
Update CreateFollowingRelationships
|
5 years ago |
|
rinpatch
|
6355694309
|
Merge branch 'chore/format-migrations' into 'develop'
Enable `mix format` for migrations
See merge request pleroma/pleroma!1819
|
5 years ago |
|
rinpatch
|
32808208be
|
Enable `mix format` for migrations
|
5 years ago |
|
Egor Kislitsyn
|
12ebeef130
|
Add CreateFollowingRelationships migration
|
5 years ago |
|
rinpatch
|
44e0c5cabb
|
Merge branch 'chore/bump-fe-122323f3' into 'develop'
Bump pleroma-fe bundle to 122323f35c
See merge request pleroma/pleroma!1817
|
5 years ago |
|
rinpatch
|
a502155274
|
Bump pleroma-fe bundle to 122323f35c
|
5 years ago |
|
kaniini
|
ac113f6724
|
Merge branch 'backport/exclude-replies' into 'maint/1.1'
mastodon api: fix exclude_replies (closes #1287)
See merge request pleroma/pleroma!1816
|
5 years ago |
|
Maxim Filippov
|
aa7fd616c7
|
Line is too long!
|
5 years ago |
|
Ariadne Conill
|
3e1d2ace73
|
mastodon api: fix exclude_replies (closes #1287)
|
5 years ago |
|
kaniini
|
380c67e2c3
|
Merge branch 'bugfix/exclude-replies' into 'develop'
mastodon api: fix exclude_replies (closes #1287)
Closes #1287
See merge request pleroma/pleroma!1813
|
5 years ago |
|
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
Maxim Filippov
|
7aceaa517b
|
Admin API: Reports, grouped by status
|
5 years ago |
|
lain
|
6c278cfe09
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Ariadne Conill
|
9a2f71f4d5
|
mastodon api: fix exclude_replies (closes #1287)
|
5 years ago |
|
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
|
5 years ago |
|
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
5 years ago |
|
kaniini
|
72bd763d9f
|
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
update changelog date
See merge request pleroma/pleroma!1812
|
5 years ago |
|
Ariadne Conill
|
129fb9f499
|
update changelog date
|
5 years ago |
|
kaniini
|
d928f0c4c3
|
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
Pleroma 1.0.91 (aka 1.1 RC2).
See merge request pleroma/pleroma!1811
|
5 years ago |
|
Ariadne Conill
|
c5b7d2ef26
|
Pleroma 1.0.91 (aka 1.1 RC2).
|
5 years ago |
|
lain
|
e8395bedd2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
|
5 years ago |
|
kaniini
|
079d069eb4
|
Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'
backport: Mastodon API: Fix private and direct statuses not being filtered out from the...
See merge request pleroma/pleroma!1807
|
5 years ago |
|
kaniini
|
cb36fe0128
|
Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'
clean up bundled litepub schema (closes #1303)
See merge request pleroma/pleroma!1809
|
5 years ago |
|
Ariadne Conill
|
d3e04d5590
|
clean up bundled litepub schema (closes #1303)
|
5 years ago |
|
kaniini
|
5c32e6ee91
|
Merge branch 'chore/context-cleanups' into 'develop'
clean up bundled litepub schema (closes #1303)
Closes #1303
See merge request pleroma/pleroma!1808
|
5 years ago |
|
Ariadne Conill
|
19962d2022
|
clean up bundled litepub schema (closes #1303)
|
5 years ago |
|
eugenijm
|
790ae8e189
|
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
|
5 years ago |
|
lain
|
d580eedfe9
|
Linting.
|
5 years ago |
|
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
Ivan Tashkinov
|
28fb98d69e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
lain
|
91e90aa807
|
Merge branch 'misskey-compat' into 'reactions'
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
|
5 years ago |
|
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
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
5 years ago |
|
kaniini
|
f6ff19e074
|
Merge branch 'backport/custom-field-update' into 'maint/1.1'
Backport: custom field update
See merge request pleroma/pleroma!1805
|
5 years ago |
|
rinpatch
|
b5e6ba323d
|
Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'
Backport moving out keys from user info to 1.1
See merge request pleroma/pleroma!1801
|
5 years ago |
