about summary refs log tree commit diff
path: root/config/application.rb
AgeCommit message (Expand)Author
2018-03-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-20Fix i18n fallback configuration conflicts with environment configurations (#6...Akihiko Odaki
2018-03-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-19bugfixes and gem update (#6831)Alexander
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-04Set the default locale in config (#6580)Akihiko Odaki
2018-03-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-02-28Fix #942: Seamless LDAP login (#6556)Eugen Rochko
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
2018-02-21Fix avatar and header issues by using custom geometry detector (#6515)Eugen Rochko
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstream-20180121David Yip
2018-01-22armenian translations initial commit (#6320)Norayr Chilingarian
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-19Change belongs_to_required_by_default to true (#5888)Yamagishi Kazutoshi
2018-01-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-02Adding Serbian latin translations (#6146)Branko Kokanovic
2017-12-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-31Adding Serbian translation (#6133)Branko Kokanovic
2017-12-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-17Add Slovak translation (#6052)Peter
2017-12-12Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2017-12-10Add Galician language support (#5955)Yamagishi Kazutoshi
2017-10-18Merge tag 'v2.0.0' into gs-masterDavid Yip
2017-10-17Swedish translation (#5406)Håkan Eriksson
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-08Set snowflake IDs for backdated statuses (#5260)Eugen Rochko
2017-10-07adding support for audio uploads, transcoded to mp4 videosDJ Sundog
2017-09-28Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstreamOndřej Hruška
2017-09-14Revert unique retry job (#4937)abcang
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip
2017-09-05Do not execute the job with the same arguments as the retry job (#4814)abcang
2017-08-07Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko
2017-07-12Merge upstream!! #64 <3 <3kibigo!
2017-07-04i18n: Add korean translation (#4064)Gyuhwan Park
2017-06-23update local modifications for cors and cpbeatrix-bitrot
2017-06-23CORS tweaksBeatrix Bitrot
2017-05-22Set config.cache_store in environments file. (#3219)Clworld
2017-05-17Add catalan language (#3084)spla
2017-05-08Add Thai langauge (#2903)Koala Yeung
2017-05-07Add Turkish yml file (#2878)Özcan Zafer AYAN
2017-05-03Replace sprockets/browserify with Webpack (#2617)Eugen Rochko
2017-05-02Add Hebrew interface translation. (#2573)Ira
2017-04-25Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes....Evan Minto
2017-04-24Persian translation (#2405)Masoud Abkenar
2017-04-24add `patch` method support to CORS (#2408)Shin Adachi
2017-04-24Simplify browserify+babelify config (#2377)Nolan Lawson
2017-04-23Ensure i18n matches options (#2358)Matt Jankowski
2017-04-23Adding arabic string localization (rebased) (#1895)Koala Yeung
2017-04-23Add a confirmation modal: (#2279)Eugen