projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/plero...
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
admin_api_controller.ex
2019-10-20
Ivan Tashkinov
[#1304]. Post-merge fixes. Merge branch 'develop' of...
blob
|
commitdiff
|
raw
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
rinpatch
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
rinpatch
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
kaniini
Merge branch 'feature/relay-list' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
Maxim Filippov
Merge branch 'develop' into feature/relay-list
blob
|
commitdiff
|
raw
|
diff to current
2019-10-18
kaniini
Merge branch 'fix-streaming-with-sec-websocket-protocol...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-16
Ivan Tashkinov
[#1304] Moved all non-mutes / non-blocks fields from...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-16
lain
Merge branch 'user-search-experiments' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-16
feld
Merge branch 'feature/multiple-users-activation-permiss...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-15
Maxim Filippov
DELETE /api/pleroma/admin/users now accepts nicknames...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-11
Maxim Filippov
Add `GET /api/pleroma/admin/relay` endpoint - lists...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-11
Maxim Filippov
Merge branch 'develop' into feature/multiple-users...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-11
Maxim Filippov
Deprecate POST/DELETE /api/pleroma/admin/users/:nicknam...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
Maxim Filippov
Deprecate /api/pleroma/admin/users/:nickname/toggle_act...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-09
Maxim Filippov
Ability to toggle activation status and permission...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
kaniini
Merge branch 'mrf/simple_policy/check_actor' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
Haelwenn
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-04
lain
Merge branch 'featrue/job-monitor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-29
kaniini
Merge branch 'feature/follow-requests-count' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-28
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'refactor/status-controller' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'refactor/subscription' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
Egor Kislitsyn
Extract status actions from `MastodonAPIController...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'list-packs-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'refactor/common_api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'refactor/timeline-controller' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
feld
Merge branch 'feature/moderation-log-filters' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'hex-flake-id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'feature/activities-pagination-by-offset...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
rinpatch
Merge branch 'hotfix/hackney-1.15.2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-25
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Maxim Filippov
Allow activities pagination via limit/offset
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Egor Kislitsyn
Add User.change_info/2 and User.update_info/2
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'feature/force-password-reset' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'support-rel-ugc' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'remove-direct-messages-from-public-timeli...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'test/activity_pub/transmogrifier.ex'...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
kaniini
Merge branch 'clean-up-views' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Steven Fuchs
Clean up views
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
rinpatch
Merge branch 'update-adminfe/2019-09-23' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-23
rinpatch
Merge branch 'better-emoji-packs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-22
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-22
Maxim Filippov
Use router helper to generate reset password link
blob
|
commitdiff
|
raw
|
diff to current
2019-09-22
Maxim Filippov
Admin API: Add ability to force user's password reset
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Haelwenn
Merge branch 'docs/clients-update' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Maksim Pechnikov
Merge branch 'develop' into test/activity_pub/transmogr...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Haelwenn
Merge branch 'issue/733' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
rinpatch
Merge branch 'chores/bump-copyright-year' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ekaterina Vaartis
Move emoji reloading to admin api
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
feld
Merge branch 'hide-follower-following-count' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
feld
Merge branch 'admin_api_invite_tokens' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
feld
Merge branch 'restore-tests' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Maxim Filippov
Fix response
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Maxim Filippov
Merge branch 'develop' into feature/return-link-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ivan Tashkinov
[#1234] Added changelog entry, removed admin OAuth...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Alex S
namings
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Alex S
little fixes
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Alex S
post for creating invite tokens in admin api
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
rinpatch
Merge branch 'feature/bump-elixir-verstion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
Maxim Filippov
Admin API: Return link alongside with token on password...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
feld
Merge branch 'deps/update-tesla' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
Maksim Pechnikov
Merge branch 'develop' into issue/733
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
Ivan Tashkinov
[#1234] Defined admin OAuth scopes, refined other scope...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
rinpatch
Merge branch 'support/package_versions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
rinpatch
Merge branch 'feature/return-total-for-reports' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-15
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-15
Ivan Tashkinov
[#1234] Permissions-related fixes / new functionality...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-09
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
Maxim Filippov
Return total for reports
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
next