566e0a772d
Improve style for form in site settings ( #2796 )
2017-05-04 14:37:57 -04:00
11077af52f
Persian translation update ( #2788 )
...
* Persian translation update
* fix newline typo
2017-05-04 18:32:05 +02:00
0fc73a6e47
about page : use slightly more space ( #2791 )
2017-05-04 18:16:00 +02:00
2bd132d458
Replace best_in_place editor on admin settings page ( #2789 )
...
* Remove best_in_place
* Replace best_in_place usage with rails helpers
* Move admin/settings#index to #edit action
* Remove click_to__edit from i18n
2017-05-04 18:12:44 +02:00
91ddd345f2
Enable disableHostCheck option of webpack-dev-server ( #2790 )
2017-05-04 17:49:05 +02:00
75bd141e22
Switch docker-compose to version 3. ( #2747 )
...
* Switch docker-compose to version 3.
It allow possibility to Deploy Mastodon in a Swarm cluster directly from the compose file.
* switch to compose v3 without depend.
2017-05-04 15:56:05 +02:00
0cdcf32865
Use ws protocol in streaming API base URL ( #2606 )
2017-05-04 15:55:13 +02:00
629a4d0fca
fix DB_URL ( #2778 )
2017-05-04 15:53:44 +02:00
e95983f5df
Decode IDNA in PreviewCard ( #2781 )
2017-05-04 15:52:08 +02:00
e37e84d210
Fixes #1830 adds link to development guide ( #2783 )
2017-05-04 15:50:36 +02:00
e57e6f509d
Show emoji shortname by a tooltip ( #2784 )
2017-05-04 15:50:09 +02:00
bea117a4b6
changed to run foreman with vagrant ( #2742 )
...
* 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
908b96a370
Make vagrant HTTP port configurable ( #2510 )
2017-05-04 04:36:36 +02:00
13c16b4e95
Likely fix #2458 , fix #2031 - handle out-of-order deletes for statuses ( #2734 )
...
* Likely fix #2458 , fix #2031 - 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
4fcc0d5ac9
Fix #2725 ( #2774 )
2017-05-04 01:42:03 +02:00
3b51581f1b
Language: update pt-BR ( #2775 )
2017-05-04 01:28:10 +02:00
db92eec876
Localize 'throttled' ( #2755 )
2017-05-03 23:36:19 +02:00
44969307c7
Update fr.json ( #2757 )
...
ajout espace insécable derrière pouet - pour voir
2017-05-03 23:36:01 +02:00
4babdff72f
i18n: updated Polish translation ( #2768 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03 23:19:11 +02:00
c997091166
Clean up redis configuration. Allow using REDIS_URL to set advanced ( #2732 )
...
connection options instead of setting REDIS_HOST etc individually
Close #1986
2017-05-03 23:18:13 +02:00
005f1fd360
update gems ( #2754 )
2017-05-03 21:28:29 +02:00
8d4e7504b1
Additional specs for URI handling ( #2759 )
2017-05-03 20:40:14 +02:00
aa6a26a2d5
Correct Account model for rubocop ( #2587 )
...
* Correct Account model for rubocop
* Undo these changes
2017-05-03 19:13:04 +02:00
d91ba3c8d0
Remove screenshot image ( #2736 )
2017-05-03 17:03:10 +02:00
bafd22ecf4
Fix #2706 - Always respond with 200 to PuSH payloads ( #2733 )
...
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-03 17:02:18 +02:00
dd9d57300b
Vagrantfile: node 6 ( #2752 )
2017-05-03 16:59:51 +02:00
8c5ad23b24
Language improvements, replace whatlanguage with CLD ( #2753 )
...
* add failing en specs
* add cld2 gem
* Replace WhatLanguage with CLD
2017-05-03 16:59:31 +02:00
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
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
e61ecf4091
Add styles for small devices to .onboarding-modal ( #2748 )
2017-05-03 14:02:15 +02:00
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
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
24a5d13d60
remove capistrano/faster_assets from Capfile ( #2737 )
2017-05-03 12:14:52 +02:00
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
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
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
40562fd266
Fix width of .confirmation-modal on narrow screens ( #2743 )
2017-05-03 11:39:14 +02:00
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
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
2b9bc9c154
Use puma config for Procfile.dev ( #2735 )
2017-05-03 02:28:47 +02:00
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
26bc591572
Allow to set CA file for SMTP ( #2713 )
2017-05-03 01:03:12 +02:00
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
bea97ea766
Add rspec to further specify FollowRemoteAccountService ( #2414 )
2017-05-02 23:37:26 +02:00
03f3223d72
i18n: updated Polish translation ( #2727 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-02 23:04:41 +02:00
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
b5eec34230
Add admin area view partials for each record type ( #2700 )
2017-05-02 20:56:28 +02:00
2128682162
Creation of activerecord for OC ( #2721 )
...
* Creation of activerecord for OC
* Update activerecord.oc.yml
2017-05-02 20:55:14 +02:00
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
54dddfe9b8
Darkens colour on stream entries meta. ( #2616 )
2017-05-02 20:10:55 +02:00
Yamagishi Kazutoshi
Masoud Abkenar
Wonderfall
Matt Jankowski
abcang
Valentin Ouvrard
Akihiko Odaki
Brian Mock
unarist
Colin Mitchell
Eugen Rochko
Eduardo Elias
alpaca-tc
goofy-bz
m4sk1n
yhirano
ThibG
Tomohiro Suwa
kawax
Quent-in
ヨイツの賢狼ホロ | 3rd style
Keiji Matsuzaki
jirayudech
esetomo
Masafumi Otsune
Kaylee
Audun Larsen
Ash Furrow