projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge develop
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
instance.ex
2019-07-12
Roman Chvanikov
merge develop
blob
|
commitdiff
|
raw
2019-07-10
kaniini
Merge branch 'release/listener' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Sachin Joshi
add listener port and ip option for 'pleroma.instance...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Mark Felder
Merge branch 'develop' into feature/allow-user-query...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-swift' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-05
rinpatch
Merge branch 'fix/1058-uploads-dir-consistency' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-05
Haelwenn (lanodan...
tasks/pleroma/instance.ex: Change :upload_dir to :uploa...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-30
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-06-29
kaniini
Merge branch 'feature/merge-mastodon-admin-views-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
lain
Merge branch 'release/1.0' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
lain
Merge branch 'release-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-26
rinpatch
Merge branch 'update-mastofe/glitch-soc-2019-06-26...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
kaniini
Merge branch 'rich_media_titles_two' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
kaniini
Merge branch 'admin-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-22
Haelwenn
Merge branch 'docs/remove-tootdon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-22
Haelwenn
Merge branch 'feature/rum-config-generator' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-22
rinpatch
Support RUM indexes in the config generator
blob
|
commitdiff
|
raw
|
diff to current
2019-06-22
rinpatch
Merge branch 'develop' into release-docs
blob
|
commitdiff
|
raw
|
diff to current
2019-06-22
rinpatch
Merge branch 'mix_sem_ver_version_fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
rinpatch
Remove the getting started steps from pleroma.instance...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
rinpatch
Merge branch 'develop' into release-docs
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
kaniini
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
kaniini
Merge branch 'oauth_secure_redirect' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
kaniini
Merge branch 'revert-6f5a0cc1' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
kaniini
Merge branch 'fix-rate-limit-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
rinpatch
Merge branch 'move-sample-configs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
rinpatch
Move config templates to priv so they can be found...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
rinpatch
Default DB configuration to false and set the default...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-21
rinpatch
Merge branch 'develop' into release-docs
blob
|
commitdiff
|
raw
|
diff to current
2019-06-20
rinpatch
Merge branch 'fix/config-gen-releases' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-20
rinpatch
Merge branch 'develop' into fix/config-gen-releases
blob
|
commitdiff
|
raw
|
diff to current
2019-06-20
rinpatch
Allow setting upload/static directories in the config...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-19
rinpatch
Remove a useless binding from config template call
blob
|
commitdiff
|
raw
|
diff to current
2019-06-19
rinpatch
Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and...
blob
|
commitdiff
|
raw
|
diff to current
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-06-11
lain
Merge branch 'feature/rate-limiter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-11
kaniini
Merge branch 'change-containment-default' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-11
kaniini
Merge branch 'preload-changes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-10
lain
Merge branch 'feature/releases' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-09
rinpatch
Merge branch 'develop' into feature/releases
blob
|
commitdiff
|
raw
|
diff to current
2019-06-08
rinpatch
Make mix tasks work in a release
blob
|
commitdiff
|
raw
|
diff to current
2019-06-06
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Roman Chvanikov
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-11
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
Roman Chvanikov
Merge develop
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-30
Roman Chvanikov
Merge 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-20
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Roman Chvanikov
Digest emails
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
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
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-16
kaniini
Merge branch 'feature/788-separate-email-addresses...
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 '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
Alex S
Merge branch 'develop' into feature/788-separate-email...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Alex S
adding notify_email setting for trigger emails
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
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-06
Alex S
Merge develop to 770-add-emoji-tags
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-04
lambda
Merge branch 'fix/add-oauth-token-indexes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-03
lambda
Merge branch 'feature/robotstxt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-03
Sachin Joshi
Generate permissive or restrictive robots.txt in the...
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-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
lambda
Merge branch 'feature/dm-sanity' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
rinpatch
Merge branch 'bugfix/gen_signing_salt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
Haelwenn (lanodan...
Mix.Tasks.Pleroma.Instance: Generate signing_salt
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
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-30
Rin Toshaka
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
Haelwenn
Merge branch 'fix_485' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
spctrl
Change 'name' to 'instance_name' so option is used...
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
next
projects / akkoma / history