Lynx Kotoura
4210ddb676
Add right margin of notification message ( #7628 )
2018-05-26 10:53:53 +02:00
Lynx Kotoura
60902b948a
Fix color mistakes in mastodon-light theme ( #7626 )
...
* Fix colors of mastodon-light theme
Fix colors of modals and focused toots in light theme
Fix colors of compose-form items and more
Fix colors of status__content__spoiler-link:hover and $valid-value-color
Change success green color in light theme
* Fix some sass codes
* Add !default for explicit color valiables in default theme
for overwriting colors easier in the other themes
2018-05-26 10:53:44 +02:00
Yamagishi Kazutoshi
fa87093ff2
Weblate translations (2018-05-26) ( #7624 )
...
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Italian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Italian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 84.0% (522 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (French)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Italian)
Currently translated at 84.0% (522 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Persian)
Currently translated at 99.6% (298 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 99.5% (618 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Persian)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Occitan)
Currently translated at 98.0% (609 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Dutch)
Currently translated at 99.8% (620 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Slovak)
Currently translated at 95.0% (590 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Galician)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (French)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.3% (617 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 93.9% (62 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
Ορθογραφικό λάθος
* Translated using Weblate (Greek)
Currently translated at 44.4% (276 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.1% (616 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Swedish)
Currently translated at 99.3% (617 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Arabic)
Currently translated at 90.8% (564 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 95.0% (590 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (German)
Currently translated at 99.0% (615 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (619 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Arabic)
Currently translated at 93.9% (62 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 98.6% (75 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/
* Translated using Weblate (Arabic)
Currently translated at 90.8% (564 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (299 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 44.6% (277 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Slovak)
Currently translated at 95.1% (591 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (621 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 95.1% (591 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Japanese)
Currently translated at 99.5% (618 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Basque)
Currently translated at 89.6% (268 of 299 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 40.9% (27 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 1.2% (8 of 621 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* i18n-tasks normalize && yarn manage:translations
2018-05-26 04:45:58 +02:00
Eugen Rochko
83b124d54b
Catch ActionController::UnknownFormat and return HTTP 406 ( #7621 )
...
An error like that should not appear in production error log.
2018-05-26 01:09:30 +02:00
Eugen Rochko
b416ba6692
Disable AMS logging ( #7623 )
...
Especially in production it's just noise and doesn't mix well with the log format
2018-05-26 01:08:31 +02:00
ThibG
162abbe9a7
Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-fav
...
[Glitch] Use .star-icon instead of hardcoding color in detailed statuses
2018-05-25 22:03:31 +02:00
ThibG
2e58fed4c6
Merge pull request #518 from ThibG/glitch-soc/merge-master
...
Merge upstream changes
2018-05-25 21:41:25 +02:00
Thibaut Girka
4cb367e6d4
Merge branch 'master' into glitch-soc/merge-master
...
Conflicts:
app/javascript/styles/mastodon-light.scss
config/themes.yml
Removed config/themes.yml, took upstream's mastodon-light.scss
2018-05-25 18:59:02 +02:00
Isatis
a1db299d79
Remove Puma pidfile before boot if container receives SIGTERM ( #7052 )
2018-05-25 18:50:31 +02:00
Akihiko Odaki
4e718bbb25
Introduce flat layout to contexts reducer ( #7150 )
...
This allows to filter out replies in threads even if contexts of those
replies are not fetched.
2018-05-25 18:46:28 +02:00
Yamagishi Kazutoshi
590ae5ac66
Enable media timeline ( #7598 )
2018-05-25 18:36:46 +02:00
Lynx Kotoura
499af41a9d
More polished light theme ( #7620 )
...
* Revert "Remove pointer to light theme until it is more polished (#7594 )"
This reverts commit ab94772b5c
2018-05-25 18:36:26 +02:00
Lynx Kotoura
f78eee8d6a
Fix color of /about/more link anchors ( #7618 )
2018-05-25 16:48:17 +02:00
ThibG
d99f5bf6b5
Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_chars
...
Add missing comma in InitalStateSerializer (fixes #516 )
2018-05-25 14:44:20 +02:00
Jeroen
daff01a5a5
Added the law requirements for the EU/EEA ( #7605 )
...
* Added the law requirements for the EU/EEA
See article 8 of the GDPR
* fix
* i18n-tasks normalize
2018-05-25 14:27:14 +02:00
ThibG
d1b2466320
Ignore multiple occurrences of a hashtag within a status ( fixes #7585 ) ( #7606 )
2018-05-25 14:26:45 +02:00
Thibaut Girka
5d64e6a618
Add missing comma in InitalStateSerializer ( fixes #516 )
2018-05-25 14:06:48 +02:00
Thibaut Girka
2b26e7ed5f
[Glitch] Use .star-icon instead of hardcoding color in detailed statuses
...
Port 6d50785928
2018-05-25 11:16:11 +02:00
ThibG
6d50785928
Use .star-icon instead of hardcoding color in detailed statuses ( fixes #7610 ) ( #7613 )
2018-05-25 10:03:22 +09:00
ThibG
67f74f71aa
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-23 19:19:28 +02:00
ThibG
e2697a3657
Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search
...
[Glitch] Fetch relationships for search results in UI
2018-05-23 18:54:51 +02:00
ThibG
6b93ea6b27
Merge pull request #512 from ThibG/glitch-soc/fixes/fix-ckbox-color
...
Change notification cleaning checkbox color (fixes #511 )
2018-05-23 18:54:31 +02:00
Thibaut Girka
bdfce657fb
Change notification cleaning checkbox color ( fixes #511 )
2018-05-23 18:29:15 +02:00
Thibaut Girka
28ccf0a464
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
ThibG
a4527fe33c
Fix caret position after selected suggestion and media upload ( #7595 )
...
* Fix media upload reseting caret position to last inserted emoji
* Fix caret position after inserting suggestions (fixes #6089 )
2018-05-23 15:20:15 +02:00
Yamagishi Kazutoshi
c0b945b77e
Fix tests for invites controller (regression from 32c3fc08fe) ( #7597 )
2018-05-23 06:32:10 +02:00
Eugen Rochko
32c3fc08fe
Yeah, it was supposed to be #create?
2018-05-22 20:05:24 +02:00
Eugen Rochko
8205147d04
Bump version to 2.4.0
2018-05-22 19:39:35 +02:00
Eugen Rochko
ab94772b5c
Remove pointer to light theme until it is more polished ( #7594 )
2018-05-22 19:38:37 +02:00
ThibG
0f523757f2
Remove unneeded code now that attachment URL isn't appended to toots ( #7593 )
2018-05-22 19:32:02 +02:00
Eugen Rochko
2d34552fbc
Do not encode HTML entities in initial Web Push payload body ( #7592 )
2018-05-22 18:12:45 +02:00
SerCom_KC
82da8b7ec6
[WIP] i18n: Update Simplified Chinese translations ( #7576 )
...
* i18n: (zh-CN) #7027
* Rewording
This placeholder is also seen on single user page at Moderation > Accounts, where "this report" doesn't make sense.
* i18n: (zh-CN) #6425
* i18n: (zh-CN) #6497
* i18n: (zh-CN) #6246
* i18n: (zh-CN) Improvements
2018-05-22 15:26:42 +02:00
Shuhei Kitagawa
0a5527319a
Add tests for report notes controller ( #7589 )
2018-05-22 14:45:10 +02:00
Eugen Rochko
fd007264dc
Enforce order on authorized applications page ( #7587 )
...
Fix #7586
2018-05-22 14:44:53 +02:00
Yamagishi Kazutoshi
ff98de966f
Hide section headline for timelines in production ( #7590 )
...
* Hide section headline for timelines in production
* comment out
2018-05-22 14:44:32 +02:00
Yamagishi Kazutoshi
f5421e5309
Change column params on pinned timeline ( #7581 )
2018-05-22 13:26:06 +02:00
bsky
818fa6fc80
Remove outline ( #7582 )
2018-05-22 13:24:54 +02:00
Thibaut Girka
cdb1d08119
[Glitch] Fetch relationships for search results in UI
...
Port webui changes from 750f3e64c9
2018-05-22 13:05:40 +02:00
Evgeny Petrov
96040c54f5
[RU] Added mastodon-light string ( #7583 )
2018-05-22 18:06:53 +09:00
ThibG
4749fe5019
Merge pull request #503 from glitch-soc/merge-upstream
...
Merge upstream
2018-05-22 10:02:33 +02:00
David Yip
647f58f92a
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
config/locales/pl.yml
The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc. Resolution: remove the themes key-related
changes, i.e. accept-ours.
2018-05-21 16:30:24 -05:00
Marcin Mikołajczak
9b1b968262
🌍 : 🇵🇱 ⬆️ ( #7580 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-21 23:12:35 +02:00
Jenkins
8f74ec1286
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-21 18:17:23 +00:00
ThibG
f6d0f955bf
Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixes
...
Port various WebUI fixes from upstream
2018-05-21 19:20:17 +02:00
Thibaut Girka
3315877afe
Fix width only being set for standalone media
2018-05-21 18:25:41 +02:00
Thibaut Girka
df3fa2cb78
[Glitch] Use real container width in MediaGallery srcSet
...
Port 765a8dad9a
2018-05-21 17:55:07 +02:00
Thibaut Girka
4e5afb1c41
[Glitch] Do not override the default push notification settings
...
Port 6bee19117f
2018-05-21 17:52:26 +02:00
ThibG
abc2e46848
Merge pull request #499 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-21 17:51:06 +02:00
Eugen Rochko
20c650b644
Save onlyMedia prop when pinning column ( #7575 )
2018-05-21 17:49:10 +02:00
Eugen Rochko
f548332935
Display only domain of report account if remote under comment ( #7574 )
2018-05-21 17:33:20 +02:00
