about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-08i18n mailer files for Occitan language (#2924)Quent-in
* Create reset_password_instructions.oc.html.erb * Create reset_password_instructions.oc.text.erb * Create password_change.oc.html.erb * Create password_change.oc.text.erb * Create confirmation_instructions.oc.html.erb * Create confirmation_instructions.oc.text.erb
2017-05-08Updating and extending Dutch strings (#2930)jeroenpraat
* Update nl * Update nl * Update nl * Create confirmation_instructions.nl.html.erb * Create confirmation_instructions.nl.text.erb * Create password_change.nl.html.erb * Create password_change.nl.text.erb * Create reset_password_instructions.nl.html.erb * Create reset_password_instructions.nl.text.erb
2017-05-08Delegate Account#user_locale method and allow nil (#2927)Matt Jankowski
2017-05-08Improve error message for non-existent user being made an admin (#2929)Matt Jankowski
2017-05-08Misc gem bumps (#2919)Matt Jankowski
* Update bundler-audit to version 0.5.0 * Update oj to version 3.0.6 * Update http-form_data to version 1.0.2 * Update parallel to version 1.11.2 * Update rails-i18n to version 5.0.4 * Update rack-protection to version 2.0.0 * Update haml to version 5.0.1 * Update scss_lint to version 0.53.0 * Relax requirement on i18n-tasks * Remove haml and haml_lint gem requirement
2017-05-08Update fr.json (#2915)ButterflyOfFire
* Update fr.json Updating some missing french translations. * Update fr.json Fix repetition in line 41. * Update fr.json Fix : adding space between {name} and ? question mark.
2017-05-08Prevent selection of unacceptable Content-Type files (#2910)Yamagishi Kazutoshi
* Prevent selection of unacceptable Content-Type files * replace hard code * media_attachments accept content-types in initial state
2017-05-08Update simple_form.ar.yml (#2908)ButterflyOfFire
* Update simple_form.ar.yml Added missing strings that were introduced to simple_form.ar.yml and completing translation. * Create confirmation_instructions.ar.html.erb * Create confirmation_instructions.ar.text.erb * Create password_change.ar.html.erb * Create password_change.ar.text.erb * Create reset_password_instructions.ar.text.erb * Create reset_password_instructions.ar.html.erb
2017-05-08Improve scss color variables (#2912)Matt Jankowski
- Updates scss variables file to use better-named variables for black/white/etc - Arranges the "mastodon classic" colors into variables - Remove all references to `$color-*` naming, replacing with new This does not in itself introduce "theme" support, but: - It would probably be easier to start working on theme support after this change and others - Even without the goal of themes, these changes make it more clear how the colors are being used. There is almost definitely some edge case in here where I've guessed the intent/context of some color usage incorrectly, but it still seems like a net improvement.
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-08Fix broken features list in RTL languages (#2909)Yamagishi Kazutoshi
Fixes #2905
2017-05-08Fix small typo in ru.json (#2906)ster
2017-05-08Remove unnecessary keep file. (#2902)HANATANI Takuma
2017-05-08Render sidekiq scheduler (#2898)alpaca-tc
2017-05-08Added haml-lint and fix warnings (#2773)yhirano
* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
2017-05-08Improve example env file for local Postfix relay (#2892)Jarek Lipski
2017-05-08Improve allowed language handling (#2897)Matt Jankowski
* Dont allow empty value in user allowed languages * Sanitize language input to reject blank values in array
2017-05-08Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)Eugen Rochko
2017-05-07small ui change so that the settings buttons at the top of each column are ↵Jessica K. Litwin
actually aligned properly (#2894)
2017-05-07Update Ukrainian, Russian translations (#2893)ster
* Update Ukrainian translation (rebased off Russian translation) * Update Ukrainian, Russian translations
2017-05-07Enable CodeClimate SCSS Lint checks (#2886)yhirano
* add scss_lint to Gemfile * add .scss-lint.yml * fix warnings of scss-lint * chmod -x styles/variables.scss * Enable CodeClimate SCSS Lint checks
2017-05-07Update Russian translation (#2891)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation
2017-05-07Add final newline to locale files (#2890)Yamagishi Kazutoshi
2017-05-07namespace redis usage (#2869)beatrix
* add redis-namespace gem * namespace redis usage * refactor redis namespace code to be less intrusive previously : would be prepended to keys when the REDIS_NAMESPACE env var was not set now if it is not set the namespacing functions are not used at all, which should prevent disruptions when instances update. * fix redis namespace variable style in streaming js * remove trailing space * final redis namespace style fix
2017-05-07Update ar.json (#2888)ButterflyOfFire
* Update ar.json Adding more translations (updating the missing non translated strings) and some little minimal corrections. * Update ar.json Deleting final new line as suggested in the review. * Update ar.json * Update ar.json
2017-05-07raise-when-oembed-not-found (#2882)masarakki
2017-05-07Add effective index to subscriptions (#2885)alpaca-tc
2017-05-07Refactor account.rb (#2881)alpaca-tc
* Call simple query * Refactor Account#keypair * Replace escaped single quote * Extract similar behavior to method * Gather the same condition to one block * Remove not needed receiver
2017-05-07locale: add Occitan locale-data for js (#2845)Koala Yeung
Translation works by @Quent-in.
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-07Fix local fonts and change font-face values (#2877)Ram Lmn
* Fix local fonts and change font-face values * Remove eot font files
2017-05-07Remove local_time gem, and add similar (#2875)Yamagishi Kazutoshi
2017-05-07upgrade emojione-picker (#2874)Nolan Lawson
2017-05-07add source maps for dev/production (#2873)Nolan Lawson
2017-05-07Fix a aspect ratio for the embedded video (#2872)Yamagishi Kazutoshi
2017-05-07Fix redirect path for admin (#2871)Yamagishi Kazutoshi
2017-05-07i18n: Update Hebrew interface translation. (#2880)Ira
* follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding ‏ 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-05-07Unblock domain service specs/refactor (#2867)Matt Jankowski
* Add spec for unblock domain service * Refactor UnblockDomainService
2017-05-07Fix unused key issue in zh-HK (#2870)Koala Yeung
* locale: remove unused keys in zh-HK * locale: update json translations * handled the untranslated strings. * removed unused keys.
2017-05-07Fix locale key for account card (#2866)Yamagishi Kazutoshi
2017-05-07Enable CodeClimate Brakeman checks (#2861)yhirano
* add brakeman to Gemfile * Enable CodeClimate brakeman checks * add config/brakeman.ignore
2017-05-07add asynchronous emojione-picker (code-splitting) (#2863)Nolan Lawson
2017-05-07Enable CodeClimate Bundler-Audit checks (#2862)yhirano
* add bundler-audit to Gemfile * Enable CodeClimate bundler-audit checks
2017-05-06Hotfix convert string from symbol (#2856)alpaca-tc
* Convert key to string from symbol * Prefer :public_send instead of
2017-05-06Fixes slow query in notifications api (#2851)alpaca-tc
* Add inclusion validation for activity_type * When excluding all types with `WHERE NOT IN`, the query search all rows.
2017-05-06Eslintrc fix (#2850)Koala Yeung
* eslintrc: adapt changes in eslint-plugin-jsx-a11y * Replace 'jsx-a11y/img-has-alt' with 'jsx-a11y/alt-text'. Reference: evcohen/eslint-plugin-jsx-a11y@24b6193 * Replace 'jsx-a11y/onclick-has-focus' with 'jsx-a11y/interactive-supports-focus' Reference: evcohen/eslint-plugin-jsx-a11y@cbdfeb8 * Replace 'jsx-a11y/onclick-has-role' with 'jsx-a11y/no-noninteractive-element-interactions' Reference: evcohen/eslint-plugin-jsx-a11y@18c9b71 * Update eslint-plugin-jsx-a11y to 5.0.0 Follow the change in Code Climate. Make sure the same eslintrc can be executed locally and in Code Climate. * Convert .eslintrc.json to equivlant .eslintrc.yml * Less quotes and commas, more readability, allow comment.
2017-05-06remove preset-es2015 from babel config (#2849)Nolan Lawson
2017-05-06switch uglify to compress:true,mangle:true (#2852)Nolan Lawson
2017-05-06Fix Croatian localedata issues in mastodon.js (#2844)Koala Yeung
* locale: added hr and oc react-intl locale data * adds Croatian locale data in mastodon.js * adds Occitan locale data in mastodon.js Resolves #2667 * locale: sort locale data imports in mastodon.js * locale: remove oc reference * [react-intl](https://github.com/yahoo/react-intl) does not provide default locale data for Occitan. Hence removed from reference.
2017-05-06Replace ws with uws (#2807)Eshin Kunishima
* Replace ws with uws * fix indent * Adjust indentation * remove trailing space