5ef65aab8f
replace reblog service check for an 👁️ with #local_only
2017-12-10 17:12:21 -06:00
cfbb95605b
set local_only flag on statuses in post_status_service
2017-12-10 17:04:32 -06:00
08519cd4f4
status: stub local_only?, add scope, add marked_local_only?
2017-12-10 17:04:28 -06:00
434c70fd98
add a local_only column to the statuses table
2017-12-10 16:41:25 -06:00
282f48ddd1
Merge pull request #248 from chriswmartin/glitch-theme-lists
...
add lists to glitch flavour!
2017-12-10 00:53:37 -05:00
ef53c972b1
Merge pull request #237 from dexamphetamine/jpn-localization
...
i18n: add ja glitch strings
2017-12-09 23:34:13 -05:00
eb2b971a52
i18n: add ja glitch strings
2017-12-09 19:39:41 -08:00
baf9ea8018
remove keyboard shortcuts from getting started because thats a different thing
2017-12-09 10:32:46 -06:00
02d71c6a11
fix a missing semicolon and mixed tabs/spaces that travis was complaining about
2017-12-08 21:09:53 -06:00
4a5401a58e
merge tootsuite prs #5895 and #5889 into glitch flavour
2017-12-08 20:50:39 -06:00
28423dd046
merge tootsuite pr #5904 into glitch flavour
2017-12-08 20:45:18 -06:00
b165950ca7
add keyboard shortcut to getting started, add missing list style
2017-12-08 20:30:45 -06:00
47157e07b2
merged tootsuite pr #5811 into glitch flavour
2017-12-08 20:13:08 -06:00
f44c8fd130
merged tootsuite pr #5750 into glitch flavour
2017-12-08 19:40:49 -06:00
776867ea73
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-08 13:17:14 +00:00
dad0a09675
Remove unused messages ( #5924 )
2017-12-08 13:55:33 +01:00
bca9e2e57a
Weblate translations ( #5922 )
...
* Translated using Weblate (German)
Currently translated at 84.2% (439 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (English)
Currently translated at 99.8% (520 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/
* Translated using Weblate (German)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (French)
Currently translated at 84.6% (441 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (English)
Currently translated at 99.8% (520 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/
* Translated using Weblate (German)
Currently translated at 86.9% (453 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Korean)
Currently translated at 86.3% (450 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (French)
Currently translated at 84.8% (442 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 84.8% (442 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 84.8% (442 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Portuguese)
Currently translated at 36.2% (189 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Hebrew)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/
* Translated using Weblate (Hebrew)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/
* Translated using Weblate (Hebrew)
Currently translated at 53.1% (277 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/
* Translated using Weblate (Hebrew)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/
* Translated using Weblate (Hebrew)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/
* Translated using Weblate (Hebrew)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/he/
* Translated using Weblate (Hebrew)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/
* Translated using Weblate (Spanish)
Currently translated at 75.6% (394 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (French)
Currently translated at 86.3% (450 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Portuguese)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 84.6% (441 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (German)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/
* Translated using Weblate (German)
Currently translated at 88.2% (460 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 90.2% (470 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (French)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 90.2% (470 of 521 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% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (French)
Currently translated at 87.3% (455 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Hebrew)
Currently translated at 61.8% (322 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/
* Translated using Weblate (French)
Currently translated at 87.3% (455 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.3% (481 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (French)
Currently translated at 87.3% (455 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 87.5% (456 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 87.7% (457 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Portuguese)
Currently translated at 42.4% (221 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 97.3% (73 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (520 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (German)
Currently translated at 90.5% (472 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 90.7% (473 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 90.9% (474 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 91.1% (475 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Dutch)
Currently translated at 90.4% (471 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (German)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.3% (481 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (German)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 90.5% (472 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Arabic)
Currently translated at 44.1% (19 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Norwegian (old code))
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/
* Translated using Weblate (Arabic)
Currently translated at 85.7% (48 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 92.0% (69 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/
* Translated using Weblate (Portuguese)
Currently translated at 47.7% (249 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/
* Translated using Weblate (Arabic)
Currently translated at 29.9% (156 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Spanish)
Currently translated at 99.8% (520 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/
* Translated using Weblate (Polish)
Currently translated at 99.8% (520 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (French)
Currently translated at 99.6% (519 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (245 of 245 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (French)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (Spanish)
Currently translated at 99.8% (520 of 521 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/
* i18n-tasks normalize
* yarn run manage:translations
* Restore wrongly removed translations
2017-12-08 01:59:44 +01:00
369f40bb9f
Bump version to 2.1.0rc2
2017-12-08 01:47:08 +01:00
65e0bbd958
Disable status content outline ( #5921 )
2017-12-08 00:03:25 +01:00
717b7d555c
Skins shouldn't apply to fallback flavours
2017-12-07 14:49:54 -08:00
753535c3c7
Fixed webpack skin folder globbing
2017-12-07 14:33:49 -08:00
9cdd81e9dd
Glitch doesn't have a home stylesheet anymore
2017-12-07 14:32:52 -08:00
96126a5b01
Packaged local_settings styles in common
2017-12-07 13:36:18 -08:00
832a7f9a05
ReFix font-weight of <strong> element for CJK fonts ( #5920 )
...
Also apply to Japanese and Korean.
Fix font-weight in landing pages.
2017-12-07 21:35:19 +01:00
7fcf15adf3
Improve Chinese (Simplified) translations ( #5911 )
...
* i18n: (zh-CN) Change `管理` (moderation) to `运营`
* i18n: (zh-CN) Improve translations
2017-12-07 16:02:52 +01:00
a1fc626e57
Fix font-weight of <strong> element for CJK fonts ( #5914 )
...
* Fix font-weight for CJK fonts
* Use `font-weight: 700;` for mobile support
* Fix indentation
* Remove trailing whitespace
* Remove trailing whitespace
2017-12-07 16:01:52 +01:00
9a6fc03332
Hide moved account's follow button in search result ( #5913 )
2017-12-07 15:59:31 +01:00
7445f17571
OC language update ( #5905 )
...
* Update
* update
* Update oc.yml
* bundle exec i18n-tasks normalize
* Update oc.yml
2017-12-07 15:28:13 +09:00
67d625c42d
Fix hide reblogs in glitch frontend ( #5909 )
...
This applies 432761f375
2017-12-06 22:35:45 -06:00
ddb61decce
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2017-12-06 22:34:42 -06:00
935c1944e2
Merge pull request #241 from glitch-soc/no-dm-option
...
Add option to remove DMs from home (#126 )
2017-12-06 22:20:55 -06:00
744447b3c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 04:17:14 +00:00
0c4ca3e549
Remove duplicate annotate ( #5910 )
...
* Remove duplicate annotate
* Remove blank line
2017-12-07 04:53:42 +01:00
c083816c24
Add embed_url to preview cards ( #5775 )
2017-12-07 03:37:43 +01:00
432761f375
Fix hide reblogs (regression from #5887 ) ( #5909 )
2017-12-07 03:37:31 +01:00
2f2467ce8e
Add option to remove DMs from home ( #126 )
2017-12-06 17:50:27 -08:00
de56209951
Merge pull request #240 from glitch-soc/copy-api-changes
...
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239 )
2017-12-06 19:59:15 -05:00
133f5b3b53
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour ( #239 )
2017-12-06 18:23:28 -06:00
c63e6c9a2c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-07 00:17:14 +00:00
061211a1e3
Fix common packs when other pack also there
2017-12-06 15:34:19 -08:00
161d286df2
Use settings pack for InvitesController ( #229 )
2017-12-06 17:20:04 -06:00
81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06 17:44:07 -05:00
017fc81caf
Prepend check_enabled_deletion to Settings::DeletesController ( #229 )
...
The specs for Settings::DeletesController include an example that
sets Settings.open_deletion to false and expects the "if deletion is not
available, redirect to root" logic to run. However, this spec does not
set up a user, which means that the spec (intentionally or otherwise)
expects this redirection to work with unauthenticated access.
We should preserve that behavior. To do so, we prepend the deletion
check to the action chain set up by Settings::BaseController, so that
said check occurs before the authenticate_user! check.
2017-12-06 16:19:43 -06:00
9302369aa5
fix weblate for ja ( #5906 )
2017-12-07 07:08:22 +09:00
f1cbea77a4
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2017-12-06 15:40:59 -06:00
21e28a5caa
Merge pull request #238 from ncls7615/config-locales-ja
...
i18n: Update Japanese translation
2017-12-06 16:24:16 -05:00
fde91988ab
Update ja.yml
2017-12-07 06:10:15 +09:00
8ca91cef45
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
a0047fdca0
i18n: 🇵🇱 ( #5903 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-12-07 05:04:35 +09:00
a20509b41e
Fix list editor modal on narrow devices ( #5904 )
2017-12-06 19:48:48 +01:00
Erin
beatrix
amphetamine
cwm
Jenkins
Yamagishi Kazutoshi
Eugen Rochko
kibigo!
Lynx Kotoura
SerCom_KC
Quenty31
David Yip
Akihiko Odaki
nightpool
NCLS
Marcin Mikołajczak