summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-20Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'lain
Pleroma API: `emoji_reactions_by` does not need authorization See merge request pleroma/pleroma!2117
2020-01-20Merge branch 'fix-admin-api-scope' into 'develop'lain
fix oauth scopes for AdminApi#reports_update See merge request pleroma/pleroma!2087
2020-01-20Pleroma API: `emoji_reactions_by` does not need authorizationlain
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
Hashtag benchmarks See merge request pleroma/pleroma!2116
2020-01-20Add benchmark of any/all tag optionslain
2020-01-20Merge branch 'features/cleanup-incoming-actor' into 'develop'rinpatch
transmogrifier.ex: simplify handle_incoming of actors See merge request pleroma/pleroma!2114
2020-01-20Merge branch 'feat/startup-migration-check' into 'develop'lain
Check for unapplied migrations on startup Closes #1328 See merge request pleroma/pleroma!2112
2020-01-20Check for unapplied migrations on startuprinpatch
Closes #1328
2020-01-19mix.lock: update mock to 0.3.4rinpatch
This version adds Mock.passthrough/1 which I need to use in a test
2020-01-19transmogrifier.ex: simplify handle_incoming of actorsHaelwenn (lanodan) Monnier
2020-01-15Merge branch 'ci/docker-imaging' into 'develop'feld
ci/docker imaging See merge request pleroma/pleroma!2110
2020-01-15Update docker release / stable jobsjp
2020-01-15Update docker jobs for release branches and stable branchesjp
2020-01-15Fix only: on docker develop/latest jobjp
2020-01-15update `only:` for release/ branch regex matching. and to avoid running ↵jp
image builds on unnecessary forks
2020-01-15Fix odd spacingjp
2020-01-15Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'lain
[#1478] OAuth `admin` scopes tweaks Closes #1478 See merge request pleroma/pleroma!2081
2020-01-15[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.Ivan Tashkinov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks
2020-01-15Merge branch 'notifications-from-account' into 'develop'lain
[#1470] Add support for `account_id` param to filter notifications by the account See merge request pleroma/pleroma!2073
2020-01-15Fix notification controller testEgor Kislitsyn
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-15Benchmarks: Move to correct folderlain
2020-01-15[#1478] Adjusted AdminAPIController admin subscope requirements.Ivan Tashkinov
2020-01-14Merge branch 'features/docker-updates' into 'develop'feld
Features/docker updates See merge request pleroma/pleroma!2105
2020-01-14Remove forked test branch matchingjp
2020-01-14Remove artifacts passing by setting `dependencies: []`jp
2020-01-14Merge branch 'features/docker-updates' into 'develop'lain
Features/docker updates See merge request pleroma/pleroma!2104
2020-01-14Add allow_failure to docker jobsjp
2020-01-14Remove cache from docker jobs. Split devlop and stable branches into their ↵jp
own jobs
2020-01-14Mix Tasks: Add pleroma.benchmarks.tagslain
2020-01-14Merge branch 'warnings-fix' into 'develop'lain
compilation warnings fix See merge request pleroma/pleroma!2102
2020-01-14compilation warnings fixAlexander Strizhakov
2020-01-13Merge branch 'feature/ci-registry' into 'develop'lain
Update Dockerfile with labels. Update gitlab-ci for registry usage See merge request pleroma/pleroma!2098
2020-01-12Merge branch 'feature/attachments-cleanup' into 'develop'feld
Delete attachments when status is deleted See merge request pleroma/pleroma!2036
2020-01-12Delete attachments when status is deletedRoman Chvanikov
2020-01-12Merge branch 'updated-at-on-conversation-read' into 'develop'feld
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080
2020-01-12Merge branch 'config/benchmark' into 'develop'feld
Benchmark env uses test database so we should be able to use test.secret.exs See merge request pleroma/pleroma!2057
2020-01-12Merge branch 'issue/1354' into 'develop'feld
[#1354] fix remote follow See merge request pleroma/pleroma!2079
2020-01-12Assign token that can write to followsMark Felder
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2020-01-12Merge branch 'issue/1487' into 'develop'feld
[#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090
2020-01-11Merge branch 'patch-1' into 'develop'rinpatch
docs: API: update Mastodon API link See merge request pleroma/pleroma!2100
2020-01-11Merge branch 'remove/remove-mdii-uploader' into 'develop'rinpatch
Remove MDII uploader See merge request pleroma/pleroma!2099
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-11docs: API: update Mastodon API linkAlibek Omarov
2020-01-10Update Dockerfile with labels. Update gitlab-ci for registry usagejp
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
2020-01-10Merge branch 'issue/1490' into 'develop'lain
[#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092
2020-01-10Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'lain
OAuth tweaks and tests rework See merge request pleroma/pleroma!2068
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-11 10:18:47 +0000