Commit graph

2797 commits

Author SHA1 Message Date
alpaca-tc
62738bf1a9 Localize 'throttled' () 2017-05-03 23:36:19 +02:00
goofy-bz
ba25539563 Update fr.json ()
ajout espace insécable derrière pouet - pour voir
2017-05-03 23:36:01 +02:00
m4sk1n
bb67dd45aa i18n: updated Polish translation ()
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03 23:19:11 +02:00
Eugen Rochko
0951a2f9f3 Clean up redis configuration. Allow using REDIS_URL to set advanced ()
connection options instead of setting REDIS_HOST etc individually

Close 
2017-05-03 23:18:13 +02:00
yhirano
6f24c831e9 update gems () 2017-05-03 21:28:29 +02:00
ThibG
f1d96e40a3 Additional specs for URI handling () 2017-05-03 20:40:14 +02:00
Tomohiro Suwa
89550de8cf Correct Account model for rubocop ()
* Correct Account model for rubocop

* Undo these changes
2017-05-03 19:13:04 +02:00
Matt Jankowski
4195aa80fb Remove screenshot image () 2017-05-03 17:03:10 +02:00
Eugen Rochko
91a8a5eab8 Fix - Always respond with 200 to PuSH payloads ()
Fix  - Respond with 201 when Salmon accepted, 400 when unverified
Fix  - 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-05-03 17:02:18 +02:00
kawax
6d2cfb8e29 Vagrantfile: node 6 () 2017-05-03 16:59:51 +02:00
Matt Jankowski
9db85085a9 Language improvements, replace whatlanguage with CLD ()
* add failing en specs

* add cld2 gem

* Replace WhatLanguage with CLD
2017-05-03 16:59:31 +02:00
Quent-in
5cb8f0c0b2 Update of simple_forum_oc ()
* Update of simple_forum_oc

* Update simple_form.oc.yml
2017-05-03 14:23:17 +02:00
ヨイツの賢狼ホロ | 3rd style
e57cd022a1 i18n: Update zh-CN [ Chinese (China) ] translations. ()
* 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-03 14:03:16 +02:00
unarist
2ca810583b Add styles for small devices to .onboarding-modal () 2017-05-03 14:02:15 +02:00
Keiji Matsuzaki
022353e522 Added support parallel_tests ()
- Added new gem the `parallel_tests`.
- Updated .travis.yml.
  - Improved scripts and environment variable.
2017-05-03 12:20:38 +02:00
jirayudech
4bf8410aad Add Thai Language ()
* 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-03 12:18:00 +02:00
esetomo
3704e6acc9 remove capistrano/faster_assets from Capfile () 2017-05-03 12:14:52 +02:00
kawax
dd06d92caf Show boosted user's avatar ()
* 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-03 11:43:37 +02:00
m4sk1n
6eaaa3bec5 i18n: updated Polish translation ()
* 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-03 11:40:09 +02:00
Masafumi Otsune
274fe58b3e Update simple_form.ja.yml ()
"サーバー" in Japanese is "Server", so I modified it to instance according to English.
2017-05-03 11:39:30 +02:00
unarist
d3ece602d8 Fix width of .confirmation-modal on narrow screens () 2017-05-03 11:39:14 +02:00
Yamagishi Kazutoshi
19346e7992 Add Japanese translation for allowed languages ()
* Add Japanese translation for allowed languages

* Remove duplicate expression words
2017-05-03 11:37:44 +02:00
Yamagishi Kazutoshi
7efac6d577 Use URI.join for generate asset URL ()
* Use URI.join for generate asset URL

* to String
2017-05-03 11:31:21 +02:00
Matt Jankowski
f80de039d7 Use puma config for Procfile.dev () 2017-05-03 02:28:47 +02:00
Eugen Rochko
ef2af79a48 Replace sprockets/browserify with Webpack ()
* 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-03 02:04:16 +02:00
Akihiko Odaki
40a06ce911 Allow to set CA file for SMTP () 2017-05-03 01:03:12 +02:00
Matt Jankowski
129e06f0b3 Auth sign out ()
* 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-02 23:37:58 +02:00
ThibG
d50fcad917 Add rspec to further specify FollowRemoteAccountService () 2017-05-02 23:37:26 +02:00
m4sk1n
c3ceaf837f i18n: updated Polish translation ()
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-02 23:04:41 +02:00
Kaylee
fae1ed48e3 Add option to disable two factor auth in admin accounts panel. ()
* Add option to disable two factor auth in admin accounts panel.
Closes 

* 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-02 21:07:12 +02:00
Matt Jankowski
4645d95ffc Add admin area view partials for each record type () 2017-05-02 20:56:28 +02:00
Quent-in
2d05f32766 Creation of activerecord for OC ()
* Creation of activerecord for OC

* Update activerecord.oc.yml
2017-05-02 20:55:14 +02:00
Audun Larsen
56eb1654e3 Norwegian translation for email notifications ()
* 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-02 20:18:43 +02:00
Ash Furrow
815e31b884 Darkens colour on stream entries meta. () 2017-05-02 20:10:55 +02:00
m4sk1n
0644a97ee0 i18n: Updated Polish translation ()
2017-05-02 20:08:44 +02:00
Yamagishi Kazutoshi
99fcfb68b5 Reset textarea height when press submit key ()
* Reset textarea height when press submit key

* dry

* DON'T NEED props
2017-05-02 20:08:21 +02:00
Eduardo Elias
f3cb4b2fcc Language: update pt-BR () 2017-05-02 20:05:21 +02:00
hakoai
d3f549a864 Fix to completely hide NSFW-tagged images () 2017-05-02 20:03:00 +02:00
Yamagishi Kazutoshi
70f9858e6f Fix subscription expiration condition ()
* Fix subscription expiration condition

* dry and add spec
2017-05-02 18:21:22 +02:00
Yamagishi Kazutoshi
456803cb5c Make it possible to check Subscription that has expired () 2017-05-02 15:52:30 +02:00
Ira
534eb92c2f Add Hebrew interface translation. ()
* 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 

updated strings for latest master

Undo RTL counting, moved out to another branch for future consideration...
2017-05-02 08:54:35 -04:00
Drew Gates
94229ad27b grammar fixes ()
“such as” should be used instead of “like” under imports->preface.

Reworded imports->preface and recovery_instructions for better flow.
2017-05-01 20:21:19 -04:00
Stephen Burgess
0d36cd7375 fix(boost-icon): Align center for Firefox () 2017-05-02 02:15:14 +02:00
yhirano
e5eb070430 annotate models ()
* 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-02 02:14:47 +02:00
Matt Jankowski
fdd7ee1cc7 Coverage for remote follows ()
* 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-02 00:44:23 +02:00
Matt Jankowski
52b2a25ace Error responses cleanup ()
* Use respond_with_error for forbidden errors

* Wrap up common error code into single method
2017-05-01 22:24:36 +02:00
Giuseppe Pignataro
5f7801fb93 Italian translation ()
* 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-01 18:14:51 +02:00
Stephen Burgess
167cf737d3 fix(scrolling): Center for large screen w/o breaking horiz scroll () 2017-05-01 18:14:26 +02:00
Stephen Burgess
747d9809cc fix(dropdowns): Allow for dropdowns to fill full column ()
* 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-01 18:13:10 +02:00
Matt Jankowski
c44ef23e50 Filter on allowed user language preferences ()
* 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-01 17:42:13 +02:00