projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma]
/
test
/
pleroma
/
web
/
admin_api
/
controllers
/
config_controller_test.exs
2021-06-04
Sean King
Fix merge conflicts with upstream
blob
|
commitdiff
|
raw
2021-06-04
Haelwenn
Merge branch 'tests/openapi-everywhere' into 'develop'
blob
|
commitdiff
|
raw
2021-06-03
Haelwenn
Merge branch 'chore/rename-chat' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-06-01
Mark Felder
Rename the non-federating Chat feature to Shout
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-06-01
Haelwenn
Merge branch 'features/validators-note' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-31
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-14
Alex Gleason
Merge remote-tracking branch 'upstream/attachment-meta...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-13
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-03
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-29
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-16
rinpatch
Merge branch 'features/ingestion-ecto-tag' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-04-16
rinpatch
Merge branch 'feature/521-pinned-post-federation' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-16
rinpatch
Merge branch 'fix/2593-reading-exported-config-file...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-15
feld
Merge branch 'develop' into 'fix/notifsettings-breaking...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-14
feld
Merge branch 'fix/adminapi-concurrent-limiter' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-14
Mark Felder
Revert guards on string_to_elixir_types/1, remove unnec...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-13
Mark Felder
Initial test validating the AdminAPI issue
blob
|
commitdiff
|
raw
|
diff to current
2021-04-13
Haelwenn
Merge branch 'fix/instance-thumbnail-url' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-04-13
Mark Felder
Fix assignment / assertion
blob
|
commitdiff
|
raw
|
diff to current
2021-04-13
Mark Felder
Validate custom instance thumbnail set via AdminAPI...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-24
Haelwenn
Merge branch 'docfix/chat-token' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-12
rinpatch
Merge branch 'bugfix/answer-outbox' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-09
rinpatch
Merge branch 'features/ap_id-c2s-authentication' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
rinpatch
Merge branch 'feat/allow_alt_text_search_config' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-04
Mark Felder
Merge branch 'develop' into fix/reports-from-admins
blob
|
commitdiff
|
raw
|
diff to current
2021-02-04
feld
Merge branch 'fix/configdb-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'develop' into 'fix/2412-filters'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'feature/2438-users-posts-total-count...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
rinpatch
Merge branch 'feat/openapi-spec-export' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
feld
Merge branch 'develop' into 'fix/2411-mutes-api'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-31
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-28
Mark Felder
Improve error message for ConfigDB
blob
|
commitdiff
|
raw
|
diff to current
2021-01-27
lain
Merge branch 'chore/tests-use-clear_config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
Mark Felder
Convert tests to all use clear_config instead of Plerom...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'deprecate-public_endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Haelwenn
Merge branch 'optimize-command_available' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn (lanodan...
Bump Copyright to 2021
blob
|
commitdiff
|
raw
|
diff to current
2021-01-05
feld
Merge branch 'fix/mediaproxy-config-descriptions' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-28
Haelwenn
Merge branch 'features/hashtag-column' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-26
lain
Merge branch 'cachex-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
lain
Merge branch 'stable' into mergeback/2.2.1
blob
|
commitdiff
|
raw
|
diff to current
2020-12-21
lain
Test: More async/sync tweaks.
blob
|
commitdiff
|
raw
|
diff to current
2020-12-20
rinpatch
Merge branch 'bugfix/mastofe-install-script' into ...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-17
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-15
lain
Merge branch 'support/2255_posix_errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-09
lain
Merge branch 'auth-improvements' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-09
lain
Merge branch 'stream-follow-updates' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-07
lain
Merge branch 'feature/configdb-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-07
feld
Merge branch 'feature/configdb-mix-tasks-refactoring...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-06
Ivan Tashkinov
[#3174] Refactoring: ConfigDB fetching functions, Confi...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-06
Ivan Tashkinov
[#3112] Ensured presence and consistency of :user and...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
feld
Merge branch 'libmagic' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-12
rinpatch
Merge branch 'release/2.2.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'default-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-04
lain
Merge branch 'ejabberd-pleroma-auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-29
Haelwenn
Merge branch 'issue/2069' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-26
Haelwenn
Merge branch 'docs/ap_c2s' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-10-17
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Mark Felder
Merge branch 'develop' into feature/account-export
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-14
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into feature/gen-magic
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into chore/elixir-1.11
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/locked_user_field
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Mark Felder
Merge branch 'develop' into refactor/discoverable_user_...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
feld
Merge branch 'feature/1822-files-consistency' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-10-13
Alexander Strizhakov
tests consistency
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history