]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agofilter local-only statuses from public pages
Erin [Sun, 10 Dec 2017 23:23:01 +0000 (17:23 -0600)]
filter local-only statuses from public pages

8 years agoreplace reblog service check for an :eye: with #local_only
Erin [Sun, 10 Dec 2017 23:12:21 +0000 (17:12 -0600)]
replace reblog service check for an :eye: with #local_only

8 years agoset local_only flag on statuses in post_status_service
Erin [Sun, 10 Dec 2017 23:04:32 +0000 (17:04 -0600)]
set local_only flag on statuses in post_status_service

8 years agostatus: stub local_only?, add scope, add marked_local_only?
Erin [Sun, 10 Dec 2017 23:04:28 +0000 (17:04 -0600)]
status: stub local_only?, add scope, add marked_local_only?

8 years agoadd a local_only column to the statuses table
Erin [Sun, 10 Dec 2017 22:41:25 +0000 (16:41 -0600)]
add a local_only column to the statuses table

8 years agoMerge pull request #248 from chriswmartin/glitch-theme-lists
beatrix [Sun, 10 Dec 2017 05:53:37 +0000 (00:53 -0500)]
Merge pull request #248 from chriswmartin/glitch-theme-lists

add lists to glitch flavour!

8 years agoMerge pull request #237 from dexamphetamine/jpn-localization
beatrix [Sun, 10 Dec 2017 04:34:13 +0000 (23:34 -0500)]
Merge pull request #237 from dexamphetamine/jpn-localization

i18n: add ja glitch strings

8 years agoi18n: add ja glitch strings
amphetamine [Tue, 5 Dec 2017 21:05:39 +0000 (13:05 -0800)]
i18n: add ja glitch strings

8 years agoremove keyboard shortcuts from getting started because thats a different thing
cwm [Sat, 9 Dec 2017 16:32:46 +0000 (10:32 -0600)]
remove keyboard shortcuts from getting started because thats a different thing

8 years agofix a missing semicolon and mixed tabs/spaces that travis was complaining about
cwm [Sat, 9 Dec 2017 03:09:53 +0000 (21:09 -0600)]
fix a missing semicolon and mixed tabs/spaces that travis was complaining about

8 years agomerge tootsuite prs #5895 and #5889 into glitch flavour
cwm [Sat, 9 Dec 2017 02:50:39 +0000 (20:50 -0600)]
merge tootsuite prs #5895 and #5889 into glitch flavour

8 years agomerge tootsuite pr #5904 into glitch flavour
cwm [Sat, 9 Dec 2017 02:45:18 +0000 (20:45 -0600)]
merge tootsuite pr #5904 into glitch flavour

8 years agoadd keyboard shortcut to getting started, add missing list style
cwm [Sat, 9 Dec 2017 02:30:45 +0000 (20:30 -0600)]
add keyboard shortcut to getting started, add missing list style

8 years agomerged tootsuite pr #5811 into glitch flavour
cwm [Sat, 9 Dec 2017 02:13:08 +0000 (20:13 -0600)]
merged tootsuite pr #5811 into glitch flavour

