projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Fix sporadic test
[akkoma]
/
config
/
dev.exs
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
2019-06-28
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
2019-06-22
rinpatch
Merge branch 'mix_sem_ver_version_fix' into 'develop'
blob
|
commitdiff
|
raw
2019-06-21
kaniini
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
blob
|
commitdiff
|
raw
2019-06-21
kaniini
Merge branch 'oauth_secure_redirect' into 'develop'
blob
|
commitdiff
|
raw
2019-06-21
rinpatch
Merge branch 'develop' into release-docs
blob
|
commitdiff
|
raw
2019-06-20
rinpatch
Merge branch 'fix/config-gen-releases' into 'develop'
blob
|
commitdiff
|
raw
2019-06-20
lain
Merge branch 'fix/dynamic-configuration' into 'develop'
blob
|
commitdiff
|
raw
2019-06-20
Alexander Strizhakov
Fixes for dynamic configuration
blob
|
commitdiff
|
raw
2019-06-15
lain
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
kaniini
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
rinpatch
Merge branch 'feature/add-background-image-to-mastoapi...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
kaniini
Merge branch 'feature/905-dynamic-configuration-in...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
Alexander Strizhakov
it is changed in compile time
blob
|
commitdiff
|
raw
|
diff to current
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lambda
Merge branch 'features/download-mastofe-build' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-13
Alex S
Merge develop to 788-separate-email-addresses
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lambda
Merge branch 'feature/767-multiple-use-invite-token...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Sadposter
Merge branch 'develop' into feature/user-status-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Haelwenn (lanodan...
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-09
lambda
Merge branch 'bugfix/follower_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'improve_upgrade_user_from_ap_id' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'twitter_oauth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-18
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-11
Ivan Tashkinov
Sign in via Twitter (WIP).
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
Karen Konou
Merge branch 'develop' into hellthread-filter-fix
blob
|
commitdiff
|
raw
|
diff to current
2019-02-12
kaniini
Merge branch 'feature/csp_mastofe-dev' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-12
Haelwenn (lanodan...
config/dev.exs: Don’t put secure cookies on dev
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-18
rinpatch
Merge branch 'develop' into fix/formatter-ignore-html...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'test-mix-tasks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'testfix/webfinger-jrd' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Haelwenn
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
eal
Merge branch 'fix/masto-put-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
eal
Merge branch 'fix/dev-exs-enable-unsecure-cookies-by...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Rin Toshaka
Enable unsecure cookies by default in dev.exs
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch '114_user_registration_emails' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Addressed MR comments. Removed functionality...
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
lambda
Merge branch 'fix/config-replace-try-catch-with-file...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
replace try/catch with File.Exists? in dev.exs
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
KANEKO Yoshitaka
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-03-30
lain
Format the code.
blob
|
commitdiff
|
raw
|
diff to current
2018-03-08
lambda
Merge branch 'feature/activitypub' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-08
lain
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2018-02-24
lain
Longer header lenght.
blob
|
commitdiff
|
raw
|
diff to current
2017-12-09
Roger Braun
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2017-11-23
Lain Iwakura
Add configuration generation tool, update readme.
blob
|
commitdiff
|
raw
|
diff to current
2017-09-15
Roger Braun
Add instance config options.
blob
|
commitdiff
|
raw
|
diff to current
2017-03-29
Roger Braun
Basic file uploading via TwAPI.
blob
|
commitdiff
|
raw
|
diff to current
2017-03-17
Roger Braun
Phoenix skeleton
blob
|
commitdiff
|
raw
|
diff to current