projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' into refactor/notification_settings
[akkoma]
/
lib
/
pleroma
/
plugs
/
user_is_admin_plug.ex
2020-07-15
Mark Felder
Merge branch 'develop' into refactor/notification_settings
blob
|
commitdiff
|
raw
2020-07-15
rinpatch
Merge branch 'features/mrf-reasons' into 'develop'
blob
|
commitdiff
|
raw
2020-07-15
lain
Merge branch 'tests/apc2s-update_outbox' into 'develop'
blob
|
commitdiff
|
raw
2020-07-14
feld
Merge branch 'feature/1922-media-proxy-whitelist' into...
blob
|
commitdiff
|
raw
2020-07-14
feld
Merge branch 'fix/scrubber-recompile-warnings-as-errors...
blob
|
commitdiff
|
raw
2020-07-14
feld
Merge branch '1940-admin-token-oauthless-auth' into...
blob
|
commitdiff
|
raw
2020-07-19
Ivan Tashkinov
[#1940] Reinstated OAuth-less `admin_token` authenticat...
blob
|
commitdiff
|
raw
2020-05-18
lain
Merge branch 'docs/storing-remote-media' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-05-14
lain
Merge branch 'features/openrc-console' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-19
lain
Merge branch 'remake-remodel' into develop
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'feature/mastofe-admin-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'docs/direct_conversation_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-13
rinpatch
Merge branch 'static-accept-missing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-09
lain
Merge branch 'patch-1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-03-08
rinpatch
Merge branch 'release/2.0.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-07
rinpatch
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-05
rinpatch
Merge branch 'stable' into release/2.0.0
blob
|
commitdiff
|
raw
|
diff to current
2020-03-04
lain
Merge branch 'fix/no-email-no-fail' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-03
Alexander Strizhakov
Merge branch 'develop' into gun
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
lain
Merge branch 'prepared-statements-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Egor Kislitsyn
Merge branch 'develop' into fix/signup-without-email
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'feature/1482-activity_pub_transactions...
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-03-02
Haelwenn (lanodan...
Bump copyright years of files changed after 2020-01-07
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'require-signature' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-02-20
lain
Merge branch 'docs_updating' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-30
rinpatch
Merge branch 'develop' into fix/disable-rate-limiter...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-28
lain
Merge branch 'translation/errors-french' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-27
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
rinpatch
Merge branch 'no-error-404' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-22
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Roman Chvanikov
Merge branch 'develop' into fix/attachments-cleanup
blob
|
commitdiff
|
raw
|
diff to current
2020-01-21
Alexander Strizhakov
Merge branch 'develop' into admin-be
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
Mark Felder
Merge branch 'develop' into fix/attachments-cleanup
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
lain
Merge branch 'fix-admin-api-scope' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-20
Haelwenn
Merge branch 'hashtag-benchmarks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
lain
Merge branch '1478-oauth-admin-scopes-tweaks' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-01-10
Ivan Tashkinov
[#1478] OAuth admin tweaks: enforced OAuth admin scopes...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-24
Haelwenn
Merge branch 'feat/doc-improvements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-17
Maksim Pechnikov
Merge branch 'develop' into feature/tag_feed
blob
|
commitdiff
|
raw
|
diff to current
2019-12-14
Maksim Pechnikov
Merge branch 'develop' into issue/1383
blob
|
commitdiff
|
raw
|
diff to current
2019-12-12
Egor Kislitsyn
Merge branch 'develop' into feature/custom-runtime...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
Maxim Filippov
Merge branch 'develop' into feature/report-notes
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
Mark Felder
Merge branch 'develop' into issue/1411
blob
|
commitdiff
|
raw
|
diff to current
2019-12-11
rinpatch
Merge branch 'chore/fast_sanitize_bump' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
feld
Merge branch 'fix/unsubscribe-route' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
Sadposter
Merge branch 'develop' into 'domain-block-precedence'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
lain
Merge branch '1427-oauth-admin-scopes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
lain
Merge branch 'develop' into '1427-oauth-admin-scopes'
blob
|
commitdiff
|
raw
|
diff to current
2019-12-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-07
Ivan Tashkinov
[#1427] Extra check that admin OAuth scope is used...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-06
Ivan Tashkinov
[#1427] Fixes / improvements of admin scopes support...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-06
Ivan Tashkinov
[#1427] Bugfix for `enforce_oauth_admin_scope_usage...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-12-05
Ivan Tashkinov
[#1427] Reworked admin scopes support.
blob
|
commitdiff
|
raw
|
diff to current
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-24
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-24
Maksim Pechnikov
Merge branch 'develop' into issue/1276
blob
|
commitdiff
|
raw
|
diff to current
2019-10-23
feld
Merge branch '1304-user-info-deprecation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
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-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-12
Roman Chvanikov
merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
kaniini
Merge branch 'localization' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
Egor Kislitsyn
Wrap error messages into gettext helpers
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
William Pitcock
update copyright years to 2019
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
add license boilerplate to pleroma core
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
Rin Toshaka
Merge develop to refactor/mix-tasks
blob
|
commitdiff
|
raw
|
diff to current
2018-12-03
lambda
Merge branch 'fix-media-proxy-defaults' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-02
rinpatch
Merge branch 'develop' into fix/theora-detection-read...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
kaniini
Merge branch 'validate-user-info' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history