about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-03Fix #2706 - Always respond with 200 to PuSH payloads (#2733)Eugen Rochko
Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified Fix #2629 - Correctly handle confirm_domain? for local accounts Unify rules for extracting author acct from XML, prefer <email>, fall back to <name> + <uri> (see also #2017, #2172)
2017-05-03Vagrantfile: node 6 (#2752)kawax
2017-05-03Language improvements, replace whatlanguage with CLD (#2753)Matt Jankowski
* add failing en specs * add cld2 gem * Replace WhatLanguage with CLD
2017-05-03Update of simple_forum_oc (#2745)Quent-in
* Update of simple_forum_oc * Update simple_form.oc.yml
2017-05-03i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)ヨイツの賢狼ホロ | 3rd style
* Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys
2017-05-03Add styles for small devices to .onboarding-modal (#2748)unarist
2017-05-03Added support parallel_tests (#2740)Keiji Matsuzaki
- Added new gem the `parallel_tests`. - Updated .travis.yml. - Improved scripts and environment variable.
2017-05-03Add Thai Language (#2598)jirayudech
* Create th.yml * Update th.yml * Update thai translation * update thai translation. * Update Thai translation * Update thai translation * Update thai thanslation * Update thai translation * Update th.yml * Update th.yml
2017-05-03remove capistrano/faster_assets from Capfile (#2737)esetomo
2017-05-03Show boosted user's avatar (#2518)kawax
* Show boosted user's avatar * add .status__avatar-boost * margin * apply to notifications too. * account__avatar-boost * Add inline prop to Avatar component * Add AvatarOverlay component * rename mixins.scss * move files for latest master * fixed for webpack
2017-05-03i18n: updated Polish translation (#2729)m4sk1n
* i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03Update simple_form.ja.yml (#2746)Masafumi Otsune
"サーバー" in Japanese is "Server", so I modified it to instance according to English.
2017-05-03Fix width of .confirmation-modal on narrow screens (#2743)unarist
2017-05-03Add Japanese translation for allowed languages (#2738)Yamagishi Kazutoshi
* Add Japanese translation for allowed languages * Remove duplicate expression words
2017-05-03Use URI.join for generate asset URL (#2741)Yamagishi Kazutoshi
* Use URI.join for generate asset URL * to String
2017-05-03Use puma config for Procfile.dev (#2735)Matt Jankowski
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-03Allow to set CA file for SMTP (#2713)Akihiko Odaki
2017-05-02Auth sign out (#2511)Matt Jankowski
* Add a spec for signing out * Add spec showing that suspended user gets a 403 forbidden on sign out * Allow suspended account users to sign out
2017-05-02Add rspec to further specify FollowRemoteAccountService (#2414)ThibG
2017-05-02i18n: updated Polish translation (#2727)m4sk1n
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-02Add option to disable two factor auth in admin accounts panel. (#2584)Kaylee
* Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!
2017-05-02Add admin area view partials for each record type (#2700)Matt Jankowski
2017-05-02Creation of activerecord for OC (#2721)Quent-in
* Creation of activerecord for OC * Update activerecord.oc.yml
2017-05-02Norwegian translation for email notifications (#2673)Audun Larsen
* Create confirmation_instructions.no.html.erb * Create confirmation_instructions.no.text.erb * Create password_change.no.html.erb * Create password_change.no.text.erb * Create reset_password_instructions.no.html.erb * Create reset_password_instructions.no.text.erb * Translates html welcome email * Translates welcome email * Translates html password changed email * Translates password changed email * Translates html reset password email * Translates reset password email * Fixes typo in translation * Fixes typo in translation
2017-05-02Darkens colour on stream entries meta. (#2616)Ash Furrow
2017-05-02i18n: Updated Polish translation (#2686)m4sk1n
#807
2017-05-02Reset textarea height when press submit key (#2681)Yamagishi Kazutoshi
* Reset textarea height when press submit key * dry * DON'T NEED props
2017-05-02Language: update pt-BR (#2687)Eduardo Elias
2017-05-02Fix to completely hide NSFW-tagged images (#2724)hakoai
2017-05-02Fix subscription expiration condition (#2715)Yamagishi Kazutoshi
* Fix subscription expiration condition * dry and add spec
2017-05-02Make it possible to check Subscription that has expired (#2712)Yamagishi Kazutoshi
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-05-01grammar fixes (#2695)Drew Gates
“such as” should be used instead of “like” under imports->preface. Reworded imports->preface and recovery_instructions for better flow.
2017-05-02fix(boost-icon): Align center for Firefox (#2690)Stephen Burgess
2017-05-02annotate models (#2697)yhirano
* add annotate to Gemfile * rails g annotate:install * configure annotate_models * add schema info to models * fix rubocop to add frozen_string_literal
2017-05-02Coverage for remote follows (#2694)Matt Jankowski
* Add coverage for create with empty acct value * Add coverage for create with webfinger failure * Add coverage for create with webfinger providing bad values * Add coverage for create when webfinger is good * Add coverage for session[:remote_follow] having data * Simplify how remote follow pulls acct from session * Remote follow behaves more like model * Move the discovery portions of remote follow out of controller * Check for suspended accounts
2017-05-01Error responses cleanup (#2692)Matt Jankowski
* Use respond_with_error for forbidden errors * Wrap up common error code into single method
2017-05-01Italian translation (#2654)Giuseppe Pignataro
* Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml
2017-05-01fix(scrolling): Center for large screen w/o breaking horiz scroll (#2682)Stephen Burgess
2017-05-01fix(dropdowns): Allow for dropdowns to fill full column (#2684)Stephen Burgess
* fix(dropdowns): Allow for dropdowns to fill full column When the text inside a dropdown is longer than it is for English, the text is truncated which can result in a less-than-usable experience for languages such as German with longer words. This commit addresses the following: * Allow the dropdown to expand to the entire width of the column based on the length of the text in the dropdown * Align active dropdown arrow in relation to the trigger rather than the dropdown * Show the right hand side of the dropdown which was previously hidden (could not see border radius) * Ensure the three places dropdowns of status, account, and emoji appear well in Chrome, Firefox, Safari * fix(emoji-dropdown): Restore emoji dropdown caret
2017-05-01Filter on allowed user language preferences (#2361)Matt Jankowski
* Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference
2017-05-01Fix Rubocop offences (#2630)yhirano
* disable Bundler/OrderedGems * fix rubocop Lint/UselessAssignment * fix rubocop Style/BlockDelimiters * fix rubocop Style/AlignHash * fix rubocop Style/AlignParameters, Style/EachWithObject * fix rubocop Style/SpaceInLambdaLiteral
2017-05-01Detect extension for preview card (#2679)Yamagishi Kazutoshi
* Detect extension for preview card * next
2017-04-30Reports spec for media attachments, clean up method (#2660)Matt Jankowski
* Add coverage for Report#media_attachments * Direct query on media attachment
2017-04-30Add postgres/redis folder to .dockerignore (#2659)mecab
2017-04-30Updating Indonesian locale (#2644)Alvina Putri
* update id.jsx file * update id.yml for new strings and improvements * add activerecord.id.yml * improve translation that out of context * fix another ooc string * fix main key
2017-04-30Additional key checks for browser compatibility (#2539)Noëlle Anthony
Not all browsers recognize e.key === 'Escape'; some use 'Esc' and some only respond to the keyCode.
2017-04-30Center web app on larger windows sizes (#2021)Hugo Gameiro
* center web app for larger screen sizes * move center app to components.scss * center app on larger window sizes * center .columns-area
2017-04-30Fix character_counter.jsx (#2653)AA4ch1
This commit fixes #2576