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]
/
config
/
config.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
|
diff to current
2021-06-03
Haelwenn
Merge branch 'chore/rename-chat' into 'develop'
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
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-06-01
Mark Felder
Move shout configuration from :instance, update docs...
blob
|
commitdiff
|
raw
|
diff to current
2021-06-01
Mark Felder
Just call it shout
blob
|
commitdiff
|
raw
|
diff to current
2021-06-01
Mark Felder
Rename the non-federating Chat feature to Shout
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
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-31
Haelwenn
Merge branch 'docs/goto-libera' into 'develop'
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
feld
Merge branch 'simplepolicy-announce-leak' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
feld
Merge branch 'gitignore-runtime-exs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
feld
Merge branch 'alias-router-helpers' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
feld
Merge branch 'plug-runtime-dev' into 'develop'
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
feld
Merge branch 'cycles-router' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
feld
Merge branch 'cycles-router-mediaproxy' into 'develop'
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-26
Haelwenn
Merge branch 'feat/expose_email_to_self' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-22
Haelwenn
Merge branch 'mix_config_deprecation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-20
Mark Felder
Switch from the deprecated "use Mix.config" to "import...
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 '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-16
Sean King
Remove MastoFE configuration stuff
blob
|
commitdiff
|
raw
|
diff to current
2021-04-01
rinpatch
Merge branch 'refactor/object_validator_validate' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-30
feld
Merge branch 'upstream/mrf-followbot' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-30
Mark Felder
Upstream original followbot implementation
blob
|
commitdiff
|
raw
|
diff to current
2021-03-21
rinpatch
Merge branch 'richmedia-workaround' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'mediaproxy-decode' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'fix/remove_auto_nsfw' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-16
Haelwenn
Merge branch 'update_open_api_spex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-15
rinpatch
Merge branch 'feature/object-hashtags-rework' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-12
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'features/reports-enhancements' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-28
lain
Merge branch 'feat/client_app_details' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-27
Haelwenn (lanodan...
Remove sensitive-property setting #nsfw, create Hashtag...
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-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-23
Ivan Tashkinov
[#3213] Misc. tweaks: proper upsert in Hashtag, better...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-18
Ivan Tashkinov
[#3213] HashtagsTableMigrator: fault rate allowance...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-18
rinpatch
Merge branch 'fix/chats-no-unread-in-openapi' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-17
Haelwenn
Merge branch 'feat/enforce-admin-scope-unconditionally...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-17
rinpatch
Remove `:auth, :enforce_oauth_admin_scope_usage`
blob
|
commitdiff
|
raw
|
diff to current
2021-02-13
Ivan Tashkinov
[#3213] `rescue` around potentially-raising `Repo.inser...
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-11
Ivan Tashkinov
[#3213] Reorganized hashtags cleanup. Transaction-wrapp...
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
feld
Merge branch 'fix/configdb-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-04
Haelwenn
Merge branch 'bugfix/notice-external-redirect' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'fix/2412-filters' 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
rinpatch
Merge branch 'feat/openapi-spec-export' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
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-31
Ivan Tashkinov
[#3213] Added HashtagsCleanupWorker periodic job.
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
feld
Merge branch 'service-worker-allowed-header' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
lain
Merge branch 'develop' into '2435-list-multiple-users'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
Alexander Strizhakov
support for expires_in/expires_at in filters
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
Haelwenn
Merge branch 'fix/missing-own_votes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
feld
Merge branch 'docs/apache-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Mark Felder
Merge branch 'develop' into docs/apache-config
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Mark Felder
Merge branch 'develop' into refactor/deactivated_user_field
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Mark Felder
Add ability to invalidate cache entries for Apache
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
eugenijm
Allow to define custom HTTP headers per each frontend
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
feld
Merge branch 'limiter-setup-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
lain
Merge branch 'test-cases-mox-setup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Alexander Strizhakov
changed naming in changelog
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Alexander Strizhakov
configurable limits for ConcurrentLimiter
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'copyright-fun' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'deprecate-public_endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history