about summary refs log tree commit diff
path: root/config/application.rb
AgeCommit message (Collapse)Author
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-04Set the default locale in config (#6580)Akihiko Odaki
Previously the default locale was set by Localized concern for controllers, but it was not enforced for mailers. config is enforced throughout the application and an appropriate place to set the default locale.
2018-03-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
2018-02-28Fix #942: Seamless LDAP login (#6556)Eugen Rochko
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
2018-02-21Fix avatar and header issues by using custom geometry detector (#6515)Eugen Rochko
* Fix avatar and header issues by using custom geometry detector Revert a part of #6508. The file passed to dynamic styles method was not actually a file, but an instance of Paperclip::Attachment, which broke all styles by always returning {} from the method. One problem with GIF avatars was that Paperclip::GeometryDetector reported wrong dimensions for them, e.g. 120x120 GIF avatar would for some reason be detected as 120x53. By writing our own geometry parser, we can use FastImage, which also happens to be faster than ImageMagick, to detect image dimensions, which are also correct. Unfortunately, this PR does not implement skipping a `convert` entirely if the dimensions are already correct, as I found no easy way to write that behaviour into Paperclip without rewriting the Paperclip::Thumbnail class. * Only invoke convert if dimension or format needs to be changed
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstream-20180121David Yip
2018-01-22armenian translations initial commit (#6320)Norayr Chilingarian
* adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
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
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2017-12-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-31Adding Serbian translation (#6133)Branko Kokanovic
* Adding Serbian translation * i18n-tasks normalize
2017-12-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-17Add Slovak translation (#6052)Peter
* Add Slovak translation * Slovak translation: i18n-normalize
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
* Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-08Set snowflake IDs for backdated statuses (#5260)Eugen Rochko
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity - Skip for statuses coming from inbox, aka delivered in real-time - Skip for statuses that claim to be from the future
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
* Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)" This reverts commit 6859d4c0289e767955aac3f345074220fe200604. * Revert "Do not execute the job with the same arguments as the retry job (#4814)" This reverts commit be7ffa2d7539d5a1946a3933cb9d242b9fac0ddc.
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
* Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Updated korean translation * i18n: fix test fails
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
* Set config.cache_store in application.rb * Set config.cache_store in environments. * fix code format.
2017-05-17Add catalan language (#3084)spla
* Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225
2017-05-08Add Thai langauge (#2903)Koala Yeung
* Updated Thai language * locale: remove unused translation in Thai * locale: add Thai to settings menu and application * locale: fix activerecord.th.yml format
2017-05-07Add Turkish yml file (#2878)Özcan Zafer AYAN
* Add Turkish yml file * Add translation files for Turkish * Deleted click_to_edit key and val Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line
2017-05-03Replace sprockets/browserify with Webpack (#2617)Eugen Rochko
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
2017-05-02Add Hebrew interface translation. (#2573)Ira
* follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...
2017-04-25Change ActivityPub paging to match spec. Clean up ActivityPub outbox ↵Evan Minto
changes. (#2410) * Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. * Fix code style and test failures for OutboxController. * Attempt to fix CI errors.
2017-04-24Persian translation (#2405)Masoud Abkenar
* Persian translation * adding :fa to make the site use the rtl stylesheet based on [this comment](https://github.com/tootsuite/mastodon/pull/2405#issuecomment-296721105) * fix missing quotes * add 'fa' locale
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
* Add failing spec showing that human_locales does not match what i18n knows about * Add missing `ar` key for arabic to human locales * Remove duplicate `id` key from available locales * Sort keys in human locales list * Add spec for human_locale helper
2017-04-23Adding arabic string localization (rebased) (#1895)Koala Yeung
* Create ar.jsx * Preparing file for translation. * Create ar.yml * Preparing file for translation. * Create simple_form.ar.yml * Preparing file for translation. * Create devise.ar.yml * Preparing file for translation. * Create doorkeeper.ar.yml * Preparing file for translation. * Update index.jsx Preparing file for translation. * Update mastodon.jsx * Preparing file to translation. * Correction thanks to @Taekiro https://github.com/tootsuite/mastodon/pull/1798#pullrequestreview-32924922 * Update settings_helper.rb Preparing file to translation. * Update application.rb * Preparing file to translation. * Update simple_form.ar.yml * Update doorkeeper.ar.yml * Update devise.ar.yml * Update ar.yml * Fix i18n-tasks unused issue (ar) Remove unused translation strings * Update application.rb * Update ar.jsx * Fix various issues with Arabic translation * Fix duplication caused in merge * Fix syntax error in devise.ar.yml * Fix import error Duplicated incorrect import in mastodon.jsx * Fix duplication error in locales/index.jsx * Update ar.yml * Update ar.jsx * Update ar.yml * Update ar.jsx * Fix ar translation
2017-04-23Add a confirmation modal: (#2279)Eugen
- Deleting a toot - Muting, blocking someone - Clearing notifications Remove source map generation from development environment, as it is a huge performance sink hole with little gains
2017-04-21Remove deprecated features at React v15.5 (#1905)Yamagishi Kazutoshi
* Remove deprecated features at React v15.5 - [x] React.PropTypes - [x] react-addons-pure-render-mixin - [x] react-addons-test-utils * Uncommented out & Add browserify_rails options * re-add react-addons-shallow * Fix syntax error from resolve conflicts * follow up 59a77923b368d48c590cd9f4a0c6b73ce972d33f
2017-04-21Fix: missing : for language (#2274)Eduardo Elias
2017-04-21Add Indonesian (Bahasa Indonesia / id) translation (#2200)Koala Yeung
* add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * fix InvalidLocaleData on a string * fix InvalidLocaleData on a string * Fix language keys in Indonesian ruby locale (id) Use "id" instead of "en" as object keys. * Removed obsoleted translation (id)
2017-04-21Add Ido (io) translation (#2202)Koala Yeung
* Add Ido (io) translation * Fix mastodon.jsx for io reference There is no react-intl support for io. Removed the references.
generated by cgit-pink (git 2.37.1) at 2024-11-05 10:18:45 +0000