Commit graph

2702 commits

Author SHA1 Message Date
abcang bea117a4b6 changed to run foreman with vagrant ()
* changed to run foreman with vagrant

* change port specification method and database setting

* delete changes of environment variable related code

* hard coated the port
2017-05-04 04:39:50 +02:00
Colin Mitchell 908b96a370 Make vagrant HTTP port configurable () 2017-05-04 04:36:36 +02:00
Eugen Rochko 13c16b4e95 Likely fix , fix - handle out-of-order deletes for statuses ()
* Likely fix , fix  - handle out-of-order deletes for statuses

If a delete arrives before the original status, cache that information
for 6h, and if the original status arrives in that window, ignore it

* Add test case
2017-05-04 04:34:57 +02:00
Eugen Rochko 4fcc0d5ac9 Fix () 2017-05-04 01:42:03 +02:00
Eduardo Elias 3b51581f1b Language: update pt-BR () 2017-05-04 01:28:10 +02:00
alpaca-tc db92eec876 Localize 'throttled' () 2017-05-03 23:36:19 +02:00
goofy-bz 44969307c7 Update fr.json ()
ajout espace insécable derrière pouet - pour voir
2017-05-03 23:36:01 +02:00
m4sk1n 4babdff72f i18n: updated Polish translation ()
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03 23:19:11 +02:00
Eugen Rochko c997091166 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 005f1fd360 update gems () 2017-05-03 21:28:29 +02:00
ThibG 8d4e7504b1 Additional specs for URI handling () 2017-05-03 20:40:14 +02:00
Tomohiro Suwa aa6a26a2d5 Correct Account model for rubocop ()
* Correct Account model for rubocop

* Undo these changes
2017-05-03 19:13:04 +02:00
Matt Jankowski d91ba3c8d0 Remove screenshot image () 2017-05-03 17:03:10 +02:00
Eugen Rochko bafd22ecf4 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 dd9d57300b Vagrantfile: node 6 () 2017-05-03 16:59:51 +02:00
Matt Jankowski 8c5ad23b24 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 53384b0ffe 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 1c469ca98b 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 e61ecf4091 Add styles for small devices to .onboarding-modal () 2017-05-03 14:02:15 +02:00
Keiji Matsuzaki 90c00f075a 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 38473f0aa0 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 24a5d13d60 remove capistrano/faster_assets from Capfile () 2017-05-03 12:14:52 +02:00
kawax 383c0b7802 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 bf8031e984 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 ab307b816b 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 40562fd266 Fix width of .confirmation-modal on narrow screens () 2017-05-03 11:39:14 +02:00
Yamagishi Kazutoshi 5f9cb48882 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 2ab7dc9a55 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 2b9bc9c154 Use puma config for Procfile.dev () 2017-05-03 02:28:47 +02:00
Eugen Rochko f5bf5ebb82 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 26bc591572 Allow to set CA file for SMTP () 2017-05-03 01:03:12 +02:00
Matt Jankowski 268dd32d76 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 bea97ea766 Add rspec to further specify FollowRemoteAccountService () 2017-05-02 23:37:26 +02:00
m4sk1n 03f3223d72 i18n: updated Polish translation ()
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-02 23:04:41 +02:00
Kaylee 7880671f35 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 b5eec34230 Add admin area view partials for each record type () 2017-05-02 20:56:28 +02:00
Quent-in 2128682162 Creation of activerecord for OC ()
* Creation of activerecord for OC

* Update activerecord.oc.yml
2017-05-02 20:55:14 +02:00
Audun Larsen e68c0ce5f6 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 54dddfe9b8 Darkens colour on stream entries meta. () 2017-05-02 20:10:55 +02:00
m4sk1n aea3aff4e4 i18n: Updated Polish translation ()
2017-05-02 20:08:44 +02:00
Yamagishi Kazutoshi 46943b64c6 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 302c0d2046 Language: update pt-BR () 2017-05-02 20:05:21 +02:00
hakoai 22b1a70274 Fix to completely hide NSFW-tagged images () 2017-05-02 20:03:00 +02:00
Yamagishi Kazutoshi 6f75c8451d Fix subscription expiration condition ()
* Fix subscription expiration condition

* dry and add spec
2017-05-02 18:21:22 +02:00
Yamagishi Kazutoshi b9b78549f3 Make it possible to check Subscription that has expired () 2017-05-02 15:52:30 +02:00
Ira 438ce5809f 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 f485fa31f3 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 34ae4cf511 fix(boost-icon): Align center for Firefox () 2017-05-02 02:15:14 +02:00
yhirano 298796cc7b 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 a4859446ab 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