8 years agomerged tootsuite pr #5750 into glitch flavour
cwm [Sat, 9 Dec 2017 01:40:49 +0000 (19:40 -0600)]
merged tootsuite pr #5750 into glitch flavour

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Fri, 8 Dec 2017 13:17:14 +0000 (13:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoRemove unused messages (#5924)
Yamagishi Kazutoshi [Fri, 8 Dec 2017 12:55:33 +0000 (21:55 +0900)]
Remove unused messages (#5924)

8 years agoWeblate translations (#5922)
Eugen Rochko [Fri, 8 Dec 2017 00:59:44 +0000 (01:59 +0100)]
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

8 years agoBump version to 2.1.0rc2
Eugen Rochko [Fri, 8 Dec 2017 00:47:08 +0000 (01:47 +0100)]
Bump version to 2.1.0rc2

8 years agoDisable status content outline (#5921)
Yamagishi Kazutoshi [Thu, 7 Dec 2017 23:03:25 +0000 (08:03 +0900)]
Disable status content outline (#5921)

8 years agoSkins shouldn't apply to fallback flavours
kibigo! [Thu, 7 Dec 2017 22:49:54 +0000 (14:49 -0800)]
Skins shouldn't apply to fallback flavours

8 years agoFixed webpack skin folder globbing
kibigo! [Thu, 7 Dec 2017 22:33:49 +0000 (14:33 -0800)]
Fixed webpack skin folder globbing

8 years agoGlitch doesn't have a home stylesheet anymore
kibigo! [Thu, 7 Dec 2017 22:32:52 +0000 (14:32 -0800)]
Glitch doesn't have a home stylesheet anymore

8 years agoPackaged local_settings styles in common
kibigo! [Thu, 7 Dec 2017 21:35:37 +0000 (13:35 -0800)]
Packaged local_settings styles in common

8 years agoReFix font-weight of <strong> element for CJK fonts (#5920)
Lynx Kotoura [Thu, 7 Dec 2017 20:35:19 +0000 (05:35 +0900)]
ReFix font-weight of <strong> element for CJK fonts (#5920)

Also apply to Japanese and Korean.
Fix font-weight in landing pages.

8 years agoImprove Chinese (Simplified) translations (#5911)
SerCom_KC [Thu, 7 Dec 2017 15:02:52 +0000 (23:02 +0800)]
Improve Chinese (Simplified) translations (#5911)

* i18n: (zh-CN) Change `管理` (moderation) to `运营`

* i18n: (zh-CN) Improve translations

8 years agoFix font-weight of <strong> element for CJK fonts (#5914)
SerCom_KC [Thu, 7 Dec 2017 15:01:52 +0000 (23:01 +0800)]
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

8 years agoHide moved account's follow button in search result (#5913)
Yamagishi Kazutoshi [Thu, 7 Dec 2017 14:59:31 +0000 (23:59 +0900)]
Hide moved account's follow button in search result (#5913)

8 years agoOC language update (#5905)
Quenty31 [Thu, 7 Dec 2017 06:28:13 +0000 (07:28 +0100)]
OC language update (#5905)

* Update

* update

* Update oc.yml

* bundle exec i18n-tasks normalize

* Update oc.yml

8 years agoFix hide reblogs in glitch frontend (#5909)
David Yip [Thu, 7 Dec 2017 04:35:45 +0000 (22:35 -0600)]
Fix hide reblogs in glitch frontend (#5909)

This applies 432761f37574b4e4159283f595e6c094b7bde449 to the glitch copy
of the Mastodon frontend.

8 years agoMerge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Thu, 7 Dec 2017 04:34:42 +0000 (22:34 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

8 years agoMerge pull request #241 from glitch-soc/no-dm-option
David Yip [Thu, 7 Dec 2017 04:20:55 +0000 (22:20 -0600)]
Merge pull request #241 from glitch-soc/no-dm-option

Add option to remove DMs from home (#126)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 7 Dec 2017 04:17:14 +0000 (04:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoRemove duplicate annotate (#5910)
Yamagishi Kazutoshi [Thu, 7 Dec 2017 03:53:42 +0000 (12:53 +0900)]
Remove duplicate annotate (#5910)

* Remove duplicate annotate

* Remove blank line

8 years agoAdd embed_url to preview cards (#5775)
Akihiko Odaki [Thu, 7 Dec 2017 02:37:43 +0000 (11:37 +0900)]
Add embed_url to preview cards (#5775)

8 years agoFix hide reblogs (regression from #5887) (#5909)
Yamagishi Kazutoshi [Thu, 7 Dec 2017 02:37:31 +0000 (11:37 +0900)]
Fix hide reblogs (regression from #5887) (#5909)

8 years agoAdd option to remove DMs from home (#126)
kibigo! [Thu, 7 Dec 2017 01:50:27 +0000 (17:50 -0800)]
Add option to remove DMs from home (#126)

8 years agoMerge pull request #240 from glitch-soc/copy-api-changes
beatrix [Thu, 7 Dec 2017 00:59:15 +0000 (19:59 -0500)]
Merge pull request #240 from glitch-soc/copy-api-changes

Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)

8 years agoApply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)
David Yip [Thu, 7 Dec 2017 00:23:28 +0000 (18:23 -0600)]
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 7 Dec 2017 00:17:14 +0000 (00:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix common packs when other pack also there
kibigo! [Wed, 6 Dec 2017 23:34:19 +0000 (15:34 -0800)]
Fix common packs when other pack also there

8 years agoUse settings pack for InvitesController (#229)
David Yip [Wed, 6 Dec 2017 23:20:04 +0000 (17:20 -0600)]
Use settings pack for InvitesController (#229)

8 years agoMerge pull request #229 from glitch-soc/glitch-theme
beatrix [Wed, 6 Dec 2017 22:44:07 +0000 (17:44 -0500)]
Merge pull request #229 from glitch-soc/glitch-theme

Advanced Next-Level Flavours And Skins For Mastodon™

8 years agoPrepend check_enabled_deletion to Settings::DeletesController (#229)
David Yip [Wed, 6 Dec 2017 22:19:43 +0000 (16:19 -0600)]
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.

8 years agofix weblate for ja (#5906)
nightpool [Wed, 6 Dec 2017 22:08:22 +0000 (17:08 -0500)]
fix weblate for ja (#5906)

8 years agoMerge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
David Yip [Wed, 6 Dec 2017 21:40:59 +0000 (15:40 -0600)]
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master

8 years agoMerge pull request #238 from ncls7615/config-locales-ja
beatrix [Wed, 6 Dec 2017 21:24:16 +0000 (16:24 -0500)]
Merge pull request #238 from ncls7615/config-locales-ja

i18n: Update Japanese translation

8 years agoUpdate ja.yml
NCLS [Wed, 6 Dec 2017 21:10:15 +0000 (06:10 +0900)]
Update ja.yml

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Wed, 6 Dec 2017 20:17:13 +0000 (20:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoi18n: 🇵🇱 (#5903)
Marcin Mikołajczak [Wed, 6 Dec 2017 20:04:35 +0000 (21:04 +0100)]
i18n: 🇵🇱 (#5903)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoFix list editor modal on narrow devices (#5904)
Lynx Kotoura [Wed, 6 Dec 2017 18:48:48 +0000 (03:48 +0900)]
Fix list editor modal on narrow devices (#5904)

8 years agoFix extra space between status text and username (#5902)
Lynx Kotoura [Wed, 6 Dec 2017 16:53:25 +0000 (01:53 +0900)]
Fix extra space between status text and username (#5902)

8 years agoBump version to 2.1.0rc1 (#5834)
Eugen Rochko [Wed, 6 Dec 2017 15:13:32 +0000 (16:13 +0100)]
Bump version to 2.1.0rc1 (#5834)

8 years agoBreak out nested relationship API keys (#5887)
aschmitz [Wed, 6 Dec 2017 15:10:54 +0000 (09:10 -0600)]
Break out nested relationship API keys (#5887)

* Break out nested relationship API keys

This closes #5856 by restoring the existing behavior of the `muting`
and `following` keys (returning booleans rather than truthy or false).
It adds `showing_reblogs` and `muting_notifications` keys:

* `showing_reblogs` returns true if:
  1. You've requested to follow the user, with reblogs shown, or
  2. You are following the user, with reblogs shown.
* `muting_notifications` returns true if you have muted the user and
  their notifications as well.

* Rubocop fix

* Fix pulling reblog/mute status from relationships

I could swear this had passed tests before, but apparently not.
Works now.

* More test fixes

Really, you'd expect this to be more straightforward.

8 years agoFix emoji picker scrollbar (regression from #5046) (#5901)
Yamagishi Kazutoshi [Wed, 6 Dec 2017 11:18:27 +0000 (20:18 +0900)]
Fix emoji picker scrollbar (regression from #5046) (#5901)

8 years agoHandle submit event of new list form (#5895)
Yamagishi Kazutoshi [Wed, 6 Dec 2017 11:18:10 +0000 (20:18 +0900)]
Handle submit event of new list form (#5895)

8 years agoSearch only from followees (#5897)
Yamagishi Kazutoshi [Wed, 6 Dec 2017 10:44:23 +0000 (19:44 +0900)]
Search only from followees (#5897)

8 years agoUpdate Yarn to version 1.3.2 (#5900)
Yamagishi Kazutoshi [Wed, 6 Dec 2017 10:42:51 +0000 (19:42 +0900)]
Update Yarn to version 1.3.2 (#5900)

8 years agoYarn install from Debian package repository (#5899)
Yamagishi Kazutoshi [Wed, 6 Dec 2017 10:42:30 +0000 (19:42 +0900)]
Yarn install from Debian package repository (#5899)

8 years agoUsing double splat operator (#5859)
Yamagishi Kazutoshi [Wed, 6 Dec 2017 10:41:57 +0000 (19:41 +0900)]
Using double splat operator (#5859)

8 years agoRemove rabl dependency (#5894)
Eugen Rochko [Wed, 6 Dec 2017 06:04:49 +0000 (07:04 +0100)]
Remove rabl dependency (#5894)

* Remove rabl dependency

* Replicate old Oj configuration

8 years agoUpdate Japanese translations. (#5893)
mayaeh [Wed, 6 Dec 2017 02:22:11 +0000 (11:22 +0900)]
Update Japanese translations. (#5893)

8 years agoLists redis clean-up (#5886)
Eugen Rochko [Tue, 5 Dec 2017 22:20:27 +0000 (23:20 +0100)]
Lists redis clean-up (#5886)

* When list is deleted, remove feed from redis

* Clean up list feeds of inactive users

8 years agoAdd list of lists component to web UI (#5811)
Eugen Rochko [Tue, 5 Dec 2017 22:02:27 +0000 (23:02 +0100)]
Add list of lists component to web UI (#5811)

* Add list of lists component to web UI

* Add list adding

* Add list removing

* List editor modal

* Add API account search limited by following=true relation

* Rework list editor modal

* Remove mandatory pagination of GET /api/v1/lists/:id/accounts

* Adjust search input placeholder

* Fix rspec (#5890)

* i18n: (zh-CN) Add missing translations for #5811 (#5891)

* i18n: (zh-CN) yarn manage:translations -- zh-CN

* i18n: (zh-CN) Add missing translations for #5811

* Fix some issues

- Display loading/missing state for list timelines
- Order lists alphabetically in overview
- Fix async list editor reset
- Redirect to /lists after deleting unpinned list
- Redirect to / after pinning a list

* Remove dead list columns when a list is deleted or fetch returns 404

8 years agoUpdate Chinese (Simplified) translations for version 2.1.0rc1 (#5849)
SerCom_KC [Tue, 5 Dec 2017 15:46:04 +0000 (23:46 +0800)]
Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)

* i18n: (zh-CN) Add missing translations for multiple PRs.
Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757

* i18n: (zh-CN) Fix translation for #5823 / #5835

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Change `发送者` to `作者`

* i18n: (zh-CN) Add missing translations for #5862

* i18n: (zh-CN) Add missing translation for #5874

* i18n: (zh-CN) Improve translations for keyboard shortcuts

8 years agoAdd aria-autocomplete='list' in Textaria (#5889)
Neetshin [Tue, 5 Dec 2017 10:32:00 +0000 (16:02 +0530)]
Add aria-autocomplete='list' in Textaria (#5889)

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

8 years agoVarious fixes
kibigo! [Tue, 5 Dec 2017 05:54:36 +0000 (21:54 -0800)]
Various fixes

8 years agocurrent_theme -> current_flavour (#229)
David Yip [Mon, 4 Dec 2017 17:35:35 +0000 (11:35 -0600)]
current_theme -> current_flavour (#229)

8 years agoMerge branch 'gs-master' into glitch-theme
David Yip [Mon, 4 Dec 2017 17:07:01 +0000 (11:07 -0600)]
Merge branch 'gs-master' into glitch-theme

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Mon, 4 Dec 2017 12:17:13 +0000 (12:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoUpdate mutes.js (#5882)
Neetshin [Mon, 4 Dec 2017 11:52:14 +0000 (17:22 +0530)]
Update mutes.js (#5882)

8 years agoFixed a name + localizations
kibigo! [Mon, 4 Dec 2017 08:19:39 +0000 (00:19 -0800)]
Fixed a name + localizations

8 years agoFixed image require
kibigo! [Mon, 4 Dec 2017 07:52:13 +0000 (23:52 -0800)]
Fixed image require

8 years agoRename themes -> flavours ? ?
kibigo! [Mon, 4 Dec 2017 07:26:40 +0000 (23:26 -0800)]
Rename themes -> flavours ? ?

8 years agoFixed typos
kibigo! [Mon, 4 Dec 2017 06:30:45 +0000 (22:30 -0800)]
Fixed typos

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sun, 3 Dec 2017 21:17:13 +0000 (21:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd keyboard shortcuts link to getting-started navigation (#5874)
Lynx Kotoura [Sun, 3 Dec 2017 20:29:51 +0000 (05:29 +0900)]
Add keyboard shortcuts link to getting-started navigation (#5874)

* Add keyboard shortcuts link to getting-started navigation

* i18n: 🇵🇱

* yarn manage:translations

8 years agoAdd back button to keyboard shortcuts legend column (#5872)
Lynx Kotoura [Sun, 3 Dec 2017 20:29:41 +0000 (05:29 +0900)]
Add back button to keyboard shortcuts legend column (#5872)

8 years agoUpdate dependencies for Node.js (2017-12-03) (#5876)
Yamagishi Kazutoshi [Sun, 3 Dec 2017 15:55:53 +0000 (00:55 +0900)]
Update dependencies for Node.js (2017-12-03) (#5876)

* Update babel-plugin-lodash to version 3.3.2

* Update enzyme to version 3.2.0

* Update enzyme-adapter-react-16 to version 1.1.0

* Update intersection-observer to version 0.5.0

* Update intl-messageformat to version 2.2.0

* Update node-sass to version 4.7.2

* Update postcss-loader to version 2.0.9

* Update React to version 16.2.0

* Update react-textarea-autosize to version 5.2.1

* Update stringz to version 0.3.0

* Update webpack to version 3.9.1

* Update webpack-bundle-analyzer to version 2.9.1

* Update webpack-dev-server to version 2.9.5

* Update webpack-merge to version 4.1.1

* Update fsevents to version 1.1.3

* yarn upgrade

8 years agoUpdate dependencies for Ruby (2017-12-03) (#5878)
Yamagishi Kazutoshi [Sun, 3 Dec 2017 15:55:27 +0000 (00:55 +0900)]
Update dependencies for Ruby (2017-12-03) (#5878)

* Update active_model_serializers to version 0.10.7

* Update capistrano-rails to version 1.3.1

* Update capistrano-rbenv to version 2.1.3

* Update capybara to version 2.16.1

* Update devise-two-factor to version 3.0.2

* Update i18n-tasks to version 0.8.19

* Update ox to version 2.8.2

* Update parallel_tests to version 2.19.0

* Update puma to version 3.11.0

* Update redis-namespace to version 1.6.0

* Update rspec-rails to version 3.7.2

* Update scss_lint to version 0.56.0

* Update webmock to version 3.1.1

* Update webpush to version 0.3.3

* bundle update

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sat, 2 Dec 2017 14:17:11 +0000 (14:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd Japanese translations for invite filter. (#5869)
mayaeh [Sat, 2 Dec 2017 14:09:56 +0000 (23:09 +0900)]
Add Japanese translations for invite filter. (#5869)

8 years agoRemove redundant import statement in SCSS (#5864)
cormo [Fri, 1 Dec 2017 23:42:20 +0000 (08:42 +0900)]
Remove redundant import statement in SCSS (#5864)

* Remove redudant import statement in SCSS

* Fix wrong chmod

8 years agoi18n: 🇵🇱 (#5865)
Marcin Mikołajczak [Fri, 1 Dec 2017 18:19:30 +0000 (19:19 +0100)]
i18n: 🇵🇱 (#5865)

8 years agoAdd invite filter (#5862)
Yamagishi Kazutoshi [Fri, 1 Dec 2017 15:40:02 +0000 (00:40 +0900)]
Add invite filter (#5862)

8 years agoFix invites form path (#5861)
Yamagishi Kazutoshi [Fri, 1 Dec 2017 11:26:57 +0000 (20:26 +0900)]
Fix invites form path (#5861)

8 years agoAllow admin to deactivate invite created by users (#5860)
Yamagishi Kazutoshi [Fri, 1 Dec 2017 11:26:19 +0000 (20:26 +0900)]
Allow admin to deactivate invite created by users (#5860)

8 years agoSkins support
kibigo! [Fri, 1 Dec 2017 03:29:47 +0000 (19:29 -0800)]
Skins support

8 years agoUpdate Japanese translations for KeyboardShortcuts. (#5858)
mayaeh [Fri, 1 Dec 2017 00:35:47 +0000 (09:35 +0900)]
Update Japanese translations for KeyboardShortcuts. (#5858)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 30 Nov 2017 03:17:12 +0000 (03:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd semi-support for Video/Image objects in ActivityPub (#5848)
Eugen Rochko [Thu, 30 Nov 2017 03:06:20 +0000 (04:06 +0100)]
Add semi-support for Video/Image objects in ActivityPub (#5848)

* Add semi-support for Video/Image objects in ActivityPub

Video and Image objects will create corresponding status records
with manually crafted text contents (title + URL)

* Extract html-url-finding logic into JsonLdHelper

* Fallback to id when url missing, extract supported object types

8 years agoFix too many forwards (#5854)
Eugen Rochko [Thu, 30 Nov 2017 02:50:05 +0000 (03:50 +0100)]
Fix too many forwards (#5854)

* Avoid sending explicit Undo->Announce when original deleted

* Do not forward a reply back to the server that sent it

* Deduplicate inboxes of rebloggers' followers for delete forwarding

* Adjust test

* Fix wrong class, bad SQL, wrong variable, outdated comment

8 years agoadd index on stream_entries table (#5793)
takayamaki [Thu, 30 Nov 2017 02:35:54 +0000 (11:35 +0900)]
add index on stream_entries table (#5793)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Wed, 29 Nov 2017 22:17:13 +0000 (22:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix Korean translation (#5853)
Mayu Laierlence [Wed, 29 Nov 2017 22:16:29 +0000 (07:16 +0900)]
Fix Korean translation (#5853)

"어플리케이션" -> "애플리케이션"

8 years agoi18n: 🇵🇱 (#5851)
Marcin Mikołajczak [Wed, 29 Nov 2017 11:51:24 +0000 (12:51 +0100)]
i18n: 🇵🇱 (#5851)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoUpdate Japanese translations. (#5844)
mayaeh [Wed, 29 Nov 2017 06:41:21 +0000 (15:41 +0900)]
Update Japanese translations. (#5844)

8 years agoMerge pull request #232 from glitch-soc/hotkeys-glitch
David Yip [Tue, 28 Nov 2017 23:34:03 +0000 (17:34 -0600)]
Merge pull request #232 from glitch-soc/hotkeys-glitch

Implement status hotkeys + spoiler expanding

8 years agoNormalize pl translation.
David Yip [Tue, 28 Nov 2017 18:17:36 +0000 (12:17 -0600)]
Normalize pl translation.

8 years agoMerge remote-tracking branch 'origin/master' into gs-master
David Yip [Tue, 28 Nov 2017 17:45:13 +0000 (11:45 -0600)]
Merge remote-tracking branch 'origin/master' into gs-master