112 Commits (ed17e173d6ca915f19bce84a12222b89ab116243)

Author SHA1 Message Date
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
Jenkins e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 61dcb686a8 Fix i18n fallback configuration conflicts with environment configurations (#6843)
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 0306e3e9be bugfixes and gem update (#6831)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 51d760960c Set the default locale in config (#6580)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko a7171af0a3
Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
David Yip 48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
Norayr Chilingarian 48cd6dc6ca armenian translations initial commit (#6320)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true (#5888)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 21b9da6418 Adding Serbian latin translations (#6146)
7 years ago
Jenkins fa9b7ece2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 7d376e41be Adding Serbian translation (#6133)
7 years ago
Jenkins e7fa7fce25 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Peter f38e6a14f2 Add Slovak translation (#6052)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 6e3f176b8e Add Galician language support (#5955)
7 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson a2b600428c Swedish translation (#5406)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
DJ Sundog 96ba3482b9 adding support for audio uploads, transcoded to mp4 videos
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
abcang 1aad015bbb Revert unique retry job (#4937)
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
abcang be7ffa2d75 Do not execute the job with the same arguments as the retry job (#4814)
7 years ago
Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'
7 years ago
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
Gyuhwan Park 4cddef1cea i18n: Add korean translation (#4064)
7 years ago
beatrix-bitrot 9bc593d675 update local modifications for cors and cp
8 years ago
Beatrix Bitrot a337c5dbe5 CORS tweaks
8 years ago
Clworld df92f010ad Set config.cache_store in environments file. (#3219)
8 years ago
spla a51c8074df Add catalan language (#3084)
8 years ago
Koala Yeung cbd673601c Add Thai langauge (#2903)
8 years ago
Özcan Zafer AYAN 983593ddf4 Add Turkish yml file (#2878)
8 years ago
Eugen Rochko f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617)
8 years ago
Ira 438ce5809f Add Hebrew interface translation. (#2573)
8 years ago
Evan Minto 122d59ac41 Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410)
8 years ago
Masoud Abkenar bb04a9be52 Persian translation (#2405)
8 years ago
Shin Adachi bc955eaf61 add `patch` method support to CORS (#2408)
8 years ago
Nolan Lawson 1e2a5dded7 Simplify browserify+babelify config (#2377)
8 years ago
Matt Jankowski 55e1e12b7d Ensure i18n matches options (#2358)
8 years ago