Quent-in
53384b0ffe
Update of simple_forum_oc ( #2745 )
...
* 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. ( #2699 )
...
* 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
ヨイツの賢狼ホロ | 3rd style
1c469ca98b
i18n: Update zh-CN [ Chinese (China) ] translations. ( #2699 )
...
* 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 ( #2748 )
2017-05-03 14:02:15 +02:00
unarist
e61ecf4091
Add styles for small devices to .onboarding-modal ( #2748 )
2017-05-03 14:02:15 +02:00
Keiji Matsuzaki
022353e522
Added support parallel_tests ( #2740 )
...
- Added new gem the `parallel_tests`.
- Updated .travis.yml.
- Improved scripts and environment variable.
2017-05-03 12:20:38 +02:00
Keiji Matsuzaki
90c00f075a
Added support parallel_tests ( #2740 )
...
- 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 ( #2598 )
...
* 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
jirayudech
38473f0aa0
Add Thai Language ( #2598 )
...
* 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 ( #2737 )
2017-05-03 12:14:52 +02:00
esetomo
24a5d13d60
remove capistrano/faster_assets from Capfile ( #2737 )
2017-05-03 12:14:52 +02:00
kawax
dd06d92caf
Show boosted user's avatar ( #2518 )
...
* 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
kawax
383c0b7802
Show boosted user's avatar ( #2518 )
...
* 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 ( #2729 )
...
* 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
m4sk1n
bf8031e984
i18n: updated Polish translation ( #2729 )
...
* 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 ( #2746 )
...
"サーバー" in Japanese is "Server", so I modified it to instance according to English.
2017-05-03 11:39:30 +02:00
Masafumi Otsune
ab307b816b
Update simple_form.ja.yml ( #2746 )
...
"サーバー" 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 ( #2743 )
2017-05-03 11:39:14 +02:00
unarist
40562fd266
Fix width of .confirmation-modal on narrow screens ( #2743 )
2017-05-03 11:39:14 +02:00
Yamagishi Kazutoshi
19346e7992
Add Japanese translation for allowed languages ( #2738 )
...
* Add Japanese translation for allowed languages
* Remove duplicate expression words
2017-05-03 11:37:44 +02:00
Yamagishi Kazutoshi
5f9cb48882
Add Japanese translation for allowed languages ( #2738 )
...
* 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 ( #2741 )
...
* Use URI.join for generate asset URL
* to String
2017-05-03 11:31:21 +02:00
Yamagishi Kazutoshi
2ab7dc9a55
Use URI.join for generate asset URL ( #2741 )
...
* 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 ( #2735 )
2017-05-03 02:28:47 +02:00
Matt Jankowski
2b9bc9c154
Use puma config for Procfile.dev ( #2735 )
2017-05-03 02:28:47 +02:00
Eugen Rochko
ef2af79a48
Replace sprockets/browserify with Webpack ( #2617 )
...
* 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
Eugen Rochko
f5bf5ebb82
Replace sprockets/browserify with Webpack ( #2617 )
...
* 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 ( #2713 )
2017-05-03 01:03:12 +02:00
Akihiko Odaki
26bc591572
Allow to set CA file for SMTP ( #2713 )
2017-05-03 01:03:12 +02:00
Matt Jankowski
129e06f0b3
Auth sign out ( #2511 )
...
* 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
Matt Jankowski
268dd32d76
Auth sign out ( #2511 )
...
* 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 ( #2414 )
2017-05-02 23:37:26 +02:00
ThibG
bea97ea766
Add rspec to further specify FollowRemoteAccountService ( #2414 )
2017-05-02 23:37:26 +02:00
m4sk1n
c3ceaf837f
i18n: updated Polish translation ( #2727 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-02 23:04:41 +02:00
m4sk1n
03f3223d72
i18n: updated Polish translation ( #2727 )
...
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. ( #2584 )
...
* 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-02 21:07:12 +02:00
Kaylee
7880671f35
Add option to disable two factor auth in admin accounts panel. ( #2584 )
...
* 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-02 21:07:12 +02:00
Matt Jankowski
4645d95ffc
Add admin area view partials for each record type ( #2700 )
2017-05-02 20:56:28 +02:00
Matt Jankowski
b5eec34230
Add admin area view partials for each record type ( #2700 )
2017-05-02 20:56:28 +02:00
Quent-in
2d05f32766
Creation of activerecord for OC ( #2721 )
...
* Creation of activerecord for OC
* Update activerecord.oc.yml
2017-05-02 20:55:14 +02:00
Quent-in
2128682162
Creation of activerecord for OC ( #2721 )
...
* 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 ( #2673 )
...
* 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
Audun Larsen
e68c0ce5f6
Norwegian translation for email notifications ( #2673 )
...
* 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. ( #2616 )
2017-05-02 20:10:55 +02:00
Ash Furrow
54dddfe9b8
Darkens colour on stream entries meta. ( #2616 )
2017-05-02 20:10:55 +02:00
m4sk1n
0644a97ee0
i18n: Updated Polish translation ( #2686 )
...
#807
2017-05-02 20:08:44 +02:00
m4sk1n
aea3aff4e4
i18n: Updated Polish translation ( #2686 )
...
#807
2017-05-02 20:08:44 +02:00
Yamagishi Kazutoshi
99fcfb68b5
Reset textarea height when press submit key ( #2681 )
...
* Reset textarea height when press submit key
* dry
* DON'T NEED props
2017-05-02 20:08:21 +02:00
Yamagishi Kazutoshi
46943b64c6
Reset textarea height when press submit key ( #2681 )
...
* 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 ( #2687 )
2017-05-02 20:05:21 +02:00
