lain
|
ab36459464
|
Merge branch '1521-admin-report-test-fix' into 'develop'
[#1521] AdminApiControllerTest fix: fixed create report test (OAuth)
Closes #1521
See merge request pleroma/pleroma!2121
|
5 years ago |
|
Ivan Tashkinov
|
ca3b4de2c9
|
[#1521] AdminApiControllerTest: fixed create report test (OAuth).
|
5 years ago |
|
rinpatch
|
00d08c9231
|
Merge branch 'favoritng-responses' into 'develop'
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
|
5 years ago |
|
lain
|
7518f3877f
|
Update changelog
|
5 years ago |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
5 years ago |
|
lain
|
2199d63ddc
|
StatusControllerTest: Fix typo
|
5 years ago |
|
lain
|
42ea480e95
|
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
|
5 years ago |
|
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
5 years ago |
|
lain
|
c814f22030
|
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
|
5 years ago |
|
lain
|
5fddf988ea
|
Pleroma API: `emoji_reactions_by` does not need authorization
|
5 years ago |
|
Haelwenn
|
e8759cb5ba
|
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
|
5 years ago |
|
lain
|
271afcd940
|
Add benchmark of any/all tag options
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
|
rinpatch
|
9367b70f37
|
Merge branch 'features/cleanup-incoming-actor' into 'develop'
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
|
5 years ago |
|
lain
|
7731f9a447
|
Merge branch 'feat/startup-migration-check' into 'develop'
Check for unapplied migrations on startup
Closes #1328
See merge request pleroma/pleroma!2112
|
5 years ago |
|
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
5 years ago |
|
rinpatch
|
205e73058d
|
mix.lock: update mock to 0.3.4
This version adds Mock.passthrough/1 which I need to use in a test
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
6cf3b19a38
|
transmogrifier.ex: simplify handle_incoming of actors
|
5 years ago |
|
feld
|
52a0bf62f5
|
Merge branch 'ci/docker-imaging' into 'develop'
ci/docker imaging
See merge request pleroma/pleroma!2110
|
5 years ago |
|
jp
|
1e17ad2275
|
Update docker release / stable jobs
|
5 years ago |
|
jp
|
ffab411327
|
Update docker jobs for release branches and stable branches
|
5 years ago |
|
jp
|
0c9499bf25
|
Fix only: on docker develop/latest job
|
5 years ago |
|
jp
|
4d19f38753
|
update `only:` for release/ branch regex matching. and to avoid running image builds on unnecessary forks
|
5 years ago |
|
jp
|
cc4c3255fe
|
Fix odd spacing
|
5 years ago |
|
lain
|
6317183acd
|
Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'
[#1478] OAuth `admin` scopes tweaks
Closes #1478
See merge request pleroma/pleroma!2081
|
5 years ago |
|
Ivan Tashkinov
|
d1e9768e10
|
[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
|
5 years ago |
|
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
5 years ago |
|
lain
|
1b233aa653
|
Merge branch 'notifications-from-account' into 'develop'
[#1470] Add support for `account_id` param to filter notifications by the account
See merge request pleroma/pleroma!2073
|
5 years ago |
|
Egor Kislitsyn
|
023b7f605b
|
Fix notification controller test
|
5 years ago |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
5 years ago |
|
lain
|
167e9c45ec
|
Benchmarks: Move to correct folder
|
5 years ago |
|
Ivan Tashkinov
|
76c1948880
|
[#1478] Adjusted AdminAPIController admin subscope requirements.
|
5 years ago |
|
feld
|
77412d5dd2
|
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2105
|
5 years ago |
|
jp
|
a58a0a7b1b
|
Remove forked test branch matching
|
5 years ago |
|
jp
|
ff15d6ef13
|
Remove artifacts passing by setting `dependencies: []`
|
5 years ago |
|
lain
|
b4532277b1
|
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2104
|
5 years ago |
|
jp
|
964d188a96
|
Add allow_failure to docker jobs
|
5 years ago |
|
jp
|
fe57e5139f
|
Remove cache from docker jobs. Split devlop and stable branches into their own jobs
|
5 years ago |
|
lain
|
2ee6754095
|
Mix Tasks: Add pleroma.benchmarks.tags
|
5 years ago |
|
lain
|
d150c598d7
|
Merge branch 'warnings-fix' into 'develop'
compilation warnings fix
See merge request pleroma/pleroma!2102
|
5 years ago |
|
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
5 years ago |
|
lain
|
12b28c8925
|
Merge branch 'feature/ci-registry' into 'develop'
Update Dockerfile with labels. Update gitlab-ci for registry usage
See merge request pleroma/pleroma!2098
|
5 years ago |
|
feld
|
a431e8c9f7
|
Merge branch 'feature/attachments-cleanup' into 'develop'
Delete attachments when status is deleted
See merge request pleroma/pleroma!2036
|
5 years ago |
|
Roman Chvanikov
|
88f0eed0f2
|
Delete attachments when status is deleted
|
5 years ago |
|
feld
|
8b4d81609d
|
Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
|
5 years ago |
|
feld
|
6cc5341d26
|
Merge branch 'config/benchmark' into 'develop'
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
|
5 years ago |
|
feld
|
bb5862ea2f
|
Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow
See merge request pleroma/pleroma!2079
|
5 years ago |
|
Mark Felder
|
e64059d218
|
Assign token that can write to follows
|
5 years ago |
|
Mark Felder
|
2f5b8fbeb3
|
Merge branch 'develop' into issue/1354
|
5 years ago |
|
feld
|
ea4a462858
|
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
|
5 years ago |
