Wonderfall
0fc73a6e47
about page : use slightly more space ( #2791 )
2017-05-04 18:16:00 +02:00
Matt Jankowski
232b822d86
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
Matt Jankowski
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
abcang
6e3b33e5f1
Enable disableHostCheck option of webpack-dev-server ( #2790 )
2017-05-04 17:49:05 +02:00
abcang
91ddd345f2
Enable disableHostCheck option of webpack-dev-server ( #2790 )
2017-05-04 17:49:05 +02:00
Valentin Ouvrard
1f0c830c97
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
Valentin Ouvrard
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
Akihiko Odaki
8546649425
Use ws protocol in streaming API base URL ( #2606 )
2017-05-04 15:55:13 +02:00
Akihiko Odaki
0cdcf32865
Use ws protocol in streaming API base URL ( #2606 )
2017-05-04 15:55:13 +02:00
abcang
2ceaa88ed0
fix DB_URL ( #2778 )
2017-05-04 15:53:44 +02:00
abcang
629a4d0fca
fix DB_URL ( #2778 )
2017-05-04 15:53:44 +02:00
Yamagishi Kazutoshi
93ec05f976
Decode IDNA in PreviewCard ( #2781 )
2017-05-04 15:52:08 +02:00
Yamagishi Kazutoshi
e95983f5df
Decode IDNA in PreviewCard ( #2781 )
2017-05-04 15:52:08 +02:00
Brian Mock
6bbf4b89bb
Fixes #1830 adds link to development guide ( #2783 )
2017-05-04 15:50:36 +02:00
Brian Mock
e37e84d210
Fixes #1830 adds link to development guide ( #2783 )
2017-05-04 15:50:36 +02:00
unarist
bbac5c7359
Show emoji shortname by a tooltip ( #2784 )
2017-05-04 15:50:09 +02:00
unarist
e57e6f509d
Show emoji shortname by a tooltip ( #2784 )
2017-05-04 15:50:09 +02:00
abcang
95ad0ba245
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
abcang
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
Colin Mitchell
f3588dceff
Make vagrant HTTP port configurable ( #2510 )
2017-05-04 04:36:36 +02:00
Colin Mitchell
908b96a370
Make vagrant HTTP port configurable ( #2510 )
2017-05-04 04:36:36 +02:00
Eugen Rochko
78df86a7c8
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
Eugen Rochko
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
Eugen Rochko
a14ae886b9
Fix #2725 ( #2774 )
2017-05-04 01:42:03 +02:00
Eugen Rochko
4fcc0d5ac9
Fix #2725 ( #2774 )
2017-05-04 01:42:03 +02:00
Eduardo Elias
8afb756f6f
Language: update pt-BR ( #2775 )
2017-05-04 01:28:10 +02:00
Eduardo Elias
3b51581f1b
Language: update pt-BR ( #2775 )
2017-05-04 01:28:10 +02:00
alpaca-tc
62738bf1a9
Localize 'throttled' ( #2755 )
2017-05-03 23:36:19 +02:00
alpaca-tc
db92eec876
Localize 'throttled' ( #2755 )
2017-05-03 23:36:19 +02:00
goofy-bz
ba25539563
Update fr.json ( #2757 )
...
ajout espace insécable derrière pouet - pour voir
2017-05-03 23:36:01 +02:00
goofy-bz
44969307c7
Update fr.json ( #2757 )
...
ajout espace insécable derrière pouet - pour voir
2017-05-03 23:36:01 +02:00
m4sk1n
bb67dd45aa
i18n: updated Polish translation ( #2768 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03 23:19:11 +02:00
m4sk1n
4babdff72f
i18n: updated Polish translation ( #2768 )
...
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 ( #2732 )
...
connection options instead of setting REDIS_HOST etc individually
Close #1986
2017-05-03 23:18:13 +02:00
Eugen Rochko
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
yhirano
6f24c831e9
update gems ( #2754 )
2017-05-03 21:28:29 +02:00
yhirano
005f1fd360
update gems ( #2754 )
2017-05-03 21:28:29 +02:00
ThibG
f1d96e40a3
Additional specs for URI handling ( #2759 )
2017-05-03 20:40:14 +02:00
ThibG
8d4e7504b1
Additional specs for URI handling ( #2759 )
2017-05-03 20:40:14 +02:00
Tomohiro Suwa
89550de8cf
Correct Account model for rubocop ( #2587 )
...
* Correct Account model for rubocop
* Undo these changes
2017-05-03 19:13:04 +02:00
Tomohiro Suwa
aa6a26a2d5
Correct Account model for rubocop ( #2587 )
...
* Correct Account model for rubocop
* Undo these changes
2017-05-03 19:13:04 +02:00
Matt Jankowski
4195aa80fb
Remove screenshot image ( #2736 )
2017-05-03 17:03:10 +02:00
Matt Jankowski
d91ba3c8d0
Remove screenshot image ( #2736 )
2017-05-03 17:03:10 +02:00
Eugen Rochko
91a8a5eab8
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
Eugen Rochko
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
kawax
6d2cfb8e29
Vagrantfile: node 6 ( #2752 )
2017-05-03 16:59:51 +02:00
kawax
dd9d57300b
Vagrantfile: node 6 ( #2752 )
2017-05-03 16:59:51 +02:00
Matt Jankowski
9db85085a9
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
Matt Jankowski
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
Quent-in
5cb8f0c0b2
Update of simple_forum_oc ( #2745 )
...
* Update of simple_forum_oc
* Update simple_form.oc.yml
2017-05-03 14:23:17 +02:00
