Yamagishi Kazutoshi
097fd44978
Add /mastodon/bin to $PATH ( #7889 )
2018-06-25 13:30:25 +02:00
SerCom_KC
76e3c6299b
i18n: (zh-CN) #7823 , #7828 ( #7887 )
2018-06-25 11:43:23 +09:00
SerCom_KC
11a7f725da
i18n: (zh-CN) #7823 , #7828 ( #7887 )
2018-06-25 11:43:23 +09:00
Eugen Rochko
2dfd016085
Fix Chrome issue with sizes="0px" ( #7886 )
...
"Do not dumb here. Not dumb area here."
2018-06-25 00:12:15 +02:00
Eugen Rochko
45b5e60909
Fix Chrome issue with sizes="0px" ( #7886 )
...
"Do not dumb here. Not dumb area here."
2018-06-25 00:12:15 +02:00
ThibG
98c0128d3b
Merge pull request #553 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-06-24 15:27:51 +02:00
ThibG
c18d55e8c2
Merge pull request #553 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-06-24 15:27:51 +02:00
Thibaut Girka
7f143d1a92
Increase padding of toots
2018-06-24 14:46:02 +02:00
Thibaut Girka
f364a27922
Increase padding of toots
2018-06-24 14:46:02 +02:00
Thibaut Girka
8e4fbf9846
Fix margins of toot text
2018-06-24 14:46:02 +02:00
Thibaut Girka
ccbaf32bca
Fix margins of toot text
2018-06-24 14:46:02 +02:00
Thibaut Girka
44e49d2b52
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-24 14:32:22 +02:00
Thibaut Girka
4b0f27ba78
Merge branch 'master' into glitch-soc/merge-upstream
2018-06-24 14:32:22 +02:00
ThibG
ef3ac6e4a7
Fix jpeg files sometimes being returned with a .jpe extension ( #7881 )
...
While this isn't exactly *wrong*, files uploaded with a “.jpe” extension will
keep that extension, which will often cause them to be served with an
incorrect mimetype.
2018-06-24 13:33:06 +02:00
ThibG
50a2854f92
Fix jpeg files sometimes being returned with a .jpe extension ( #7881 )
...
While this isn't exactly *wrong*, files uploaded with a “.jpe” extension will
keep that extension, which will often cause them to be served with an
incorrect mimetype.
2018-06-24 13:33:06 +02:00
Shuhei Kitagawa
bc45dd2f97
Add tests for remote_unfollows_controller ( #7879 )
2018-06-24 19:55:55 +09:00
Shuhei Kitagawa
23955d956e
Add tests for remote_unfollows_controller ( #7879 )
2018-06-24 19:55:55 +09:00
ThibG
5321d2ef02
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-06-22 00:10:43 +02:00
ThibG
03cfe366fd
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-06-22 00:10:43 +02:00
Thibaut Girka
636973707f
Fix confirmations_controller
2018-06-21 23:48:54 +02:00
Thibaut Girka
0c3a337e04
Fix confirmations_controller
2018-06-21 23:48:54 +02:00
takayamaki
cab4aca9b2
fix : Disable reverted index changes ( #7871 )
2018-06-21 23:07:40 +02:00
takayamaki
245fa1446a
fix : Disable reverted index changes ( #7871 )
2018-06-21 23:07:40 +02:00
Mélanie Chauvel (ariasuni)
7406d07985
Fix CW field still having animation in when reduce motion is enabled ( #7872 )
2018-06-21 23:05:01 +02:00
Mélanie Chauvel (ariasuni)
f0f8b242c4
Fix CW field still having animation in when reduce motion is enabled ( #7872 )
2018-06-21 23:05:01 +02:00
Thibaut Girka
7833326959
[Glitch] Submit report using meta key
...
Port 10a8ac8b80
2018-06-21 22:28:50 +02:00
Thibaut Girka
f0161702d8
[Glitch] Submit report using meta key
...
Port 64d7a63f18
2018-06-21 22:28:50 +02:00
Thibaut Girka
d325dd899c
Fix clicking on collapsed toots with a background ( fixes #547 )
2018-06-21 22:17:19 +02:00
Thibaut Girka
d0faac9027
Fix clicking on collapsed toots with a background ( fixes #547 )
2018-06-21 22:17:19 +02:00
Thibaut Girka
8bd7b9b586
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
Thibaut Girka
ab5f450700
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
2018-06-21 20:49:57 +02:00
Shuhei Kitagawa
d61e647e8a
Replace bypass option with bypass_sign_in ( #7867 )
2018-06-21 10:41:49 +09:00
Shuhei Kitagawa
7f59206944
Replace bypass option with bypass_sign_in ( #7867 )
2018-06-21 10:41:49 +09:00
Shuhei Kitagawa
2828f36415
Add missing tests for confirmations controller ( #7866 )
2018-06-21 10:40:23 +09:00
Shuhei Kitagawa
459394a020
Add missing tests for confirmations controller ( #7866 )
2018-06-21 10:40:23 +09:00
Hinaloe
d037ae26e2
Return collect response when fail put cache to storage ( #7863 )
...
* return collect response when fail put cache to storage
* cleanup callback
2018-06-20 20:55:17 +02:00
Hinaloe
c3b40a6950
Return collect response when fail put cache to storage ( #7863 )
...
* return collect response when fail put cache to storage
* cleanup callback
2018-06-20 20:55:17 +02:00
Daigo 3 Dango
cf33555c1f
Update sprockets gem ( #7858 )
...
https://blog.heroku.com/rails-asset-pipeline-vulnerability
2018-06-20 15:22:37 +02:00
Daigo 3 Dango
cd1b90d223
Update sprockets gem ( #7858 )
...
https://blog.heroku.com/rails-asset-pipeline-vulnerability
2018-06-20 15:22:37 +02:00
kedama
5ba2ceda2e
Fix broken single column getting-started menu ( Fix #7854 ) ( #7862 )
...
* Fix lack of height of the getting-started menu. (Fix #7854 )
Include the height of navigation bar at the height of getting-started menu.
* Remove item "Security" on the getting-started menu.
2018-06-20 15:22:07 +02:00
kedama
926bfce465
Fix broken single column getting-started menu ( Fix #7854 ) ( #7862 )
...
* Fix lack of height of the getting-started menu. (Fix #7854 )
Include the height of navigation bar at the height of getting-started menu.
* Remove item "Security" on the getting-started menu.
2018-06-20 15:22:07 +02:00
Isao Sugimoto
153c3e23d1
fix filter languages label on settings (ja) ( #7848 )
...
ref: #7823
2018-06-19 11:11:45 +09:00
Isao Sugimoto
80bda9719d
fix filter languages label on settings (ja) ( #7848 )
...
ref: #7823
2018-06-19 11:11:45 +09:00
Eugen Rochko
71713fabde
Weblate translations (2018-06-19) ( #7847 )
...
* Translated using Weblate (Dutch)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Greek)
Currently translated at 99.6% (621 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Japanese)
Currently translated at 92.9% (66 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Arabic)
Currently translated at 97.1% (69 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Arabic)
Currently translated at 95.8% (597 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Dutch)
Currently translated at 94.3% (67 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Greek)
Currently translated at 99.6% (621 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Korean)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Slovak)
Currently translated at 96.3% (600 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 95.7% (68 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Polish)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Normalize
2018-06-19 02:25:29 +02:00
Eugen Rochko
2a1089839d
Weblate translations (2018-06-19) ( #7847 )
...
* Translated using Weblate (Dutch)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Greek)
Currently translated at 99.6% (621 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Japanese)
Currently translated at 92.9% (66 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Arabic)
Currently translated at 97.1% (69 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Arabic)
Currently translated at 95.8% (597 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Dutch)
Currently translated at 94.3% (67 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Greek)
Currently translated at 99.6% (621 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Korean)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Slovak)
Currently translated at 96.3% (600 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 95.7% (68 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Polish)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Normalize
2018-06-19 02:25:29 +02:00
Eugen Rochko
5db8a0ba36
Bump version to 2.4.2
2018-06-19 01:45:00 +02:00
Eugen Rochko
d017f240f9
Bump version to 2.4.2
2018-06-19 01:45:00 +02:00
Eugen Rochko
d2a1e2e850
Bump version to 2.4.2rc3
2018-06-19 00:19:54 +02:00
Eugen Rochko
86cce466b6
Bump version to 2.4.2rc3
2018-06-19 00:19:54 +02:00
Eugen Rochko
a84cc6ffd2
Update bcrypt to 3.1.12 fix issue with Fedora ( #7845 )
2018-06-19 00:19:17 +02:00
