mastodon

mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 19:31:42 +00:00

Author	SHA1	Message	Date
cwm	28423dd046	merge tootsuite pr #5904 into glitch flavour	2017-12-08 20:45:18 -06:00
cwm	b165950ca7	add keyboard shortcut to getting started, add missing list style	2017-12-08 20:30:45 -06:00
cwm	47157e07b2	merged tootsuite pr #5811 into glitch flavour	2017-12-08 20:13:08 -06:00
cwm	f44c8fd130	merged tootsuite pr #5750 into glitch flavour	2017-12-08 19:40:49 -06:00
abcang	99242b92bc	Keep WebPush settings (#5879 )	2017-12-09 02:31:37 +01:00
Eugen Rochko	ec3b449baa	Fix #5630 - Prevent duplicate load of favourites (#5931 )	2017-12-09 02:22:13 +01:00
Yamagishi Kazutoshi	f08e6e9ab5	Audio.prototype.seek is undefined (#5935 )	2017-12-09 01:25:00 +01:00
Eugen Rochko	c36b9cc5a6	Ensure link thumbnails are not stretched to super low quality (#5932 )	2017-12-09 00:56:16 +01:00
Eugen Rochko	70ce2a2095	Polish video player CSS, add timer on fullscreen/modal/public pages (#5928 )	2017-12-09 00:55:58 +01:00
Jenkins	776867ea73	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-08 13:17:14 +00:00
Yamagishi Kazutoshi	dad0a09675	Remove unused messages (#5924 )	2017-12-08 13:55:33 +01:00
Eugen Rochko	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
Yamagishi Kazutoshi	65e0bbd958	Disable status content outline (#5921 )	2017-12-08 00:03:25 +01:00
kibigo!	9cdd81e9dd	Glitch doesn't have a home stylesheet anymore	2017-12-07 14:32:52 -08:00
kibigo!	96126a5b01	Packaged local_settings styles in common	2017-12-07 13:36:18 -08:00
Lynx Kotoura	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
SerCom_KC	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
Yamagishi Kazutoshi	9a6fc03332	Hide moved account's follow button in search result (#5913 )	2017-12-07 15:59:31 +01:00
Quenty31	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
David Yip	67d625c42d	Fix hide reblogs in glitch frontend (#5909 ) This applies `432761f375` to the glitch copy of the Mastodon frontend.	2017-12-06 22:35:45 -06:00
David Yip	ddb61decce	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2017-12-06 22:34:42 -06:00
David Yip	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
Jenkins	744447b3c0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-07 04:17:14 +00:00
Akihiko Odaki	c083816c24	Add embed_url to preview cards (#5775 )	2017-12-07 03:37:43 +01:00
Yamagishi Kazutoshi	432761f375	Fix hide reblogs (regression from #5887 ) (#5909 )	2017-12-07 03:37:31 +01:00
kibigo!	2f2467ce8e	Add option to remove DMs from home (#126 )	2017-12-06 17:50:27 -08:00
David Yip	133f5b3b53	Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239 )	2017-12-06 18:23:28 -06:00
beatrix	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
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-06 20:17:13 +00:00
Marcin Mikołajczak	a0047fdca0	i18n: 🇵🇱 (#5903 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-12-07 05:04:35 +09:00
Lynx Kotoura	a20509b41e	Fix list editor modal on narrow devices (#5904 )	2017-12-06 19:48:48 +01:00
Lynx Kotoura	281c577cf8	Fix extra space between status text and username (#5902 )	2017-12-06 17:53:25 +01:00
aschmitz	4de211b80a	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.	2017-12-06 16:10:54 +01:00
Yamagishi Kazutoshi	063a1c2a8b	Fix emoji picker scrollbar (regression from #5046 ) (#5901 )	2017-12-06 12:18:27 +01:00
Yamagishi Kazutoshi	a9ca5ce920	Handle submit event of new list form (#5895 )	2017-12-06 12:18:10 +01:00
mayaeh	0393a64a90	Update Japanese translations. (#5893 )	2017-12-06 03:22:11 +01:00
Eugen Rochko	e20895f251	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	2017-12-05 23:02:27 +01:00
SerCom_KC	12cea76634	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	2017-12-06 00:46:04 +09:00
Neetshin	b4bc594c5a	Add aria-autocomplete='list' in Textaria (#5889 ) ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete	2017-12-05 11:32:00 +01:00
kibigo!	5bed0f10ed	Various fixes	2017-12-04 21:58:10 -08:00
David Yip	d9800a5647	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
Jenkins	f2f2f10320	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-04 12:17:13 +00:00
Neetshin	82884ac5c4	Update mutes.js (#5882 )	2017-12-04 20:52:14 +09:00
kibigo!	7c75702d05	Fixed image require	2017-12-03 23:52:13 -08:00
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
Jenkins	757f52ff2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-03 21:17:13 +00:00
Lynx Kotoura	886829e96c	Add keyboard shortcuts link to getting-started navigation (#5874 ) * Add keyboard shortcuts link to getting-started navigation * i18n: 🇵🇱 * yarn manage:translations	2017-12-03 21:29:51 +01:00
Lynx Kotoura	62a94ebed4	Add back button to keyboard shortcuts legend column (#5872 )	2017-12-03 21:29:41 +01:00
Jenkins	933eafdcd3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
cormo	bdf6d0a684	Remove redundant import statement in SCSS (#5864 ) * Remove redudant import statement in SCSS * Fix wrong chmod	2017-12-02 08:42:20 +09:00
kibigo!	541fe9b110	Skins support	2017-11-30 19:29:47 -08:00
mayaeh	9927df83ad	Update Japanese translations for KeyboardShortcuts. (#5858 )	2017-12-01 01:35:47 +01:00
Jenkins	d020ed1e05	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-29 22:17:13 +00:00
Mayu Laierlence	f0d4c7d7ab	Fix Korean translation (#5853 ) "어플리케이션" -> "애플리케이션"	2017-11-30 07:16:29 +09:00
Marcin Mikołajczak	82ab9736d5	i18n: 🇵🇱 (#5851 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-29 20:51:24 +09:00
David Yip	84840e8d8c	Merge pull request #232 from glitch-soc/hotkeys-glitch Implement status hotkeys + spoiler expanding	2017-11-28 17:34:03 -06:00
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-28 11:45:13 -06:00
aschmitz	eeaec39888	Allow hiding of reblogs from followed users (#5762 ) * Allow hiding of reblogs from followed users This adds a new entry to the account menu to allow users to hide future reblogs from a user (and then if they've done that, to show future reblogs instead). This does not remove or add historical reblogs from/to the user's timeline; it only affects new statuses. The API for this operates by sending a "reblogs" key to the follow endpoint. If this is sent when starting a new follow, it will be respected from the beginning of the follow relationship (even if the follow request must be approved by the followee). If this is sent when a follow relationship already exists, it will simply update the existing follow relationship. As with the notification muting, this will now return an object ({reblogs: [true\|false]}) or false for each follow relationship when requesting relationship information for an account. This should cause few issues due to an object being truthy in many languages, but some modifications may need to be made in pickier languages. Database changes: adds a show_reblogs column (default true, non-nullable) to the follows and follow_requests tables. Because these are non-nullable, we use the existing MigrationHelpers to perform this change without locking those tables, although the tables are likely to be small anyway. Tests included. See also <https://github.com/glitch-soc/mastodon/pull/212>. * Rubocop fixes * Code review changes * Test fixes This patchset closes #648 and resolves #3271. * Rubocop fix * Revert reblogs defaulting in argument, fix tests It turns out we needed this for the same reason we needed it in muting: if nil gets passed in somehow (most usually by an API client not passing any value), we need to detect and handle it. We could specify a default in the parameter and then also catch nil, but there's no great reason to duplicate the default value.	2017-11-28 15:00:35 +01:00
Yamagishi Kazutoshi	2b3b44ebbc	Refactor KeyboardShortcuts component (#5835 )	2017-11-28 14:32:27 +01:00
Marcin Mikołajczak	d937a59997	i18n: 🇵🇱 (#5841 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-28 19:30:18 +09:00
David Yip	7463d80ff4	Merge remote-tracking branch 'tootsuite/master'	2017-11-27 22:33:26 -06:00
kibigo!	6a48efe16c	Adds spoiler hotkey support to detailed statuses	2017-11-27 14:05:03 -08:00
kibigo!	f3c3df62ab	Implement status hotkeys + spoiler expanding	2017-11-27 13:30:01 -08:00
Joshua Wood	ff78c1177a	Add Keyboard Shortcuts Legend (#5823 ) * Add Keyboard Shortcuts Legend Adds a "Keyboard Shortcuts" legend (displayed in the rightmost column) which is toggled via a new "?" hotkey. When subsequently pressed from the Keyboard Shortcuts legend, "?" will navigate back to the previous location. * Add hidden table headings. Makes the headings available for accessibility but hides them visually.	2017-11-27 21:31:58 +01:00
David Yip	e77c3996a5	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-27 11:29:04 -06:00
Eugen Rochko	740f8a95a9	Add consumable invites (#5814 ) * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	2017-11-27 16:07:59 +01:00
Jenkins	5de42665d7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-27 05:17:11 +00:00
Akihiko Odaki	fd87e5a53b	Do not filter the status collection after muting and blocking (#5815 ) Filtering the status collection wipes out even the profiles of muted and blocked accounts. However, the behavior is inconsistent with the server- side behavior.	2017-11-26 01:45:17 +01:00
SerCom_KC	57fe4102ea	i18n: (zh-CN) Add translations for #5746 & #5750 (#5816 )	2017-11-26 02:38:40 +09:00
Akihiko Odaki	bf7757cbbc	Allow to open a modal for embedded photo (#5777 )	2017-11-25 15:41:45 +01:00
Akihiko Odaki	1266c66f79	Rename ariaLabel property of Dropdown to title (#5813 ) DropdownMenu has ariaLabel property, but it is actually applied to title property of IconButton. Keep it consistent.	2017-11-25 15:41:08 +01:00
spla	d07983b56d	Updated Catalan strings (#5801 ) * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml	2017-11-25 23:22:59 +09:00
Jenkins	86f4f8e158	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-25 05:17:15 +00:00
Yamagishi Kazutoshi	520d147803	Add Japanese translations (#5810 ) * yarn manage:translations * Add Japanese translation for #5087 * Add Japanese translation for #5616 * Add Japanese translation for #5746 * Add Japanese translation for #5750	2017-11-25 03:39:57 +01:00
Eugen Rochko	31ac5f0e00	Display list column (#5750 )	2017-11-25 00:35:37 +01:00
sdukhovni	2b51b4094c	Don't remove originals of boosted toots from timeline (#5479 ) * Don't remove originals of boosted toots from timeline * Remove unused argument to updateTimeline	2017-11-24 14:43:53 +01:00
Akihiko Odaki	5a551b530a	Do not require onClose property in NavigationBar (#5802 ) NavigationBar can be used as mock as it is in OnboardingModal. In such a case, onClose property is not required.	2017-11-24 13:13:17 +01:00
Jenkins	167fe2ab08	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-24 01:17:20 +00:00
Eugen Rochko	e84fecb7e9	Add logging of admin actions (#5757 ) * Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize	2017-11-24 02:05:53 +01:00
kibigo!	2585649b20	Styling fixes	2017-11-21 19:00:07 -08:00
kibigo!	12c0011fee	Update statuses on hidden toggle (Fixes #227 )	2017-11-21 18:27:34 -08:00
kibigo!	8812bab687	Minor fixes	2017-11-21 18:17:38 -08:00
Jenkins	2a5af9c10c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-21 17:17:11 +00:00
Marcin Mikołajczak	3c83b7e06e	i18n: Update Polish translation - front-end added (#231 ) * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-21 17:53:13 +01:00
Joan Montané	53b7b81b43	Update and fix Catalan translation (#5773 ) * Update activerecord.ca.yml * Update ca.yml * Update devise.ca.yml * Update doorkeeper.ca.yml * Update simple_form.ca.yml * fix syntax error for ca translation * fix syntax errors in ca translations Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-21 23:17:28 +09:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	2017-11-19 01:30:29 -06:00
beatrix	bcda3f85ce	Merge pull request #226 from glitch-soc/glitch-theme Glitch/Vanilla themes	2017-11-18 20:32:17 -05:00
kibigo!	321fa41930	Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme	2017-11-18 15:18:00 -08:00
kibigo!	a9ed857171	WIP static themeing	2017-11-18 15:12:52 -08:00
kibigo!	92cc79be72	Enabled vanilla thmee	2017-11-18 11:06:04 -08:00
kibigo!	08a01dd037	Public pack fix	2017-11-18 11:05:39 -08:00
kibigo!	672ace5a20	Media styling	2017-11-18 11:05:23 -08:00
kibigo!	f51f7b0e06	Font styles are now packagified	2017-11-18 11:05:00 -08:00
Eugen Rochko	58cede4808	Profile redirect notes (#5746 ) * Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues	2017-11-18 19:39:02 +01:00
Jenkins	eed50514be	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-18 06:17:14 +00:00
SerCom_KC	6be72a3ec6	Updating Chinese (Simplified) translations (#5725 ) * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `静音` to `隐藏` * i18n: (zh-CN) Add translations for #5087 & #5669 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translation for #5728	2017-11-18 14:35:11 +09:00
kibigo!	fc2c8b50dd	Removed glitch tests	2017-11-17 19:29:17 -08:00
kibigo!	e19fc6a9f8	Restore vanilla components	2017-11-17 19:29:16 -08:00
kibigo!	45c44989c8	Forking glitch theme	2017-11-17 19:29:16 -08:00
beatrix	5a9982b425	Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size Make character limit configurable (from tootsuite/mastodon#5697)	2017-11-17 19:02:40 -05:00
David Yip	dc16d73bf5	Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size	2017-11-17 14:28:16 -06:00
Jenkins	94c5a11cda	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-17 20:17:12 +00:00
David Yip	45f18b8f49	Merge pull request #218 from glitch-soc/themed-prefetching Themed preloading	2017-11-17 14:01:23 -06:00
Lynx Kotoura	4a2fc2d444	Increase contrast of Admin badges (#5740 ) To comply WCAG 2.0 guidelines on contrast ratio.	2017-11-17 19:59:53 +01:00
David Yip	2a386ad88d	Add trailing comma in mapStateToProps Consistency, eslint, etc.	2017-11-17 00:24:22 -06:00
David Yip	fbf76feb37	Merge pull request #219 from glitch-soc/no-spin Remove 'spin' theme	2017-11-17 00:14:24 -06:00
David Yip	392945f9a3	Throw layout, isWide, navbarUnder back into mapStateToProps. This gets wide view, auto layout, and navbar-under-mobile working again.	2017-11-17 00:11:01 -06:00
kibigo!	4dd19054d6	Removes spin theme	2017-11-16 21:54:12 -08:00
kibigo!	585758a373	Themed prefetching	2017-11-16 21:37:08 -08:00
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728 )	2017-11-17 01:22:38 +01:00
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	2017-11-16 01:21:16 -06:00
beatrix	04508868b0	Merge pull request #212 from aschmitz/feat/mute-reblogs Allow hiding reblogs on a per-follow basis	2017-11-15 12:01:17 -05:00
masarakki	c73a1fb537	reusable-streaming (#5709 )	2017-11-15 16:04:15 +01:00
Surinna Curtis	031a5a8f92	Optional notification muting (#5087 ) * Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes	2017-11-15 03:56:41 +01:00
SerCom_KC	c3ec1e87b8	Updating Chinese (Simplified) translations (#5643 ) * i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit `27bf9a946e`. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations	2017-11-14 20:44:42 +01:00
Marcin Mikołajczak	8087aa83d4	i18n: Update Polish translation (#5699 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-14 20:36:11 +01:00
Lain Iwakura	ca5440b93d	Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.	2017-11-14 17:56:38 +01:00
Lain Iwakura	dae8916544	Code style fixes.	2017-11-14 16:54:04 +01:00
Lain Iwakura	d11b1a1aa7	Handle character limit in initial state in frontend.	2017-11-14 16:24:10 +01:00
Andrew	c238444188	Updates and fixes to win95 theme	2017-11-14 01:22:48 -08:00
Anna e só	0e6c4cb796	l10n: PT-BR translation updated (#5681 ) * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit `108c460531`. * Updated pt-BR.json * pt-BR.yml updated	2017-11-14 11:07:38 +09:00
Eugen Rochko	07f7192bc3	Fix #5632 - Reset column loading status after fetch fail (#5659 )	2017-11-12 12:51:07 +09:00
aschmitz	48c705bbad	Don't update follower counts on reblog toggle	2017-11-11 21:42:22 -06:00
Lynx Kotoura	f9e7336296	Fix focused background color of direct toots (#5642 )	2017-11-09 19:40:34 +01:00
aschmitz	4944515020	"Show reblogs" per-follower UI/database changes TODO: * Tests (particularly for FollowRequests). * Anything to respect the setting when putting reblogs in timelines.	2017-11-09 08:41:10 -06:00
unarist	49a285ce15	Show confirmation dialog on leaving WebUI while composing (#5616 ) * Show confirmation dialog on leaving WebUI while composing Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost. So this prevents it by showing confirmation dialog from `onbeforeunload` event. * Fix message and comments	2017-11-09 14:34:41 +01:00
nullkal	3f16caaa50	Eliminate space around emoji (#5474 ) * Eliminate space around emoji * More improve emoji style * Make more compatible with Twemoji * Make scss-lint happy * Make not modify normal emoji's behavior * Decrease status__action-bar's margin-top to 5px * Make the test be passed * Revert "Make the test be passed" This reverts commit `54a8c60e59`. * Revert "Make not modify normal emoji's behavior" This reverts commit `6a5bdf0c11`.	2017-11-07 19:09:53 +01:00
ThibG	5d5c0f4f43	Twidere mention workaround (#5552 ) * Work around Twidere and Tootdon bug Tootdon and Twidere construct @user@domain handles from mentions in toots based solely on the mention text and account URI's domain without performing any webfinger call or retrieving account info from the Mastodon server. As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually resolve to the correct account (since the recommended configuration is to have WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing mentions, but won't do so when displaying them (as it does not go through the whole account resolution at that time). This change rewrites mentions to the resolved account, so that displaying the mentions will work. * Use lookbehind instead of non-capturing group in MENTION_RE Indeed, substitutions with the previous regexp would erroneously eat any preceding whitespace, which would lead to concatenated mentions in the previous commit. Note that users will “lose” up to one character space per mention for their toots, as that regexp is also used to remove the domain-part of mentioned users for character counting purposes, and it also erroneously removed the preceding character if it was a space.	2017-11-07 19:08:14 +01:00
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615 ) Fix #5597	2017-11-07 19:06:44 +01:00
voidSatisfaction	e618edf85a	fix: slang to adequate word (#5453 )	2017-11-07 14:49:50 +01:00
MIYAGI Hikaru	782224c991	Avoid emojifying on invisible text (#5558 )	2017-11-07 14:48:13 +01:00
nullkal	864c4d869f	Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160 ) (#5611 ) * Make fullscreen video in detailed status plays in fullscreen (Fix #5160) * Directly assign the initial state	2017-11-07 14:24:55 +01:00
kibigo!	bc8532359b	Mastodon GO! -> v0.1.1	2017-11-06 20:00:03 -08:00
kibigo!	e0298d66f8	Autocollapse boosts option	2017-11-05 15:05:12 -08:00
MIYAGI Hikaru	8abe9e9058	don't display any descendants of .invisible (#5567 ) * don't display any descendants of .invisible * reduce the scope of selector * remove some rules for image * lint	2017-11-05 13:05:50 +01:00
beatrix	73bf0ea7d1	Merge pull request #204 from glitch-soc/with-mastodon-go Introducing: Mastodon GO!	2017-11-04 09:14:08 -04:00
kibigo!	276432790a	Introducing: Mastodon GO!	2017-11-04 05:48:42 -07:00
Quenty31	da3adc0a73	l10n Occitan (#5586 ) * Update OC: time format Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan Harmonisation words in menu and confirmation windows * Update for unlisted custum emoji + #5577 * correction subjonctiu It's either siasque or siague * Corrections Any : qual que, in two words, else it means "some". And "siasque" with S even if I don't pronounce it at all. * Update oc.json	2017-11-03 17:42:30 +09:00
Sorin Davidoi	5521e94e24	refactor(features/ui): Avoid useless renders in WrappedSwitch (#5580 )	2017-11-01 12:17:53 +01:00
Yamagishi Kazutoshi	763a2f8511	Replace react-router-scroll to react-router-scroll-4 (#5568 )	2017-11-01 06:58:38 +09:00
Nolan Lawson	60f962eedc	Refactor initial state: auto_play_gif (#5576 )	2017-11-01 06:58:07 +09:00
Nolan Lawson	b254e6ca5f	Refactor initial state: "me" (#5563 ) * Refactor initial state: "me" * remove "me" from reducers/meta.js	2017-10-31 11:27:48 +09:00
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508 ) * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	2017-10-30 12:34:58 +09:00
Nolan Lawson	2cea4592a3	Avoid modifying emoji data inline (#5548 )	2017-10-30 00:23:38 +09:00
Nolan Lawson	512feab222	Add margin to account for Edge disappearing scrollbar (#5522 ) * Add margin to account for Edge disappearing scrollbar * Fix 16px margin for DMs and horizontal line	2017-10-30 00:11:32 +09:00
Nolan Lawson	5e111ce16d	Reactor unfollow_modal, boost_modal, delete_modal (#5505 )	2017-10-30 00:10:15 +09:00
Herbert Kagumba	3e9236b343	Separate Follow/Unfollow and back buttons (#5496 )	2017-10-27 19:14:11 +02:00
Nolan Lawson	e843f62f47	Avoid unnecessary Motion components in icon_button.js (#5544 )	2017-10-27 19:08:07 +02:00
Nolan Lawson	ec487166db	Directly use <Motion/> if not reducing motion (#5546 )	2017-10-27 19:06:54 +02:00
Nolan Lawson	3de22a82bf	Refactor initial state: reduce_motion and auto_play_gif (#5501 )	2017-10-28 00:04:44 +09:00
David Yip	870d71b78b	Merge branch 'master' into gs-master	2017-10-27 09:45:25 -05:00
nullkal	781105293c	Feature: Unlisted custom emojis (#5485 )	2017-10-27 16:11:30 +02:00
Andrew	2827f852c0	Theme: Windows 95	2017-10-26 23:22:48 -07:00
David Yip	dd28b94cf0	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-26 09:18:27 -05:00
りんすき	d556be2968	Fix column design broken with very long title (#5493 ) * Fix #5314 * fix not beautiful code * fix broken design with mobile view * remove no longer needed code	2017-10-26 22:52:48 +09:00
Nolan Lawson	02f7f3619a	Remove translateZ(0) on modal overlay (#5478 )	2017-10-26 22:46:50 +09:00
David Yip	42f2045c21	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	2017-10-25 16:01:20 -05:00
Jenkins	5f0268ab84	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-10-25 16:17:14 +00:00
Ratmir Karabut	20fee786b1	Update Russian translation (#5517 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation * Update Russian translation * Fix merge conflicts (revert) * Update Russian translation * Update Russian translation (fix) * Update Russian translation (fix quotes) * Update Russian translation (fix quotes) * Update Russian translation (fix) * Update Russian translation * Add quotes * bundle exec i18n-tasks normalize	2017-10-26 00:21:58 +09:00
Olivier Nicole	1ba3725473	Complete Esperanto translation (#5520 )	2017-10-25 22:38:37 +09:00
Ondřej Hruška	516eeeb43d	option to add title to <Button>, use for toot buttons (#197 )	2017-10-24 19:08:07 +02:00
David Yip	4f01e6e8d5	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-22 22:57:41 -05:00
Matthew Walsh	a76b024228	Changes to match other timelines in 2.0	2017-10-22 18:45:35 -07:00
Matthew Walsh	3db80f75a6	Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL	2017-10-22 18:35:14 -07:00
Marcin Mikołajczak	fdb0848e08	i18n: Update Polish Translation (#5494 )	2017-10-22 08:34:39 +09:00
Ondřej Hruška	d589dd7cd0	Compose buttons bar redesign + generalize dropdown (#194 ) * Generalize compose dropdown for re-use * wip stuffs * new tootbox look and removed old doodle button files * use the house icon for ...	2017-10-21 20:24:53 +02:00
kibigo!	21bafc6555	Updates to bio metadata script	2017-10-19 16:11:53 -07:00
Nolan Lawson	8392ddbf87	Remove unnecessary translateZ(0) when doing scale() (#5473 )	2017-10-19 18:27:55 +02:00
David Yip	9423553e5c	Make the compose area optionally scrollable. On desktop, the compose text box grows to accommodate the content. On mobile, the text box does not grow to accommodate text context, but does grow to accommodate images. It is possible in both cases to overflow the available area, which makes accessing other UI elements (e.g. visibility setttings) difficult. This commit makes the compose area optionally scrollable, which allows those UI elements to remain available even if they go off-screen.	2017-10-19 10:59:50 -05:00
David Yip	90770f6d59	Merge pull request #185 from glitch-soc/fix-null-status workaround for null status	2017-10-18 17:01:31 -05:00
Ondřej Hruška	eb907a5bab	formatting fix for eslint	2017-10-18 23:44:06 +02:00
David Yip	39c9cdf7fe	Remove unused filesAttached property.	2017-10-18 13:20:45 -05:00
David Yip	86cf4468af	Update stylesheet imports in glitch components. Commit `6e54719474` moved the Mastodon variables and mixins deeper in the directory hierarchy; this commit brings the glitch components in line with that change.	2017-10-18 11:52:34 -05:00
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	2017-10-18 11:52:04 -05:00
Sho Kusano	09d81defcd	Suppress type error(not a function) on calling fastSeek (#5452 )	2017-10-18 17:13:51 +02:00
Renato "Lond" Cerqueira	26b2a6a71e	Fix pt-BR translation strings related to advanced search. (#5449 )	2017-10-18 13:53:17 +02:00
Technowix	edf9a5e4fc	Revert #5438 for FR (#5450 ) As said here https://github.com/tootsuite/mastodon/pull/5438 the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades.	2017-10-18 13:51:30 +02:00
Håkan Eriksson	c710069c12	Some typos and supplementation in sentence structures (#5441 ) * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete * Swedish - Typos and supplementation in sentence structure * Update simple_form.sv.yml * Update sv.yml * Update sv.yml Rearranged the alphabetical order.	2017-10-18 13:50:52 +02:00
JohnD28	e7099d8d9e	fr.json typo (realtive time) (#5447 ) Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie	2017-10-18 16:47:14 +09:00
YaQ	6e54719474	Make theme directory and Rename application.scss (#5336 ) * Rename application.scss * Move to 'default' directory * Follow review Move directory, and Rename "mastodon". * Revert rename * undo removal of newline	2017-10-18 05:20:07 +09:00
Eugen Rochko	f3003417c5	When unreblog arrives over streaming API, just delete in UI (#5439 )	2017-10-17 22:17:02 +02:00
JeanGauthier	33ea042dec	i18n better wording (OC/CA/FR) + string added in FR (#5438 ) * Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json	2017-10-17 21:49:39 +02:00
Nolan Lawson	8b22a63ab0	Fix scrolling of dropdown when offscreen (#5434 )	2017-10-17 20:38:16 +02:00
Eugen Rochko	05686cc99d	Fix unwanted content warning gap in CSS (#5436 ) Fix #5356	2017-10-17 20:07:44 +02:00
JeanGauthier	a02de9e012	i18n update (#5427 ) in OC/CA/FR/ES (#5431 ) * Update oc.json * Update ca.json * Update fr.json * Update es.json	2017-10-17 13:03:28 +02:00
unarist	2d395324e1	Fix React warning about tabIndex on status with CW (#5432 )	2017-10-17 13:03:12 +02:00
Jakob Kramer	e6c9756fa9	Update German translation (#5425 )	2017-10-17 12:02:47 +02:00
Yamagishi Kazutoshi	5050719fac	Add Japanese translations (#5427 ) * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	2017-10-17 11:47:05 +02:00
Håkan Eriksson	a2b600428c	Swedish translation (#5406 ) * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	2017-10-17 13:41:36 +09:00
Jeroen	df1a9c5ab5	Small update Dutch (nl) strings (#5424 ) * Update Dutch strings * Update Dutch	2017-10-17 01:00:23 +02:00
Ondřej Hruška	4421f6598f	Fix dual toot button wrong behavior after compose re-design	2017-10-16 23:32:13 +02:00
Ondřej Hruška	64a5e9a1de	workaround for null status	2017-10-16 23:09:39 +02:00
beatrix	7364b26e4b	Merge pull request #184 from tootsuite/master Fix reduced motion breaking public galleries (#5423)	2017-10-16 17:05:42 -04:00
David Yip	313ba202ef	Merge pull request #182 from glitch-soc/wide-tootbox-panel Full-width tootbox panel to make room for buttons	2017-10-16 15:49:22 -05:00
Ondřej Hruška	37ff061d9b	satisfy eslint and jest	2017-10-16 22:24:44 +02:00
Ondřej Hruška	3d7de06db4	rem a comment	2017-10-16 22:12:38 +02:00
Ondřej Hruška	26f08f0791	double-decker tootbox	2017-10-16 22:10:14 +02:00
Ondřej Hruška	4b397adb5b	fix some lint errors	2017-10-16 21:13:34 +02:00
Nolan Lawson	8980aa804f	Fix reduced motion breaking public galleries (#5423 )	2017-10-16 21:08:01 +02:00
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	2017-10-16 09:23:59 -05:00
Eugen Rochko	aec70b44fc	Filter out duplicate IDs in timelines reducer (#5417 ) Possibly the cause of #5379, #5377	2017-10-16 15:59:30 +02:00
voidSatisfaction	03975dbde4	Add up-to-date korean translation on client (#5402 ) * chore: add Korean translation for client * fix: change unlisted and embed Korean words	2017-10-16 14:39:28 +02:00
KY	f72936b4e6	Fix #5082 - disable retweet link for followers only toot (#5397 ) * Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message	2017-10-16 14:10:12 +02:00
Marcin Mikołajczak	3c530d95f6	i18n: Update Polish translation (#5416 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-16 14:09:51 +02:00
JeanGauthier	1e7b3bf625	i18n ultim hour «More» dropdown title + reduce motion (#5415 ) * Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)	2017-10-16 14:09:26 +02:00
Yamagishi Kazutoshi	bf0ee1a25c	Enable ESLint rules import/* (#5414 ) * Enable ESLint rules import/* * fix	2017-10-16 11:12:09 +02:00
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393 ) * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	2017-10-16 09:36:15 +02:00
Nolan Lawson	981e20b03a	Fix offline-plugin warning in dev mode (#5411 )	2017-10-16 09:33:50 +02:00
Yamagishi Kazutoshi	d5b767c374	Replace JavaScript Testing Framework from Mocha to Jest (#5412 )	2017-10-16 09:33:08 +02:00
Nolan Lawson	93b54b8d4b	i18n "More" dropdown title (#5410 )	2017-10-16 09:31:47 +02:00
Nolan Lawson	e7ab9bf8b4	Refactor and simplify icon_button.js (#5413 )	2017-10-16 09:30:09 +02:00
David Yip	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-16 01:29:02 -05:00
David Yip	f72ad67a39	Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification Avatar unification, mk.II	2017-10-16 00:49:05 -05:00
Matthew Walsh	56094cb4bd	1.6 changed files for unified avatar styling -- updated to restore unity	2017-10-15 21:14:21 -07:00
David Yip	22df18e902	Merge pull request #173 from glitch-soc/zerowidthmoji use zerowidth spaces with emojis	2017-10-15 20:04:19 -05:00
Eugen Rochko	894da3dcca	Clear timer when unmounting RelativeTimestamp components (#5408 ) Possibly the cause of #5379, #5377	2017-10-16 03:03:36 +02:00
JeanGauthier	8eb7d30a6c	l10n Occitan: finishing touches (#5404 ) * Update oc.json * Update oc.yml	2017-10-15 23:07:32 +02:00
Yannick A	7fe1428cc4	Update French translation (#5401 )	2017-10-15 21:21:05 +09:00
Lynx Kotoura	b3b4b5a2eb	Adjust public hashtag pages (#5357 )	2017-10-14 14:48:12 +02:00
Ondřej Hruška	ae716a12e1	replace newlines in desktop notif with spaces instead of removing them (#5361 )	2017-10-14 14:41:12 +02:00
spla	f63a40e7c2	Updated Catalan strings (#5323 ) * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings	2017-10-14 14:40:35 +02:00
Yannick A	c6f76db2e1	Update French translation (#5384 ) Update French translation	2017-10-14 14:30:19 +02:00
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391 )	2017-10-14 14:28:19 +02:00
Ondřej Hruška	cdc22d23b9	Doodle improvements 2 (#176 ) * Fix some doodle bugs and added Background color functionality * added protections against accidental doodle erase, screen size changing * resolve react warning about 'selected' on <option>	2017-10-14 12:24:35 +02:00
Jakob Kramer	eb96aa86a4	Update German translation (#5389 )	2017-10-14 19:00:23 +09:00
Ondřej Hruška	531dadad86	Doodle palette, options, fill tool (#172 )	2017-10-14 00:58:38 +02:00
Ondřej Hruška	723890b6fa	use zerowidth spaces for emojis	2017-10-14 00:48:53 +02:00
Ondřej Hruška	2af964ef20	Fixed a bug where the canvas would get transparent bg upon erase	2017-10-13 18:13:00 +02:00
Ondřej Hruška	33e806217f	Initial doodle support	2017-10-13 18:07:01 +02:00
Jeroen	c35132a738	Dutch strings: small change (#5375 ) * Dutch strings: small change * And this too.	2017-10-13 18:03:56 +02:00
Eugen Rochko	48f7a58799	Do not try to guess why home timeline is empty in web UI (#5370 ) * Do not try to guess why home timeline is empty in web UI * Fix style issue	2017-10-13 16:44:16 +02:00
Eugen Rochko	388d093beb	When unfollowing, remove from home in web UI immediately (#5369 ) Do NOT send "delete" through streaming API when unmerging from home timeline. "delete" implies that the original status was deleted, which is not true!	2017-10-13 16:44:02 +02:00
ThibG	d37305c628	Reduce discrepancies between server and client-side character count (#5360 )	2017-10-12 23:26:34 +02:00
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362 ) * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	2017-10-13 06:16:43 +09:00
Ondřej Hruška	df626fdd43	Fix the notification bug with newlines	2017-10-12 21:28:17 +02:00
David Yip	6a2b1ba91e	Another tabs-vs-spaces fix, but with ~feeling~	2017-10-12 09:36:26 -05:00
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350 )	2017-10-12 16:31:14 +02:00
David Yip	fe1c20cfb9	Fix tabs-vs-spaces issue pointed out by eslint.	2017-10-12 09:23:06 -05:00
JeanGauthier	cb7ba23cd8	Update oc.json (#5343 )	2017-10-12 15:40:45 +02:00
David Yip	13e05fece2	Merge tag 'v2.0.0rc2' into gs-master	2017-10-12 04:22:59 -05:00
Sylvhem	3ebe03b729	Fixes and updates for the French translation (#5340 ) * Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.	2017-10-12 00:58:01 +02:00
Ondřej Hruška	eeaa8fba43	Fix our media gallery not having alt text and tooltips	2017-10-11 22:02:24 +02:00
Ondřej Hruška	b0b5ff1b0f	workaround for scrollIntoView bug ???	2017-10-11 21:49:22 +02:00
Ondřej Hruška	0bf9261e65	Merge remote-tracking branch 'upstream/master'	2017-10-11 21:27:17 +02:00
Jeroen	6bc07d3de3	Updating Dutch strings for 2.0 (#5334 )	2017-10-11 21:21:22 +02:00
Alda Marteau-Hardi	0352c40e99	Use gender neutral language as in the rest of the french translation (#5331 )	2017-10-11 21:20:56 +02:00
Lynx Kotoura	07ea625cb2	Fix styles of error pages (#5335 ) Signed-off-by: Lynx Kotoura <admin@sanin.link> Signed-off-by: Lynx Kotoura <admin@sanin.link>	2017-10-11 21:18:45 +02:00
kibigo!	3cc6255a7e	Removed length check which now happens in reducer	2017-10-11 11:50:11 -07:00
kibigo!	35e2cad4eb	Fixed header emojification	2017-10-11 11:00:28 -07:00
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
Eugen Rochko	1823cf435a	In thread view, only scroll first update, scroll to replied-to post (#5322 )	2017-10-11 19:21:44 +02:00
Eugen Rochko	476e79b8e3	Fully disable hotkeys when input element is focused (#5324 ) Because alt+n is a way to enter some kinda letter on some keyboard	2017-10-11 16:31:07 +02:00
JohnD28	19d3317a69	Update french translation : mastodon/locales/fr.json (#5318 ) * Update fr.json * Update fr.json * Update fr.json	2017-10-11 22:07:09 +09:00
ButterflyOfFire	38600b2792	Update ar.json (#5316 ) Pushing new arabic translated strings for Mastodon web client.	2017-10-11 21:19:04 +09:00
unarist	b0407ece42	Fix an error when ancestors get loaded before the status itself (#5312 ) When ancestors get loaded, we scroll to the target status (i.e. skip ancestors). However, ancestors may get loaded before the status itself, then it causes TypeError because `this.node` is undefined yet. Since we don't show anything until the status gets loaded, we don't need to scroll to the target status in this time. If we get the status itslef later, it causes `componentDidUpdate` and scrolling correctly.	2017-10-11 11:25:15 +02:00
Eugen Rochko	b3d7ad958f	Fix #5306 : Stop hotkeys in input fields even when shift is pressed (#5309 ) AZERTY layouts require pressing shift to press a number at all, so it triggers a column switch even when simply typing numbers in textarea	2017-10-11 01:01:17 +02:00
Eugen Rochko	9815be2a44	Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305 )	2017-10-10 20:47:14 +02:00
Eugen Rochko	4bb3e4eeba	Fix #5295 - Order custom emoji lexicographically (#5297 )	2017-10-10 15:18:12 +02:00
unarist	784c7510d7	Fix an error when video playback buffer is empty (#5300 )	2017-10-10 15:17:53 +02:00
Eugen Rochko	1c6fc0e4ce	Center error layout (#5289 )	2017-10-09 20:51:36 +02:00
Eugen Rochko	488584bfc1	Track frequently used emojis in web UI (#5275 ) * Track frequently used emojis in web UI * Persist emoji usage, but debounce commits to the settings API * Fix #5144 - Add tooltips to picker * Display only 2 lines of frequently used emojis	2017-10-08 21:47:15 +02:00
Ondřej Hruška	92a3181dc6	improve static page metadata look	2017-10-08 10:46:59 +02:00
JeanGauthier	94f15338c3	i18n update Occitan (#5263 ) * Update oc.json * Update oc.yml * Update oc.yml * Update oc.json	2017-10-08 14:18:27 +09:00
Nolan Lawson	db33a53ee8	Video preload should be a string (#5267 )	2017-10-08 03:06:43 +02:00
Nolan Lawson	7de6d269d2	Use ES module build of react-router-dom (#5264 )	2017-10-08 02:55:58 +02:00
Eugen Rochko	684001d729	Dynamically calculate card height for embeds instead of padding (#5265 ) The padding trick was hard-coded to a 16:9 ratio, but we can use width and height provided from OEmbed information and width of the card itself to calculate a new height	2017-10-08 02:34:49 +02:00
Eugen Rochko	292f3cd7e0	Show buffering in video player (#5261 )	2017-10-08 02:33:08 +02:00
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237 )	2017-10-07 20:00:35 +02:00
Eugen Rochko	d2dee6ea43	Fix custom emoji in emoji picker, persist skin tone (#5258 )	2017-10-07 19:02:30 +02:00
MitarashiDango	b7e65a004f	Japanese translation (relative time) (#5251 )	2017-10-08 01:32:03 +09:00
Nolan Lawson	057db0ecd0	Update emoji-mart to v2.1.1 (#5256 )	2017-10-07 12:17:02 +02:00
Eugen Rochko	11436358b4	Fix regression from #5206 - deduplicate descendants (#5253 )	2017-10-07 12:16:39 +02:00
kibigo!	6610d57f91	Basic static metadata styling	2017-10-06 22:22:34 -07:00
Eugen Rochko	45682f876d	Make auto-play GIFs preference affect custom emojis in web UI (#5254 )	2017-10-07 02:38:52 +02:00
Lynx Kotoura	5a2c7bd4ce	Fix overflowing in web UI (#5246 ) * Fix overflowing in web UI * Revert fixing dropdown menu modal	2017-10-06 20:40:17 +02:00
K.SHIRAKASHI	d5f490b1a2	Fix error on reloading status detail column (#5248 )	2017-10-06 20:37:56 +02:00
MIYAGI Hikaru	6f2d88dd28	Fix error at emoji_compressed in Firefox ESR (#5241 )	2017-10-06 16:40:41 +02:00
Nolan Lawson	72d939b69f	Fix thinking_face emoji autocomplete (#5238 )	2017-10-06 12:03:13 +02:00
Ondřej Hruška	37e141bccb	comment out unused stuff with Video	2017-10-06 09:23:28 +02:00
Nolan Lawson	97b3d0cd56	Import only Spring/Motion from react-motion (#5236 )	2017-10-06 03:46:15 +02:00
Nolan Lawson	fd7f0732fe	Compress and combine emoji data (#5229 )	2017-10-06 03:42:34 +02:00
Nolan Lawson	2aca22b8ea	import only Overlay from react-overlays (#5235 )	2017-10-06 03:24:33 +02:00
Eugen Rochko	7db0f8dcb2	Implement hotkeys for web UI (#5164 ) * Fix #2102 - Implement hotkeys Hotkeys on status list: - r to reply - m to mention author - f to favourite - b to boost - enter to open status - p to open author's profile - up or k to move up in the list - down or j to move down in the list - 1-9 to focus a status in one of the columns - n to focus the compose textarea - alt+n to start a brand new toot - backspace to navigate back * Add navigational hotkeys The key g followed by: - s: start - h: home - n: notifications - l: local timeline - t: federated timeline - f: favourites - u: own profile - p: pinned toots - b: blocked users - m: muted users * Add hotkey for focusing search, make escape un-focus compose/search * Fix focusing notifications column, fix hotkeys in compose textarea	2017-10-06 01:07:59 +02:00
Eugen Rochko	b9c76e2edb	When processing custom emoji, ensure a non-animated version exists (#5230 ) Use the non-animated version in web UI, but return both in API	2017-10-05 23:41:47 +02:00
Ondřej Hruška	f82e90bf11	workaround for notif clearing	2017-10-05 21:55:02 +02:00
Lynx Kotoura	32e8a87830	adjust public profile pages 2 (#5223 )	2017-10-04 22:49:36 +02:00
MitarashiDango	ecfa1c3f3b	fix error (When part of conversation has already been deleted.) (#5216 )	2017-10-04 16:28:39 +02:00
Eugen Rochko	632178d754	Use own, shorter relative timestamps (#5171 ) * Use own, shorter relative timestamps * Add acct to title tooltip of display name in statuses * Improve i18n of the relative times	2017-10-04 01:23:52 +02:00
Eugen Rochko	ec13cfa4f9	When a streaming API status arrives, sort it into conversations (#5206 )	2017-10-04 01:01:44 +02:00
m4sk1n	e6543d5fc4	i18n: Update Polish translation (#5202 )	2017-10-03 21:15:41 +02:00
Nolan Lawson	82d9ade7a6	Compress emoji_data_light.js (#5201 )	2017-10-03 20:43:57 +02:00
PFM	875d943c18	Add pagination in media modal (#4343 ) * Add pagination in media modal * Change array name * Add an element class * Avoid nested class * Pull out the active class * Use map instead of forEach * Remove parentheses	2017-10-03 17:11:22 +02:00
Yamagishi Kazutoshi	ecacb15cd5	Add placeholder text color to form of media attachments (#5196 )	2017-10-03 13:10:57 +02:00
Yamagishi Kazutoshi	eb6ec3d068	Add missing Japanese translations (#5193 ) * yarn manage:translations * Add Japanese translations for #5170 * Add Japanese translations for #5123 * Add Japanese translations for #5046 * Add Japanese translations for #5099 * Add Japanese translations for #5161 * "項目" -> "絵文字"	2017-10-03 13:10:26 +02:00
Akihiko Odaki	f303a954e6	Remove aria-label of status content (#5195 ) aria-label contained body of status with content warning, which should be hidden by default. Remove the label for the case and other cases due to consistency.	2017-10-03 13:10:06 +02:00
Jakob Kramer	395a57d03d	Update German translation (#5189 )	2017-10-03 09:53:18 +09:00
Eugen Rochko	0f699a4280	When muting, clear web UI like for blocks (#5172 ) * When muting, clear web UI like for blocks * Fix style issue	2017-10-03 02:01:54 +02:00
Eugen Rochko	5e5f36c216	Fix #5079 , fix #5186 - Emoji picker fixes (#5187 )	2017-10-03 01:56:50 +02:00
m4sk1n	a767ef85fa	i18n: Update translation files and Polish translation (#5180 ) * Update translation files Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-02 23:38:40 +02:00
Eugen Rochko	4453c9a9f5	Search popout (#5170 )	2017-10-02 18:24:05 +02:00
Nolan Lawson	b9c612b561	Code-split emoji-mart picker and data (#5175 )	2017-10-02 07:22:24 +02:00
Nolan Lawson	c567c87453	Toggle contain:strict on fullscreen (#5159 ) * Toggle contain:strict on fullscreen * Fix scss lint issue * fix scss whitespace lint issue	2017-10-02 03:01:01 +02:00
Eugen Rochko	cdad7977fc	Improve privacy dropdown, remove react-simple-dropdown dependency (#5140 ) * Improve privacy dropdown, remove react-simple-dropdown dependency * Animate privacy warning * Fix react-router-scroll	2017-10-01 12:20:00 +02:00
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161 )	2017-10-01 10:52:39 +02:00
Daggertooth	b110cc542f	Add image descriptions to title attribute to view on mouse hover/long-press. (#5137 ) * Add image descriptions to `title` attribute to view on mouse hover/long-press. * Too many title properties may spoil the broth.	2017-10-01 00:35:49 +02:00
beatrix	b1217242fc	Merge pull request #125 from glitch-soc/data-column Add data-column="..." to all columns	2017-09-30 15:02:21 -04:00
MIYAGI Hikaru	7481ae1bcb	trivial refactoring for emojify() (#5075 ) * unite loop process * add hint for original emojifier	2017-09-30 15:57:32 +02:00
Nolan Lawson	ca0e8be20c	Improve IntersectionObserverArticle perf (#5152 )	2017-09-30 14:28:49 +02:00
Eugen Rochko	d6fe0954e3	Make emoji autosuggestions immediate, usernames appear sooner (#5149 ) * Do not debounce emoji search * Make autosuggestions appear sooner	2017-09-30 05:11:44 +02:00
Eugen Rochko	ebb8c89207	Upgrade to React 16 (#5119 ) * Upgrade to React 16.0.0 * Disable some uncritical tests while chai-enzyme remains incompatible	2017-09-30 04:29:56 +02:00
Nolan Lawson	0060f98847	Remove react-sizeme (#5143 ) * Remove react-sizeme * Fix aspect ratio in "sensitive" mode	2017-09-29 22:46:43 +02:00
Jakob Kramer	1a72813b53	Updated German translation (#5151 ) Translate "about" page, several settings pages, data export/import, sessions overview, authorized followers page, account deletion page. More consistent use of words: - A toot is a Beitrag. - An account is a Konto. Some small improvements.	2017-09-29 21:11:28 +02:00
Eugen Rochko	887cd94e96	Increase attachment descriptions to 420 characters (#5139 ) Blaze it	2017-09-29 02:30:00 +02:00
Jakob Kramer	d0b4709b2a	Update German translation (#5133 ) Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)	2017-09-28 20:45:09 +02:00
Nolan Lawson	6e0659c838	Improve performance of modal and swipe animations (#5135 ) * Improve performance of modal and swipe animations * Fix eslint issues	2017-09-28 20:43:18 +02:00
Jakob Kramer	a3202f61af	Updated German translation (#5132 )	2017-09-28 17:38:39 +02:00
Eugen Rochko	4ec1771165	Add ability to specify alternative text for media attachments (#5123 ) * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	2017-09-28 15:31:31 +02:00
Ondřej Hruška	e9f9e3cc89	unbreak onboarding modal	2017-09-28 11:13:37 +02:00
Ondřej Hruška	cf24ce7e03	remove wrong emojify usage in old glitch components	2017-09-28 11:03:23 +02:00
Ondřej Hruška	74e4fc8f8a	fix custom emoji not shown in statuses	2017-09-28 10:13:16 +02:00
Ondřej Hruška	9a5418942c	fix some js errors due to number->string change of status ID	2017-09-28 10:04:20 +02:00
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
Ondřej Hruška	06e299cef5	Revert "autoscroll emoji suggestions box" This reverts commit `c89cce0219`.	2017-09-28 08:56:32 +02:00
Ondřej Hruška	8a24ad5828	Revert "Merge pull request #149 from glitch-soc/mojon-suggest" This reverts commit `fa3587645d`, reversing changes made to `15c9c2fd7e`.	2017-09-28 08:55:53 +02:00
Eugen Rochko	e648ef0bfb	Remove web UI warnings about OStatus privacy (#5102 ) * Remove web UI warnings about OStatus privacy * yarn run manage:translations	2017-09-28 00:26:33 +02:00
kibigo!	86e617a839	Better themeing support!!	2017-09-25 19:24:32 -07:00
Eugen Rochko	3b60832214	New error page graphic. Other error page improvements (#5099 ) - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	2017-09-25 23:05:54 +02:00
Lynx Kotoura	259181c41a	Fix size of single media in media-gallery (#5098 )	2017-09-25 20:26:50 +02:00
Eugen Rochko	510df0ac55	Fix emojify() by generating a mapping to existing Twemoji files (#5080 ) A new rake task emojis:generate downloads a full list of valid unicode sequences from unicode.org and checks it against existing Twemoji files, finally generating a map from each sequence to the existing file (e.g. when there's multiple ways an emoji can be expressed). The map is dumped into app/javascript/mastodon/emoji_map.json That file is loaded by emojione_light.js (now a misnomer) which decorates it further with shortcodes taken from emoji-mart's index.	2017-09-25 18:36:33 +02:00
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067 )	2017-09-25 04:04:04 +02:00
JeanGauthier	3f3de38075	OC update: different emoji picker (#5046 ) (#5077 )	2017-09-24 12:17:47 +02:00
abcang	e756c4f5ec	Fix media spoiler of DetailedStatus (#5071 )	2017-09-24 11:15:11 +02:00
Eugen Rochko	2f079573ed	In detail status view, display attachment uncropped if there's only one (#5054 ) * In detail status view, display attachment uncropped if there's only one * Make media spoiler the size of the media it hides, enable on static	2017-09-24 05:58:30 +02:00
Eugen Rochko	dae0af1fd2	Change mobile layout breakpoint from 1024px to 630px (#5063 ) 630px = Drawer + 1 Column	2017-09-24 01:25:07 +02:00
Eugen Rochko	5b8d0ad71b	Dropdown triangles a bit nicer, smoother scrolling on touch (#5062 )	2017-09-24 00:40:10 +02:00
Eugen Rochko	233258c61b	Fix media gallery CSS (#5064 )	2017-09-24 00:33:26 +02:00
Eugen Rochko	9c8aad612e	Require at least 2 characters before showing autosuggestions (#5065 )	2017-09-24 00:33:17 +02:00
Ondřej Hruška	210e6776fc	Fix intl warning with disabled secondary toot btn - Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility	2017-09-23 23:41:25 +02:00
Ondřej Hruška	1924a71b5a	Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled	2017-09-23 23:38:24 +02:00
Ondřej Hruška	67f8277526	Add secondary toot button (opt-in) (#153 ) Add secondary toot button + other toot button enhancements. Squashing so it's easy to revert if needed.	2017-09-23 23:11:02 +02:00
Mingye Wang	6dfeb64326	jsx/zh-*: Fix "pin column" for Chinese (#5060 )	2017-09-23 22:47:15 +02:00
m4sk1n	427beb4177	i18n: Update Polish translation (#5058 )	2017-09-23 22:14:39 +02:00
Lynx Kotoura	838f255fc2	Fix overflowing tabs in account__action-bar (#5056 ) * Fix numbers in accounts columns * Support edge compact-header	2017-09-23 21:06:16 +02:00
Eugen Rochko	1e02ba111a	Add emoji autosuggest (#5053 ) * Add emoji autosuggest Some credit goes to glitch-soc/mastodon#149 * Remove server-side shortcode->unicode conversion * Insert shortcode when suggestion is custom emoji * Remove remnant of server-side emojis * Update style of autosuggestions * Fix wrong emoji filenames generated in autosuggest item * Do not lazy load emoji picker, as that no longer works * Fix custom emoji autosuggest * Fix multiple "Custom" categories getting added to emoji index, only add once	2017-09-23 14:47:32 +02:00
Eugen Rochko	66126f3021	Add custom emojis to the emoji picker (#5052 )	2017-09-23 05:40:28 +02:00
Eugen Rochko	846cd4e838	Switch from EmojiOne to Twemoji, different emoji picker (#5046 ) * Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations	2017-09-23 01:41:00 +02:00
Ondřej Hruška	169d83f532	Remove "extra clickable spaces" made obsolete by status re-design	2017-09-23 00:33:35 +02:00
Ondřej Hruška	31dd261375	applied blackle's fix for gallery offset with full-width media	2017-09-22 21:47:14 +02:00
Nolan Lawson	b01ab55ed8	Fix PropTypes.oneOfType() warning (#5041 )	2017-09-22 17:50:29 +02:00
Eugen Rochko	034fab39ab	Make dropdowns render into portal, expand animation (#5018 ) * Make dropdowns render into portal, expand animation * Improve actions modal style	2017-09-22 04:59:17 +02:00
Nolan Lawson	0df6442636	Use passive listener in privacy_dropdown.js (#5037 )	2017-09-22 04:59:01 +02:00
Nolan Lawson	245816ab27	Eliminate re-renders for intersection_observer_article.js (#5036 )	2017-09-22 04:58:33 +02:00
kibigo!	c2b479efec	Long display names now ellipsis properly	2017-09-21 16:55:32 -07:00
kibigo!	a94dc21c79	Styling fixes for header redesign	2017-09-21 16:46:18 -07:00
David Yip	9512db920c	Merge pull request #148 from glitch-soc/better-header Improvements to status headers and content	2017-09-21 16:11:03 -05:00
Ondřej Hruška	c89cce0219	autoscroll emoji suggestions box	2017-09-21 15:31:24 +02:00
syui	63819c848d	fix : mobile style of /about/more (#5034 )	2017-09-21 14:30:21 +02:00
beatrix	fa3587645d	Merge pull request #149 from glitch-soc/mojon-suggest Emoji and Hashtag autocomplete	2017-09-20 23:02:23 -04:00
MIYAGI Hikaru	a9abe89093	Fix shortname problem in emojify() (regression from #5016 ) (#5032 ) When colon appears end of line, skiped all character containing unicode emojis. Fixed. https://github.com/tootsuite/mastodon/pull/5016#issuecomment-331012008	2017-09-21 03:47:16 +02:00
kibigo!	9ed51cecd0	Fixed notification appearance	2017-09-20 14:52:01 -07:00
Ondřej Hruška	514edd3c23	fulltext mojo suggestions	2017-09-20 22:13:09 +02:00
Ondřej Hruška	a3760b7729	TURBO shortcode search	2017-09-20 21:57:33 +02:00
Ondřej Hruška	cbf00168f1	add scrollbar to mojon suggestions list when too long	2017-09-20 21:53:08 +02:00
Ondřej Hruška	4f9a493d9d	cache allShortcodes	2017-09-20 21:39:22 +02:00
Ondřej Hruška	8c0733a14e	typo in comment	2017-09-20 21:28:44 +02:00
Ondřej Hruška	36a35be2ad	Appease Travis	2017-09-20 20:34:11 +02:00
Ondřej Hruška	3783062450	Emoji and Hashtag autocomplete	2017-09-20 20:21:09 +02:00
Nolan Lawson	798b0fc5af	Reduce wasted renders for column_loading.js (#5021 ) * Reduce wasted renders for column_loading.js * Use defaultProps	2017-09-20 19:58:44 +02:00
TomoyaShibata	8cb4561145	Remove unnecessary css property (#5025 )	2017-09-20 15:26:22 +02:00
aschmitz	669fe9ee06	Change IDs to strings rather than numbers in API JSON output (#5019 ) * Fix JavaScript interface with long IDs Somewhat predictably, the JS interface handled IDs as numbers, which in JS are IEEE double-precision floats. This loses some precision when working with numbers as large as those generated by the new ID scheme, so we instead handle them here as strings. This is relatively simple, and doesn't appear to have caused any problems, but should definitely be tested more thoroughly than the built-in tests. Several days of use appear to support this working properly. BREAKING CHANGE: The major(!) change here is that IDs are now returned as strings by the REST endpoints, rather than as integers. In practice, relatively few changes were required to make the existing JS UI work with this change, but it will likely hit API clients pretty hard: it's an entirely different type to consume. (The one API client I tested, Tusky, handles this with no problems, however.) Twitter ran into this issue when introducing Snowflake IDs, and decided to instead introduce an `id_str` field in JSON responses. I have opted to not do that, and instead force all IDs to 64-bit integers represented by strings in one go. (I believe Twitter exacerbated their problem by rolling out the changes three times: once for statuses, once for DMs, and once for user IDs, as well as by leaving an integer ID value in JSON. As they said, "If you’re using the `id` field with JSON in a Javascript-related language, there is a very high likelihood that the integers will be silently munged by Javascript interpreters. In most cases, this will result in behavior such as being unable to load or delete a specific direct message, because the ID you're sending to the API is different than the actual identifier associated with the message." [1]) However, given that this is a significant change for API users, alternatives or a transition time may be appropriate. 1: https://blog.twitter.com/developer/en_us/a/2011/direct-messages-going-snowflake-on-sep-30-2011.html * Additional fixes for stringified IDs in JSON These should be the last two. These were identified using eslint to try to identify any plain casts to JavaScript numbers. (Some such casts are legitimate, but these were not.) Adding the following to .eslintrc.yml will identify casts to numbers: ~~~ no-restricted-syntax: - warn - selector: UnaryExpression[operator='+'] > :not(Literal) message: Avoid the use of unary + - selector: CallExpression[callee.name='Number'] message: Casting with Number() may coerce string IDs to numbers ~~~ The remaining three casts appear legitimate: two casts to array indices, one in a server to turn an environment variable into a number. * Back out RelationshipsController Change This was made to make a test a bit less flakey, but has nothing to do with this branch. * Change internal streaming payloads to stringified IDs as well Per https://github.com/tootsuite/mastodon/pull/5019#issuecomment-330736452 we need these changes to send deleted status IDs as strings, not integers.	2017-09-20 14:53:48 +02:00
kibigo!	15c9c2fd7e	Pinned toots; embeds	2017-09-20 02:50:53 -07:00
kibigo!	227dbb6adb	Added GIF hover-to-play support	2017-09-20 02:19:36 -07:00
kibigo!	769f62d96f	Improvements to status headers	2017-09-20 01:57:08 -07:00
kibigo!	003bfd094e	Fixed disabled boost SVG (#106 )	2017-09-20 00:40:54 -07:00
kibigo!	fae8dce738	Fixed #133 (only parse links in status text)	2017-09-20 00:20:11 -07:00
Eugen Rochko	b35406b700	Fix custom emojis with non-1:1 aspect ratio being stretched (#5017 )	2017-09-20 03:38:38 +02:00
MIYAGI Hikaru	8e33fc29d7	redo #4500 with customEmojis (#5016 )	2017-09-19 23:27:29 +02:00
Nolan Lawson	e5c65b3067	Set touchstart listener to 'passive', remove 'once' (#5011 )	2017-09-19 17:00:29 +02:00
Andrew	0401a24558	Add support for multiple themes (#4959 ) * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	2017-09-19 16:36:23 +02:00
unarist	4aea3f88a6	Hide sensitive image in default on the public pages (#5009 ) Additionally, this restores previous background / text color for media spoiler.	2017-09-19 16:03:45 +02:00
Eugen Rochko	81cec35dbf	Custom emoji (#4988 ) * Custom emoji - In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />` - In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }` - In REST API: Status object includes `emojis` array (`shortcode`, `url`) - Domain blocks with reject media stop emojis - Emoji file up to 50KB - Web UI handles custom emojis - Static pages render custom emojis as `<img />` tags Side effects: - Undo #4500 optimization, as I needed to modify it to restore shortcode handling in emojify() - Formatter#plaintext should now make sure stripped out line-breaks and paragraphs are replaced with newlines * Fix emoji at the start not being converted	2017-09-19 02:42:40 +02:00
BruWalfas	c155d843f4	A few updates to the Spanish translation and some typos fixing (#4997 ) * So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message	2017-09-19 07:47:48 +09:00
Nolan Lawson	3d640dc8ac	Add will-change to improve scrolling perf (#5001 )	2017-09-18 23:29:15 +02:00
unarist	6db034a866	Re-allow underscore on valid_url_path_ending_chars (#4999 ) Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.	2017-09-18 21:25:40 +02:00
febrezo	cf14f4945a	Some improvements in the Spanish translation (#4991 )	2017-09-18 11:52:34 +09:00
Lynx Kotoura	4c14ff659b	Oauth code in input form and add description message (#4986 ) * Oauth code in a input form and add description * New authcode description	2017-09-17 15:23:44 +02:00
abcang	44245926f1	Fix cancellation of scroll to the right (#4978 )	2017-09-17 11:59:23 +02:00
BruWalfas	7be3131240	So Spanish. Much changes. Wow. (#4976 )	2017-09-17 18:16:43 +09:00
Mingye Wang	c8969dca35	Minor Chinese check & jsx addition (#4973 ) * zh-: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. zh-: apply suggestions for PR #4557 zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation	2017-09-16 18:48:38 +02:00
Surinna Curtis	b0487488a7	Re-center hidden media text vertical	2017-09-16 11:44:31 -05:00
Lynx Kotoura	1e3b1d7211	Adjust landing pages 2 (#4967 ) * Adjust landing pages 2 Fix styles of terms page Remove action buttons from timeline in about page Adjust styles of short description Adjust form inputs Set autocomplete off for username and email box in registration form. Remove line breakings. * Revert removing action buttons	2017-09-16 18:39:11 +02:00
ふぁぼ原	629fae8b3b	correct URL pattern used in text length counter in WebUI (#4968 )	2017-09-16 15:01:15 +02:00
Naoki Kosaka	cea5597722	Fix hasSize condition in secSet and sizes. (#4969 )	2017-09-16 15:00:01 +02:00
unarist	6c81f9d6e5	Fix invisible load more button (#4962 ) * Fix behavior while the button is invisible e.g. pointer cursor, couldn't open contextmenu * Avoid rendering the button to remove blank space if no more items are available or no items are rendered	2017-09-16 00:32:43 +02:00
Eugen Rochko	0d1215e82f	Remove redundant width/height values from SVGs to fix Safari bug (#4956 )	2017-09-15 00:51:00 +02:00
Anna e só	e77cc032c2	l10n: PT-BR translation updated (#4953 ) * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins * Fixed spelling on pt-BR.yml * Update pt-BR.json	2017-09-15 00:02:38 +02:00
Yamagishi Kazutoshi	bdcc9e2ceb	Add missing Japanese translations (#4947 )	2017-09-14 18:03:34 +02:00
Masoud Abkenar	b39d512ade	l10n: update Persian translation (#4946 )	2017-09-15 00:13:38 +09:00
m4sk1n	94fba44eec	i18n: Update Polish translation (#4942 ) * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml	2017-09-14 21:58:48 +09:00
Jeroen	721460a59b	Another Dutch language update (#4944 ) * Update nl.json * Update nl.yml * Update nl.json	2017-09-14 21:52:47 +09:00
Surinna Curtis	7ebd6ed03c	Apply white-space: nowrap to account relationships icons	2017-09-14 07:37:39 -05:00
Naf	45b595cdca	Add Japanese translate for #4911 (#4943 )	2017-09-14 18:20:04 +09:00
Quent-in	aad3df6afc	l10n update OC/FR video redesign (#4938 ) * l10n update for Redesign video player (#4911) * Update videp * Update I hope this time format works well. * One missing string * Update time format I'd like the complete name of the month in the Long format and the short one in the short format. I hope it works now	2017-09-14 16:32:14 +09:00
Surinna Curtis	59936b7a98	Tweak title text for mute notifications toggle to be clearer	2017-09-13 22:54:14 -05:00
Surinna Curtis	4a527154b7	fix a missing import	2017-09-13 21:47:30 -05:00
Surinna Curtis	df71eadaae	In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.	2017-09-13 21:47:30 -05:00
Surinna Curtis	323d437a09	satisfy eslint	2017-09-13 21:47:30 -05:00
Surinna Curtis	3278c08c29	make the hide/unhide notifications buttons work	2017-09-13 21:47:30 -05:00
Surinna Curtis	0e0703dbd8	Show whether muted users' notifications are muted in account lists	2017-09-13 21:47:30 -05:00
Surinna Curtis	30b5254a5d	Put the label for the hide notifications checkbox in a label element.	2017-09-13 21:47:30 -05:00
Surinna Curtis	0a207be99d	add trailing newlines to files for Pork :)	2017-09-13 21:47:30 -05:00
Surinna Curtis	2ea9b164d3	Satisfy eslint.	2017-09-13 21:47:30 -05:00
Surinna Curtis	b1576c52df	Convert profile header mute to use mute modal	2017-09-13 21:47:30 -05:00
Surinna Curtis	4612f7caea	Break out a separate mute modal with a hide-notifications checkbox.	2017-09-13 21:47:30 -05:00
Eugen Rochko	4f0597d579	Give video player fluid max-width (#4935 )	2017-09-14 04:03:00 +02:00
Eugen Rochko	2bbf987a0a	Redesign video player (#4911 ) * Redesign video player * Use new video player on static public pages too * Use media gallery component on static public pages too * Pause video when hiding it * Full-screen sizing on WebKit * Add aria labels to video player buttons * Display link card on public status page * Fix fullscreen from modal sizing issue * Remove contain: strict property to fix fullscreen from columns	2017-09-14 03:39:10 +02:00
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913 ) * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	2017-09-14 00:04:30 +02:00
Jeroen	331263270b	Updating Dutch translation (#4927 ) * Update doorkeeper.nl.yml * Update nl.yml * Update simple_form.nl.yml * Update nl.json * Update en.json * Update en.json * Update nl.json	2017-09-13 23:12:29 +09:00
MitarashiDango	283a5ec1a4	fix share intent. (#4926 )	2017-09-13 15:20:03 +02:00
abcang	60944d5dca	Fix height cache (#4909 )	2017-09-13 10:24:33 +02:00
unarist	af10c9fbff	Add section for protocol specific information on the admin page (#4910 ) This PR adds section for protocol specific information, then always show both of OStatus and ActivityPub. Specifically, this will help admins to check PuSH subscription status and unsubscribe manually, even `protocol` has been changed. This also includes below changes: * Add `overflow: hidden` to prevent float leaking * Add missing fields for ActivityPub	2017-09-12 23:06:10 +02:00
unarist	47d48fed8d	Reset preview image if avatar/header image selection was cancelled (#4893 )	2017-09-11 16:19:54 +02:00
Anna e só	c2bee07dbc	l10n: Full PT-BR translation (#4882 ) * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins	2017-09-11 08:40:29 +09:00
Masoud Abkenar	a345479de2	l10n: update Persian translation (#4880 ) * l10n: update Persian translation * l10n: fix missing Persian translation	2017-09-11 08:35:27 +09:00
Surinna Curtis	29c44fa5fa	Remove unused imports	2017-09-10 16:00:26 -05:00
David Yip	932571fa22	Merge tag 'v1.6.0' into sync/upstream	2017-09-10 13:04:27 -05:00
Eugen Rochko	72e662bb0d	Hide modal loading screen for media/video/boost/confirm/actions modals (#4873 )	2017-09-10 10:26:01 +02:00
Eugen Rochko	f2cbfb2eb3	Fix dimensions of loading component for compose drawer (#4872 )	2017-09-10 08:48:11 +02:00
David Yip	67ad453373	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss	2017-09-09 23:56:21 -05:00
David Yip	14e1fb8d36	Add missing import (patch by @MightyPork)	2017-09-09 14:28:20 -05:00
David Yip	514fc908a3	Merge tag 'v1.6.0rc3' into sync/upstream	2017-09-09 14:28:08 -05:00
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	2017-09-09 14:27:47 -05:00
Eugen Rochko	6867681c7c	Add script to make embedded iframes autosize (#4853 )	2017-09-09 16:23:44 +02:00
Eugen Rochko	bdc8b4fd91	Disable mouse-based pause from #4859 (#4865 ) It wasn't working ideally and introduced some annoying false positivies	2017-09-09 15:09:50 +02:00
unarist	c7908e2d09	Fix scroll behavior and others on paused timeline (#4864 ) Resolved: * Lot of redundant renders while mouse moving * Scroll jumping when timeline loaded * Scroll position isn't kept when statuses below the scrollTop was deleted then new status arrived Unresolved: * Scroll position isn't kept when statuses over the scrollTop was deleted then new status arrived -> It needs to know which statuses are over the scrollTop * New status indicator should be active when new statuses arrived while mouse moved recently -> It needs a) update indicator in ScrollableList, or b) set scrollTop status while mouse moving	2017-09-09 14:16:11 +02:00
Yamagishi Kazutoshi	c9d04f1c39	Fix second report (regression from `3b81baaaaf`) (#4863 )	2017-09-09 13:42:48 +02:00
Lynx Kotoura	3c45d3963a	Scrollable tables in settings pages (#4857 ) * Scrollable tables in settings pages * Add space before curly brace	2017-09-09 02:26:58 +02:00
Eugen Rochko	baa8b82179	Fix #1004 - Temporarily pause timeline if there's been recent mouse movement (#4859 )	2017-09-09 02:26:41 +02:00
unarist	1ae5d49a71	Refresh timeline after toot while the timeline is disconnected (#4858 ) To reflect status posting immediately, we've inserted the status into timelines directly. However, status insertion changes "latest status", and it means next timeline refresh only fetches statuses since the inserted status. This behavior is very bad for disconnected timeline and mobile views. After this patch, it refreshes timeline for disconnected timelines, instead of direct insertion.	2017-09-08 21:43:34 +02:00
Quent-in	dabc309ca3	i10n update OC and FR (#4849 ) * Missing "navigation_bar.pins" * Missing "navigation_bar.pins"	2017-09-08 13:55:47 +02:00
Eugen Rochko	95f018a3d4	"Mute conversation" option on all own toots, not just in notifications (#4844 ) That way you can mute notifications for a toot before you get replies to it or boosts or favourites	2017-09-08 12:00:30 +02:00
m4sk1n	7c2d84910c	i18n: Update Polish translation (#4845 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-09-08 05:51:48 +09:00
Quent-in	b00cc4b9bd	i10n OC / FR update Pinned toots (#4842 ) * Added column.pins New strings * Added column.pins * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update password_change.oc.html.erb * Update password_change.oc.text.erb * Update reset_password_instructions.oc.html.erb * Update reset_password_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb	2017-09-07 22:07:03 +02:00
PFM	7d853b514a	Use <button> instead of <div role="button"> (#4835 )	2017-09-07 16:18:41 +02:00
voidSatisfaction	85c7c42098	Add Pinned toot column (#4817 ) * Add Pinned_toot_section * Fix add frozen_string_literal * Fix delete no need controller and tests * Fix replace query strings to axios params * Fix change value to accountId and disabling more button	2017-09-07 09:58:11 +02:00
Quent-in	be75b13d68	i10n update OC and FR files (#4824 ) * Onboarding: corrections Some missing letters and spaces or better wording * Embed Translated as Intégrer in FR / Embarcar in OC	2017-09-07 08:55:03 +09:00

... 7 8 9 10 11 ...

1535 commits