mastodon

Author	SHA1	Message	Date
m.b	cd41c2c6ad	Update resolve_url_service.rb (#9188 )	2018-11-05 18:54:07 +01:00
James Kiesel	4c03e05a4e	Allow joining several hashtags in a single column (#8904 ) * Nascent tag menu on frontend * Hook up frontend to search * Tag intersection backend first pass * Update yarnlock * WIP * Fix for tags not searching correctly * Make radio buttons function * Simplify radio buttons with modeOption * Better naming * Rearrange options * Add all/any/none functionality on backend * Small PR cleanup * Move to service from scope * Small cleanup, add proper service tests * Don't use send with user input :D * Set appropriate column header * Handle auto updating timeline * Fix up toggle function * Use tag value correctly * A bit more correct to use 'self' rather than 'all' in status scope * Fix some style issues * Fix more code style issues * Style select dropdown more better * Only use to_id'ed value to ensure no SQL injection * Revamp frontend to allow for multiple selects * Update backend / col header to account for more flexible tagging * Update brakeman ignore * Codeclimate suggestions * Fix presenter tag_url * Implement initial PR feedback * Handle additional tag streaming * CodeClimate tweak	2018-11-05 18:53:25 +01:00
namelessGonbai	bb5558de62	Implement adding a user to a list from their profile (#9062 ) * Add add user to list from thier profile * Fix listAdderCss	2018-11-05 18:52:38 +01:00
Steven Tappert	a7e3bd0300	Check for empty "last_status" before sorting DM column (#9207 ) * Check for empty "last_status" before sorting * Small touchups for codeclimate	2018-11-05 18:51:43 +01:00
Sorin Davidoi	d6c7b01d08	fix(reset): Property name for styled scrollbars (#9210 ) https://webplatform.news/issues/2018-10-26	2018-11-05 18:51:26 +01:00
Thibaut Girka	34209c0340	Fix timestamp position in public pages with RTL languages	2018-10-31 11:37:47 +01:00
Thibaut Girka	b3c1380980	Fix styling of display names in public pages	2018-10-31 11:37:47 +01:00
Thibaut Girka	75b48dc177	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-31 10:08:36 +01:00
Thibaut Girka	2b2facbbdf	[Glitch] Port some of upstream's getting started footer links	2018-10-31 10:07:41 +01:00
Eugen Rochko	b9d0d209cd	Fix reducer error when conversation has no last status in web UI (#9173 ) Fix #9170	2018-10-31 00:55:20 +01:00
Eugen Rochko	ce2ee68b64	Revert "Fix FetchAtomService content type handling (#9132 )" (#9171 ) This reverts commit `c36a4a1617`.	2018-10-31 00:43:34 +01:00
Quentí	804586172e	[i18n] Update for Occitan (#9169 ) * Update oc.json * Update oc.yml * Update simple_form.oc.yml * Update simple_form.oc.yml * Update oc.json	2018-10-30 22:06:31 +01:00
Thibaut Girka	0d6b8f36aa	[Glitch] Fix empty display name precedence over username in web UI Port `f59b840549` to glitch-soc	2018-10-30 17:54:50 +01:00
Thibaut Girka	1c448d6474	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.	2018-10-30 17:52:08 +01:00
Thibaut Girka	7e18e95716	Add a local setting for inline preview cards	2018-10-30 17:51:06 +01:00
Thibaut Girka	bdc2338833	Add a “link” status icon for toots with a preview card	2018-10-30 17:51:06 +01:00
Thibaut Girka	b21615e957	[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning Port `9c38c5daa3` to glitch-soc	2018-10-30 17:51:06 +01:00
Thibaut Girka	ac9780b844	[Glitch] Include preview cards in status entity in REST API Port `795f0107d2` to glitch-soc	2018-10-30 17:51:06 +01:00
Eugen Rochko	f59b840549	Fix empty display name precedence over username in web UI (#9163 ) Fix #9131	2018-10-30 17:06:12 +01:00
Eugen Rochko	cc45a8f9f7	Fix td instead of th in sessions table header (#9162 ) Fix #9130	2018-10-30 17:00:34 +01:00
Eugen Rochko	5c8e7f0e1d	Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" (#9161 ) This reverts commit `10680f93e7`.	2018-10-30 16:25:54 +01:00
valerauko	c36a4a1617	Fix FetchAtomService content type handling (#9132 ) * Add profile to json+ld in Accept It's required by the ActivityPub spec * Use headers['Content-type'] instead of mime_type mime_type strips the profile from the content type, but it's still available raw in the headers hash * Add test for ld+json with profile	2018-10-30 15:07:57 +01:00
Quentí	a3d40ba53b	[i18n] Update for Occitan (#9157 ) * Update oc.json * Update devise.oc.yml * Update oc.yml * Update oc.json	2018-10-30 15:05:01 +01:00
Eugen Rochko	be202f9377	Accept the same payload in multiple inboxes and deliver (#9150 )	2018-10-30 15:03:55 +01:00
Eugen Rochko	47b8d195e6	Always let through notifications from staff (#9152 ) * Always let through notifications from staff Follow-up to #8993 * Let messages from staff through, but no other notifications	2018-10-30 15:02:55 +01:00
ThibG	a03d506626	Fix Pleroma mentions being fetched as preview cards (#9158 )	2018-10-30 15:02:24 +01:00
Masoud Abkenar	3aa2418217	[Glitch] RTL: fix toot privacy preferences radio buttonss Port `e961a763a2` to glitch-soc	2018-10-30 11:24:40 +01:00
Masoud Abkenar	e32a4f55fe	[Glitch] RTL: fix preferences page checkbox margins Port `5ee0b51ac8` to glitch-soc	2018-10-30 11:24:19 +01:00
Thibaut Girka	94ad76a5b9	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 11:22:25 +01:00
trwnh	2cc099c70f	Make detailed-status__wrapper actually wrap detailed status (#8547 ) * Remove class from scrollable div .detailed-status__wrapper does not actually wrap the detailed status here * Re-add class to focusable div .detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area	2018-10-30 06:33:02 +01:00
Masoud Abkenar	e961a763a2	RTL: fix toot privacy preferences radio buttonss (#9146 )	2018-10-30 00:49:29 +01:00
Masoud Abkenar	5ee0b51ac8	RTL: fix preferences page checkbox margins (#9145 ) * RTL: fix preferences page checkbox margins * Update rtl.scss	2018-10-30 00:47:43 +01:00
ThibG	33a71e8f7c	Do not hide boost notifications from followed people with hidden boosts (#9147 ) * Do not hide boost notifications from followed people with hidden boosts Not displaying boosts from a followed user in the Home timeline and not having notifications when they reblog your own content are two very separate concerns, tying them together seem counter-intuitive and unwanted. * Update specs accordingly	2018-10-30 00:47:31 +01:00
ash lea	7ec3f6022d	move some constants to rails environment	2018-10-29 21:29:31 +01:00
Thibaut Girka	a942ad3062	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.	2018-10-29 14:00:41 +01:00
m.b	2b18f5f85d	Add Page AP type support (#9121 )	2018-10-29 13:23:29 +01:00
Renato "Lond" Cerqueira	9d84d55cf0	Weblate translations (2018-10-26) (#9113 ) * Translated using Weblate (French) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Italian) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 90.7% (636 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Japanese) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 95.7% (89 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.4% (697 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Greek) Currently translated at 99.6% (698 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Basque) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Korean) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (French) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Spanish) Currently translated at 98.7% (692 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Dutch) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 89.2% (83 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 97.4% (683 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Occitan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (German) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Arabic) Currently translated at 97.0% (680 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.7% (337 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Serbian) Currently translated at 89.2% (83 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Corsican) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (French) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Galician) Currently translated at 100,0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Welsh) Currently translated at 99.4% (336 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 81.7% (76 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (700 of 701 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% (338 of 338 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% (93 of 93 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% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Welsh) Currently translated at 94.4% (662 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 97.8% (91 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Corsican) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Welsh) Currently translated at 96.9% (95 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Catalan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100,0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Welsh) Currently translated at 99.4% (336 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Occitan) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Persian) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Arabic) Currently translated at 97.6% (684 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (English) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (Galician) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Persian) Currently translated at 99.6% (698 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (English) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (Welsh) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Catalan) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Occitan) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Welsh) Currently translated at 99.4% (336 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Welsh) Currently translated at 99.0% (97 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 94.7% (664 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Persian) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Welsh) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Persian) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Czech) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Welsh) Currently translated at 94.7% (664 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Spanish) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 85.4% (599 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 93.3% (654 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/ * Translated using Weblate (Finnish) Currently translated at 61.3% (57 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Hebrew) Currently translated at 57.0% (53 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (French) Currently translated at 100,0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Bulgarian) Currently translated at 14,8% (104 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/ * Translated using Weblate (Asturian) Currently translated at 31,2% (219 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 85,2% (597 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/ * Translated using Weblate (Croatian) Currently translated at 15,0% (105 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hr/ * Translated using Weblate (Georgian) Currently translated at 94,3% (661 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/ * Translated using Weblate (Hebrew) Currently translated at 43,1% (302 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Ido) Currently translated at 30,0% (210 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/ * Translated using Weblate (Hungarian) Currently translated at 74,3% (521 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Indonesian) Currently translated at 32,7% (229 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/ * Translated using Weblate (Polish) Currently translated at 98,1% (688 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Romanian) Currently translated at 0,0% (0 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/ * Translated using Weblate (Russian) Currently translated at 96,0% (673 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Serbian (latin)) Currently translated at 69,6% (488 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/ * Translated using Weblate (Thai) Currently translated at 32,7% (229 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/th/ * Translated using Weblate (Turkish) Currently translated at 32,5% (228 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 96,7% (327 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/ * Translated using Weblate (Ukrainian) Currently translated at 89,9% (630 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ * Translated using Weblate (Ido) Currently translated at 38,7% (36 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/io/ * Translated using Weblate (Turkish) Currently translated at 95,9% (324 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/ * Translated using Weblate (Portuguese) Currently translated at 57,0% (53 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Indonesian) Currently translated at 37,6% (35 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/id/ * Translated using Weblate (Norwegian (old code)) Currently translated at 57,0% (53 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/ * Translated using Weblate (Serbian (latin)) Currently translated at 58,1% (54 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr_Latn/ * Translated using Weblate (Ukrainian) Currently translated at 39,8% (37 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/ * Translated using Weblate (Thai) Currently translated at 43,0% (40 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/th/ * Translated using Weblate (Turkish) Currently translated at 38,7% (36 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/tr/ * Translated using Weblate (Finnish) Currently translated at 84.0% (589 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Polish) Currently translated at 98.1% (688 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Italian) Currently translated at 93.6% (656 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Serbian (latin)) Currently translated at 68.2% (478 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/ * Translated using Weblate (Slovenian) Currently translated at 12.8% (90 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Armenian) Currently translated at 71.0% (240 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hy/ * Translated using Weblate (Asturian) Currently translated at 99.1% (335 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/ * Translated using Weblate (French) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Indonesian) Currently translated at 97.0% (328 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Ido) Currently translated at 94.1% (318 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/io/ * Translated using Weblate (Finnish) Currently translated at 86.1% (291 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Romanian) Currently translated at 99.7% (337 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Russian) Currently translated at 96.4% (326 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/ * Translated using Weblate (Polish) Currently translated at 99.1% (335 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Serbian (latin)) Currently translated at 72.2% (244 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr_Latn/ * Translated using Weblate (Slovenian) Currently translated at 88.8% (300 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Ido) Currently translated at 66.1% (41 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/io/ * Translated using Weblate (Asturian) Currently translated at 46.2% (43 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/ * Translated using Weblate (Bulgarian) Currently translated at 34.4% (32 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/bg/ * Translated using Weblate (Croatian) Currently translated at 34.4% (32 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hr/ * Translated using Weblate (Slovenian) Currently translated at 7.5% (7 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 69.9% (65 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hans/ * Translated using Weblate (Italian) Currently translated at 94.4% (662 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Greek) Currently translated at 89.1% (301 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Indonesian) Currently translated at 31.4% (220 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/ * Translated using Weblate (Bulgarian) Currently translated at 22.5% (76 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/bg/ * Translated using Weblate (Croatian) Currently translated at 48.8% (165 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hr/ * Translated using Weblate (Hebrew) Currently translated at 69.2% (234 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Hungarian) Currently translated at 70.7% (239 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Tamil) Currently translated at 69.5% (235 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ta/ * Translated using Weblate (Thai) Currently translated at 65.1% (220 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 87.3% (295 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Translated using Weblate (Danish) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Bulgarian) Currently translated at 14,1% (99 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 82,6% (579 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 92,4% (648 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/ * Translated using Weblate (Danish) Currently translated at 98,0% (687 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Georgian) Currently translated at 94,3% (661 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/ * Translated using Weblate (Hungarian) Currently translated at 73,0% (512 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Norwegian (old code)) Currently translated at 74,8% (524 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Ido) Currently translated at 19,3% (135 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/ * Translated using Weblate (Russian) Currently translated at 96,0% (673 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Swedish) Currently translated at 85,9% (602 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Turkish) Currently translated at 32,0% (224 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/ * Translated using Weblate (Ukrainian) Currently translated at 89,3% (626 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 90,5% (306 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Galician) Currently translated at 85,5% (289 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Georgian) Currently translated at 90,2% (305 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ka/ * Translated using Weblate (Greek) Currently translated at 99,1% (335 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Norwegian (old code)) Currently translated at 74,3% (251 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Portuguese) Currently translated at 72,8% (246 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Serbian) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Slovak) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Spanish) Currently translated at 97,6% (330 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Swedish) Currently translated at 88,5% (299 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Telugu) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Ukrainian) Currently translated at 82,0% (277 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/uk/ * Translated using Weblate (Danish) Currently translated at 90,3% (84 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Occitan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Danish) Currently translated at 98.8% (334 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (French) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Slovenian) Currently translated at 11.8% (11 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Galician) Currently translated at 100,0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Normalize translations * Fix cy locale	2018-10-29 13:20:29 +01:00
Eugen Rochko	9c38c5daa3	Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133 )	2018-10-29 04:42:07 +01:00
ThibG	7f22ed0fc9	Merge pull request #794 from ThibG/glitch-soc/merge-upstream Merge upstream changes	2018-10-28 20:36:55 +01:00
Thibaut Girka	b00f60f1d3	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-28 08:37:49 +01:00
Eugen Rochko	11b3ee4f4c	Reset status cache when status_stat or media_attachment updates (#9119 ) * Reset status cache when status_stat or media_attachment updates Fix #8711 Media attachments are generally immutable, but admins can update the sensitive flag, and this would ensure the change is visible instantly. Same for updates to status stats. That is a regression from #8185, because even the correct updated_at fetched from a join doesn't seem to invalidate the cache. * Remove join from Status#cache_ids since it has no effect	2018-10-28 06:42:34 +01:00
kedama	678f5ed296	Set z-index of dropdown to 9999. (#9126 )	2018-10-28 06:39:59 +01:00
Eugen Rochko	795f0107d2	Include preview cards in status entity in REST API (#9120 ) * Include preview cards in status entity in REST API * Display preview card in-stream * Improve in-stream display of preview cards	2018-10-28 06:35:03 +01:00
Thibaut Girka	ee1f1a2ec9	When searching for an emoji with multiple separators, consider the full input e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not “blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up, although it is likely what the user wanted to type in the first place.	2018-10-27 22:45:11 +02:00
ThibG	a90b569350	When searching for an emoji with multiple separators, consider the full input (#9124 ) e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not “blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up, although it is likely what the user wanted to type in the first place.	2018-10-27 22:32:54 +02:00
Thibaut Girka	8f4fab65a1	Do not rely on hover for upload form options if touch is used	2018-10-27 19:06:49 +02:00
Thibaut Girka	008f98b304	[Glitch] RTL: fix column-back-button__icon margins/content Port `6e1a4f85ad` to glitch-soc	2018-10-27 18:55:11 +02:00
Thibaut Girka	c13cfeac09	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-27 18:54:26 +02:00
Eugen Rochko	eef8d9a5f7	Add locality check to ActivityPub::FetchRemoteAccountService (#9109 ) * Add locality check to ActivityPub::FetchRemoteAccountService Fix #8643 Because there are a few places where it is called, it is difficult to confirm if they all previously checked it for locality. It's better to make sure within the service. * Remove faux-remote duplicates of local accounts	2018-10-26 23:08:34 +02:00
Masoud Abkenar	6e1a4f85ad	RTL: fix column-back-button__icon margins/content (#9112 ) * RTL: fix column-back-button__icon margins/content * Update rtl.scss * Update rtl.scss	2018-10-26 22:49:39 +02:00
ThibG	215e649391	Fix styling in /auth/edit (#9117 )	2018-10-26 22:49:17 +02:00
ThibG	e53cc673e7	Ignore invalid hashtags on remote statuses instead of rejecting them (#9118 ) Fixes #9115	2018-10-26 22:48:35 +02:00
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	2018-10-26 20:41:43 +02:00
ThibG	82e7988afc	Fix missing `mention` argument when processing incoming Create activities (#9114 ) * Fix missing `mention` argument when processing incoming Create activities * Fix typo (param → params)	2018-10-26 12:59:59 +02:00
abcang	1e2695198a	Skip link-back check if body is nil (#9107 )	2018-10-26 03:31:23 +02:00
Eugen Rochko	161aeadbb4	Remove character counter from edit profile (#9100 ) * Remove display name and bio counter hint, simply limit input * Remove now redundant translations * Fix code style issue	2018-10-26 01:55:24 +02:00
Eugen Rochko	768b0f132d	Fix direct messages column not loading more items on scroll (#9102 ) Fix #9097	2018-10-26 01:55:08 +02:00
Eugen Rochko	a2e3401e48	Fix conversations not being marked read on click (#9103 ) Fix #9096	2018-10-26 01:54:58 +02:00
ThibG	7fee968e9f	Do not fetch preview card for mentioned users (#6934 )	2018-10-25 18:13:19 +02:00
Eugen Rochko	d4cf963749	Allow inbox owner to view implicitly targeted ActivityPub payload (#9093 ) Fix #9091	2018-10-25 18:12:22 +02:00
Eugen Rochko	4ea718ef18	Migrate all old direct messages to new conversations schema (#9085 )	2018-10-25 01:44:02 +02:00
Yamagishi Kazutoshi	e8ffecbd36	Set @body_classes to admin layout (#9081 )	2018-10-25 00:10:01 +02:00
Eugen Rochko	d723f2a0a8	Fix RTL layout of status display names (#9075 ) Fix #2350	2018-10-24 18:18:08 +02:00
Eugen Rochko	288e435fe5	Show upload options on click as well as hover (#9074 ) Fix #8918	2018-10-24 18:17:15 +02:00
Eugen Rochko	01c169e796	Fix JS error when posting from page without router context (#9073 ) Fix #9057	2018-10-24 01:31:31 +02:00
Thibaut Girka	ed8d06212f	Keep back own DMs in Home timeline Follow-up to `e45a6edd65`, fixes inconsistencies in glitch-soc behavior.	2018-10-23 20:03:35 +02:00
Thibaut Girka	8f3096b846	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-23 17:15:57 +02:00
Eugen Rochko	39abec4d25	Fix public timelines not instantly updating on compose (#9050 ) Fix #9034	2018-10-23 00:43:18 +02:00
Eugen Rochko	ad510db3a1	Show suggested follows on search screen in mobile layout (#9010 ) Reminder: Suggestions were added in #7918 and are based on who you interact with who you do not follow. E.g. if you boost someone a lot from seeing other people's boosts of that person, it makes sense you might be interested in following the original source; or if you reply to someone a lot, maybe you'd want to follow them Each suggestion can be dismissed	2018-10-23 00:08:39 +02:00
Eugen Rochko	81017eaea7	Revert "RTL: remove blank character inside bdi (#9038 )" (#9056 ) This reverts commit `c7e9f9ff1e`.	2018-10-22 23:23:00 +02:00
Thibaut Girka	0c7f710be1	[Glitch] Surround mid-text display names with bdi tags Port `7861c5f108` to glitch-soc	2018-10-22 18:57:20 +02:00
Thibaut Girka	323ae1403a	[Glitch] fix: initial state of PrivacyDropdown is should not be null Port `bebe8ec887` to glitch-soc	2018-10-22 18:41:34 +02:00
Thibaut Girka	1bb23d0407	[Glitch] RTL: fix cardbar margins and alignment Port `c73864c137` to glitch-soc	2018-10-22 18:39:37 +02:00
Thibaut Girka	c9b19e05e2	[Glitch] RTL: fix admin account avatar margin in about page Port `3a157210c8` to glitch-soc	2018-10-22 18:38:52 +02:00
Thibaut Girka	c14be538a6	[Glitch] RTL: fix column settings toggle label Port `bf58461d36` to glitch-soc	2018-10-22 18:38:11 +02:00
Thibaut Girka	a1f512f18b	[Glitch] Fix domain label position and color Port `25f9ead041` to glitch-soc	2018-10-22 18:37:17 +02:00
Thibaut Girka	9950db2e1c	[Glitch] RTL: fix preferences layout Port `029943d59b` to glitch-soc	2018-10-22 18:34:48 +02:00
Thibaut Girka	076f0a0eb6	[Glitch] Fix admin account avatar margin Port `065b39e7a4` to glitch-soc	2018-10-22 18:33:35 +02:00
Thibaut Girka	aa277ab5fb	[Glitch] RTL: fix user stats in about page Port `301cbcc980` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	ef9c11e050	[Glitch] RTL: fix domain append at signup form Port `65b3804a6c` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	e18724363d	[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog" Port `d35801aaa2` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	1139b758c5	[Glitch] RTL: fix admin account margins in about page Port `f8c1b32541` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	bf9c4b6d98	[Glitch] undo part of PR 8202 to fix RTL Port `efd09e2ebb` to glitch-soc	2018-10-22 18:22:01 +02:00
Thibaut Girka	9f1c9b6135	[Glitch] Improve style of notice/alert messages Port `b972478812` to glitch-soc	2018-10-22 18:20:43 +02:00
Thibaut Girka	e45a6edd65	Keep new DMs in home feeds and in the old DM timeline Revert server-side part of `87fdd139b8`	2018-10-22 18:15:51 +02:00
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	2018-10-22 17:51:38 +02:00
Masoud Abkenar	c7e9f9ff1e	RTL: remove blank character inside bdi (#9038 ) * RTL: remove blank character inside bdi * Update app/javascript/mastodon/components/display_name.js Co-Authored-By: mabkenar <ampbox@gmail.com>	2018-10-22 01:04:32 +02:00
ThibG	84cf78da8a	Fix og:url on toots' public view (#9047 ) Fixes #9045	2018-10-21 22:52:10 +02:00
Masoud Abkenar	c73864c137	RTL: fix cardbar margins and alignment (#9044 )	2018-10-21 18:37:57 +02:00
Masoud Abkenar	3a157210c8	RTL: fix admin account avatar margin in about page (#9039 ) * RTL: fix admin account avatar margin in about page * fix code style	2018-10-21 16:45:08 +02:00
Thibaut Girka	4739e0f090	Put a video camera emoji or a picture frame emoji instead of “.” This uses the same logic as the status icons in the glitch flavor.	2018-10-21 16:09:18 +02:00
Thibaut Girka	8729f5e466	Do not move CWs to toot body when toot body is empty Fixes #395 Instead of leaving the toot body blank, it replaces it with a single “.” in order for the fold/unfold CW behavior to not look too weird on upstream Mastodon. Note that this does not fix upstream's CW-dropping behavior, as that is decided at the time the toot is posted, not received.	2018-10-21 16:09:18 +02:00
Thibaut Girka	04bedd237b	Attempt at fixing inline video player	2018-10-21 16:09:07 +02:00
Thibaut Girka	dfa5b0576f	Update mediaGallery component's width when opening CWs	2018-10-21 16:09:07 +02:00
Masoud Abkenar	bf58461d36	RTL: fix column settings toggle label (#9037 )	2018-10-21 20:31:40 +09:00
kedama	25f9ead041	Fix domain label position and color (#9033 ) * Fix position of the domain label * Fix position of the domain label for RTL - Fix color mismatch of linear gradient which assigned to "::after" pseudo class	2018-10-21 14:35:25 +09:00
Thibaut Girka	e4c3ea1809	Force sensitive content flag when posting a toot with a CW Indeed, when the “Always enable the Content Warning field” setting is enabled, sending a content-less toot with a CW would move the CW to the toot's content and leave the toot not marked as sensitive.	2018-10-20 17:06:21 +02:00
Thibaut Girka	13c3fa8d36	Focus the UI when pressing Escape in the CW field	2018-10-20 15:00:39 +02:00
Eugen Rochko	fd5285658f	Add option to block reports from domain (#8830 )	2018-10-20 08:02:44 +02:00
Eugen Rochko	9486f0ca77	Add "disable" button to report screen (#9024 ) * Add "disable" button to report screen * i18n-tasks remove-unused	2018-10-20 02:39:39 +02:00
Eugen Rochko	eb1b9903a6	Redesign direct messages column (#9022 )	2018-10-20 02:23:58 +02:00
Masoud Abkenar	029943d59b	RTL: fix preferences layout (#9021 )	2018-10-20 01:05:17 +02:00
bsky	065b39e7a4	Fix admin account avatar margin (#9020 )	2018-10-19 20:35:42 +02:00
Masoud Abkenar	301cbcc980	RTL: fix user stats in about page (#9018 )	2018-10-19 20:16:13 +09:00
Eugen Rochko	a38a452481	Add unread indicator to conversations (#9009 )	2018-10-19 01:47:29 +02:00
takayamaki	bebe8ec887	fix: initial state of PrivacyDropdown is should not be null (#9008 )	2018-10-19 00:00:19 +02:00
Masoud Abkenar	65b3804a6c	RTL: fix domain append at signup form (#9007 )	2018-10-18 21:19:31 +02:00
ThibG	007f7690fa	Fix fav/boosts hotkeys not working on detailed statuses (#9006 )	2018-10-18 19:52:00 +02:00
Thibaut Girka	b13c34de3a	Fix fav/boosts hotkeys not working on detailed statuses	2018-10-18 19:00:59 +02:00
Masoud Abkenar	f8c1b32541	RTL: fix admin account margins in about page (#9005 )	2018-10-18 14:35:49 +02:00
Eugen Rochko	72d7d3003b	Do not show "limited" visibility in default visibility preference (#8999 ) * Do not show "limited" visibility in default visibility preference Fix regression from #8950 * Fix code style issue	2018-10-17 22:04:40 +02:00
Eugen Rochko	ddd30f331c	Improve support for aspects/circles (#8950 ) * Add silent column to mentions * Save silent mentions in ActivityPub Create handler and optimize it Move networking calls out of the database transaction * Add "limited" visibility level masked as "private" in the API Unlike DMs, limited statuses are pushed into home feeds. The access control rules between direct and limited statuses is almost the same, except for counter and conversation logic * Ensure silent column is non-null, add spec * Ensure filters don't check silent mentions for blocks/mutes As those are "this person is also allowed to see" rather than "this person is involved", therefore does not warrant filtering * Clean up code * Use Status#active_mentions to limit returned mentions * Fix code style issues * Use Status#active_mentions in Notification And remove stream_entry eager-loading from Notification	2018-10-17 17:13:04 +02:00
ThibG	adb06baef6	Handle global hotkeys even when no element has focus (#8998 ) This fixes hotkeys not working when pressing the column “back” button, for instance.	2018-10-17 16:56:16 +02:00
Quint Guvernator	f5e2e96e95	always allow DMs from staff (#8993 )	2018-10-16 19:55:05 +02:00
Eugen Rochko	35b576dbec	Improve form for selecting media display preference (#8965 ) Regression from #8569	2018-10-16 14:07:54 +02:00
Masoud Abkenar	d35801aaa2	Fixes 8987 broken alignment at "Remote interaction dialog" (#8988 )	2018-10-15 16:09:08 +02:00
Masoud Abkenar	efd09e2ebb	undo part of PR 8202 to fix RTL (#8979 )	2018-10-15 04:39:20 +02:00
Thibaut Girka	b0527a4ce7	Handle alt+enter in the spoiler input as shortcut for secondary post Fixes #780	2018-10-14 12:00:21 +02:00
Eugen Rochko	b972478812	Improve style of notice/alert messages (#8973 )	2018-10-13 01:51:30 +02:00
Eugen Rochko	7d182442a7	Weblate translations (2018-10-12) (#8972 ) * Translated using Weblate (Welsh) Currently translated at 64.4% (448 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Arabic) Currently translated at 98.0% (682 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (French) Currently translated at 99.9% (695 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Arabic) Currently translated at 94.3% (82 of 87 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Welsh) Currently translated at 88.7% (297 of 335 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (French) Currently translated at 100.0% (335 of 335 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100,0% (87 of 87 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Czech) Currently translated at 100.0% (335 of 335 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (87 of 87 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (695 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Persian) Currently translated at 100.0% (335 of 335 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Arabic) Currently translated at 94.6% (88 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (335 of 335 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Czech) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Galician) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 100,0% (696 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Greek) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 98.8% (331 of 335 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.7% (694 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Persian) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Czech) Currently translated at 99.9% (695 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (French) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 99.9% (695 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.4% (692 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Corsican) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Corsican) Currently translated at 99.9% (695 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (German) Currently translated at 99.6% (693 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Japanese) Currently translated at 99.4% (692 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.9% (695 of 696 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (335 of 335 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 94.6% (88 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * i18n-tasks normalize * yarn manage:translations	2018-10-13 01:51:14 +02:00
Thibaut Girka	70d346ea95	Fix auto-unfold CWs when no regexp is set Fixes #778	2018-10-12 23:34:26 +02:00
Thibaut Girka	3d5d899094	Allow selecting both default flavour and theme Fixes #672	2018-10-12 19:06:35 +02:00
Eugen Rochko	fac529975b	Improve signature verification safeguards (#8959 ) * Downcase signed_headers string before building the signed string The HTTP Signatures draft does not mandate the “headers” field to be downcased, but mandates the header field names to be downcased in the signed string, which means that prior to this patch, Mastodon could fail to process signatures from some compliant clients. It also means that it would not actually check the Digest of non-compliant clients that wouldn't use a lowercased Digest field name. Thankfully, I don't know of any such client. * Revert "Remove dead code (#8919)" This reverts commit `a00ce8c92c`. * Restore time window checking, change it to 12 hours By checking the Date header, we can prevent replaying old vulnerable signatures. The focus is to prevent replaying old vulnerable requests from software that has been fixed in the meantime, so a somewhat long window should be fine and accounts for timezone misconfiguration. * Escape users' URLs when formatting them Fixes possible HTML injection * Escape all string interpolations in Formatter class Slightly improve performance by reducing class allocations from repeated Formatter#encode calls * Fix code style issues	2018-10-12 07:00:41 +02:00
Eugen Rochko	9d4541c612	Display customized mascot in web UI and fix admin form for it (#8964 ) Follow-up to #8766	2018-10-12 04:04:08 +02:00
Eugen Rochko	22de24b8ca	Fix missing protocol in dns-prefetch, improve code style (#8963 ) Regression from #8942	2018-10-12 02:19:10 +02:00
Eugen Rochko	5cbbd2c3b5	Fix microformats on statuses according to updated spec (#8958 )	2018-10-12 02:04:07 +02:00
Eugen Rochko	8fd2cc54c1	Fix type of conversation ID in conversations API (#8961 )	2018-10-12 01:36:51 +02:00
Eugen Rochko	21ad21cb50	Improve signature verification safeguards (#8959 ) * Downcase signed_headers string before building the signed string The HTTP Signatures draft does not mandate the “headers” field to be downcased, but mandates the header field names to be downcased in the signed string, which means that prior to this patch, Mastodon could fail to process signatures from some compliant clients. It also means that it would not actually check the Digest of non-compliant clients that wouldn't use a lowercased Digest field name. Thankfully, I don't know of any such client. * Revert "Remove dead code (#8919)" This reverts commit `a00ce8c92c`. * Restore time window checking, change it to 12 hours By checking the Date header, we can prevent replaying old vulnerable signatures. The focus is to prevent replaying old vulnerable requests from software that has been fixed in the meantime, so a somewhat long window should be fine and accounts for timezone misconfiguration. * Escape users' URLs when formatting them Fixes possible HTML injection * Escape all string interpolations in Formatter class Slightly improve performance by reducing class allocations from repeated Formatter#encode calls * Fix code style issues	2018-10-12 00:15:55 +02:00
ThibG	0075964244	Merge pull request #775 from ThibG/glitch-soc/merge-upstream Merge upstream changes	2018-10-11 21:28:03 +02:00
ThibG	2d27c11061	Set Content-Security-Policy rules through RoR's config (#8957 ) * Set CSP rules in RoR's configuration * Override CSP setting in the embed controller to allow frames	2018-10-11 20:35:46 +02:00
Thibaut Girka	8f720be9f3	Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream	2018-10-11 14:12:36 +02:00
Eugen Rochko	61d44dd11f	Fix typo in ActivityPub Create handler (#8952 ) Regression from #8951	2018-10-11 02:10:15 +02:00
Eugen Rochko	87fdd139b8	Do not push DMs into the home feed (#8940 ) * Do not push DMs into the home feed * Show DMs column after sending a DM, if DMs column is not already shown	2018-10-11 01:31:03 +02:00
Eugen Rochko	790d3bc637	Move network calls out of transaction in ActivityPub handler (#8951 ) Mention and emoji code may perform network calls, but does not need to do that inside the database transaction. This may improve availability of database connections when using pgBouncer in transaction mode.	2018-10-11 00:50:18 +02:00
Thibaut Girka	bb1103d974	Really fix HotKeys	2018-10-10 17:40:06 +02:00
Eugen Rochko	2459da29c2	Add description meta tag additionally to og:description (#8941 ) Fix #8685	2018-10-10 02:21:30 +02:00
Eugen Rochko	da7705b274	Add dns-prefetch if using different host for assets or uploads (#8942 )	2018-10-10 01:31:10 +02:00
Thibaut Girka	a02244f17c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js	2018-10-09 21:08:26 +02:00
mayaeh	e50cb5f4bd	Fix that the copy button of verify link did not work. (#8938 )	2018-10-09 19:36:13 +02:00
Eugen Rochko	7f9dd92a27	Track historical space stats in PgHero to determine PostgreSQL growth (#8906 )	2018-10-09 19:35:14 +02:00
Thibaut Girka	269edc0e48	Fix CW icon color in local-settings modal	2018-10-09 18:10:54 +02:00
Thibaut Girka	721aec40cd	Define some local-settings hints	2018-10-09 18:10:54 +02:00
Thibaut Girka	26409f3e8e	Add support for hints (or extended descriptions) in local-settings pages	2018-10-09 18:10:54 +02:00
Thibaut Girka	5f308a7f05	When screen width is too narrow, hide local-settings page text, keep only icons	2018-10-09 18:10:54 +02:00
Thibaut Girka	6cd793f0ac	Change “preferences” icon to match settings page icon	2018-10-09 18:10:54 +02:00
Thibaut Girka	edb9ec8543	Add icons for each of the local-setting pages	2018-10-09 18:10:54 +02:00
Thibaut Girka	122ac9cd1d	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-09 12:12:03 +02:00
ThibG	4134a10549	Merge pull request #770 from ThibG/glitch-soc/merge-upstream Merge upstream changes	2018-10-09 12:11:14 +02:00
Thibaut Girka	d0b1369a85	Fix app-wide hotkeys randomly failing to work	2018-10-09 12:10:51 +02:00
mayaeh	87abbb07f3	Add Japanese translations. (#8927 )	2018-10-09 07:12:37 +09:00
Thibaut Girka	b368d3c15d	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 15:34:53 +02:00
mayaeh	770e337497	Fixed error occurrence when pinning the DM column. (#8922 )	2018-10-08 14:43:38 +02:00
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
Thibaut Girka	96c3d26870	Move “Show action buttons in collapsed toots” option	2018-10-08 13:49:25 +02:00
Thibaut Girka	faecb35fe0	Switch from selects to radio buttons for local settings, improve styling	2018-10-08 13:49:25 +02:00
ashleyhull-versent	f194857ac9	rubocop issues - Cleaning up (#8912 ) * cleanup pass * undo mistakes * fixed. * revert	2018-10-08 04:50:11 +02:00
Eugen Rochko	a00ce8c92c	Remove dead code (#8919 ) SignatureVerification#matches_time_window? is not called anywhere.	2018-10-08 04:48:54 +02:00
ashleyhull-versent	2dba313100	Replace SVG asset with Custom mascot (#8766 )	2018-10-08 00:20:45 +02:00
Eugen Rochko	774ac47373	Add conversations API (#8832 ) * Add conversations API * Add web UI for conversations * Add test for conversations API * Add tests for ConversationAccount * Improve web UI * Rename ConversationAccount to AccountConversation * Remove conversations on block and mute * Change last_status_id to be a denormalization of status_ids * Add optimistic locking	2018-10-07 23:44:58 +02:00
Thibaut Girka	a3677a828d	[Glitch] Change documentation URL Port `28401962ca` to glitch-soc	2018-10-07 22:56:24 +02:00
Thibaut Girka	b4ba1058b8	[Glitch] RTL: fix margins of public-account-header__tabs Port `185cb2dc3a` to glitch-soc	2018-10-07 22:56:24 +02:00
Thibaut Girka	611740ce81	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02:00
ThibG	25744d43b0	Ensure only toots from the reported users are reported (#8916 )	2018-10-07 19:45:40 +02:00
Thibaut Girka	7cc7843109	Do not scroll timelines when closing media modals Media modals push an history state so that pressing back on mobile closes them. We made sure to not scroll when opening them, but not when closing them, which caused some issues in rare cases.	2018-10-07 12:08:32 +02:00
Marcin Mikołajczak	2fb692ea45	i18n: Update Polish translation (#8901 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-10-06 20:42:36 +09:00
Eugen Rochko	28401962ca	Change documentation URL (#8898 ) * Change documentation URL * Fix hardcoded documentation URL in locales	2018-10-06 14:33:36 +09:00
Masoud Abkenar	185cb2dc3a	RTL: fix margins of public-account-header__tabs (#8897 ) * RTL: fix margins of public-account-header__tabs * fix style * even more stylish code :)	2018-10-06 00:05:11 +02:00
Thibaut Girka	98bb6815a7	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 21:48:25 +02:00
Jeong Arm	144d73730d	Leave unknown language as nil if account is remote (#8861 ) * Force use language detector if account is remote * Set unknown remote toot's language as nil	2018-10-05 19:17:46 +02:00
Thibaut Girka	c6e4c48942	[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty	2018-10-05 19:08:52 +02:00
ThibG	42aecb4c13	Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893 ) * Add a confirmation dialog when hitting reply and the compose box isn't empty Fixes #878 * Performance improvement	2018-10-05 18:44:44 +02:00
Thibaut Girka	00fcdebed7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	2018-10-05 15:23:57 +02:00
Eugen Rochko	a46ab86adf	Limit the number of people that can be followed from one account (#8807 ) Configurable soft limit of 7,500, and above that, configurable ratio of 1.1 * followers, controlled by: - MAX_FOLLOWS_THRESHOLD - MAX_FOLLOWS_RATIO Fix #2311	2018-10-04 17:36:11 +02:00
Eugen Rochko	e645ae9561	Change admin accounts default sort to most recent (#8813 )	2018-10-04 16:05:38 +02:00
Eugen Rochko	7fe137d2f7	Fix link verification for remote accounts (#8868 )	2018-10-04 15:47:03 +02:00
ThibG	ba444797d2	Fix handling of ActivityPub activities lacking some attributes (#8864 )	2018-10-03 23:44:13 +02:00
Thibaut Girka	a9e8f98a9d	Make hidden media clickable in account media gallery	2018-10-02 22:00:57 +02:00
Thibaut Girka	d82c495c0f	Add media description (or status spoiler) in account media gallery	2018-10-02 22:00:57 +02:00
Thibaut Girka	bd1f08fa9a	Fix account gallery hidden media background color in mastodon-light	2018-10-02 22:00:57 +02:00
Thibaut Girka	eb85427576	[Glitch] Honour displayMedia setting in accountMedia gallery Inspired by `b79ab15859`	2018-10-02 22:00:57 +02:00
Thibaut Girka	6ad7606909	[Glitch] Add support for new display_media setting Port `f7a6f9489d` to glitch-soc [API] [vanilla required] [glitch-soc optional] initial_state show_sensitive_media boolean changed to show_media string with options "default", "hide_all", "show_all"	2018-10-01 16:48:55 +02:00
Thibaut Girka	15197a831c	[Glitch] RTL: fix margins: public-layout.header.nav-button Port `df2f4052b8` to glitch-soc	2018-10-01 14:38:35 +02:00
Thibaut Girka	884a898442	[Glitch] RTL: fix statubar action buttons/counter margins Port `9f6662fcc9` to glitch-soc	2018-10-01 14:38:32 +02:00
Thibaut Girka	36d426cec9	[Glitch] Separate font-family into variable Port `d0d65b5a28` to glitch-soc	2018-10-01 14:38:29 +02:00
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	2018-10-01 12:43:20 +02:00
Eugen Rochko	5d5d1b528e	Double the threshold for "read more" functionality (#8835 )	2018-10-01 03:38:10 +02:00
Spencer Alves	4e60a0d543	Add option to hide action bar in collapsed toots	2018-09-30 08:31:50 +02:00
David Yip	c065717b67	Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility Port various accessibility improvements from upstream	2018-09-29 19:01:19 -05:00
David Yip	2bb3c8c944	Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection Make pre-selection of usernames optional when replying to a toot	2018-09-29 19:01:05 -05:00
David Yip	19968912fa	Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view Scroll to textarea when composing a toot	2018-09-29 19:00:31 -05:00
David Yip	5b43d7bcbf	Merge pull request #745 from ThibG/glitch-soc/fixes/grey-out-button Disable the “TOOT” button (and secondary toot button) if the toot text is empty	2018-09-29 19:00:06 -05:00
Eugen Rochko	6c835085a3	Fix timeline pagination (#8827 ) Ruby's ** operator does not play well with non-Hash objects, which the params slice is Fix #8821	2018-09-29 19:03:33 +02:00
Masoud Abkenar	df2f4052b8	RTL: fix margins: public-layout.header.nav-button (#8823 ) * RTL: fix margins: public-layout.header.nav-button * add empty line to meet style guides	2018-09-29 11:04:26 +09:00
Thibaut Girka	86b2b009dd	Make pre-selection of usernames optional when replying to a toot Fixes #751	2018-09-28 21:01:09 +02:00
Thibaut Girka	15134beb1e	Fix styling issue in “Compose box options” local settings page	2018-09-28 18:55:44 +02:00
Thibaut Girka	9594c68532	Scroll to textarea when composing a toot	2018-09-28 18:44:55 +02:00
Thibaut Girka	fa18859b20	[Glitch] Adjust beforeUnload conditions Port `05f90e3695` to glitch-soc	2018-09-28 17:09:25 +02:00
Thibaut Girka	abffbba819	Fix maxCharacters in vanilla front-end	2018-09-28 17:05:19 +02:00
Eugen Rochko	ef69c655cc	Fix class autoloading issue in ActivityPub::Activity::Create (#8820 )	2018-09-28 17:02:53 +02:00
Eugen Rochko	f0fff3eb10	Support min_id-based pagination in REST API (#8736 ) * Allow min_id pagination in Feed#get * Add min_id pagination to home and list timeline APIs * Add min_id pagination to account statuses, public and tag APIs * Remove unused stub in reports API * Use min_id pagination in notifications, favourites, and fix order * Fix HomeFeed#from_database not using paginate_by_id	2018-09-28 02:23:45 +02:00

... 2 3 4 5 6 ...

5713 commits