2736 Commits (ae7d5ee7683c2058be40e7dc753a72a0a6d6561c)

Author	SHA1	Message	Date
Thibaut Girka	b3553f992d	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	b22501154e	[Glitch] Prepend account header even when status list is empty ... Partially port bc464619f3	6 years ago
Thibaut Girka	07e0f1023d	[Glitch] Fix loading indicator inconsistency ... Port 0562e258b3 to glitch-soc	6 years ago
Thibaut Girka	f40a7b2616	[Glitch] Use local instead of global loading indicator for timelines, account timelines ... Port 9a32abcbac to glitch-soc	6 years ago
ThibG	7083838a54	Fix race condition causing shallow status with only a "favourited" attribute (#9272) ... Fixes #9231	6 years ago
Eugen Rochko	c735638483	Fix null error introduced in #9270 (#9275)	6 years ago
ThibG	df154d2ffa	Perform deep comparison for card data when receiving new props (#9270) ... Fixes #9226	6 years ago
Les Orchard	4e067b1bd0	Only consider mouse move in scrolling on item insertion (#9262) ... Fixes #9259	6 years ago
mayaeh	04f0b63c59	i18n: Add ja translations (#9261) ... * Run yarn manage:translations * Add Japanese translations.	6 years ago
Thibaut Girka	e5fd4939ff	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	0562e258b3	Fix loading indicator inconsistency (#9252) ... * Use global loading indicator when loading more items * Use local loading indicator for notifications And remove global loading indicator for initial custom emojis load	6 years ago
ThibG	c81ac519ef	Merge pull request #806 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Thibaut Girka	de57627588	[Glitch] Remove unused computation of reblog references from updateTimeline	6 years ago
Thibaut Girka	d457964527	[Glitch] Don't remove originals of boosted toots from timeline ... Port 019c39bf1d to glitch-soc	6 years ago
Les Orchard	59ecfbd28c	Identify manual scrolling to cancel scroll to top reset on mouse idle (#9245)	6 years ago
Thibaut Girka	1dc409ffa6	Fix drawer waves being displayed in the list editor	6 years ago
ThibG	3472950cea	Remove unused computation of reblog references from updateTimeline (#9244)	6 years ago
Thibaut Girka	759005e4d0	[Glitch] Fix form validation flash message color and input borders ... Port 718e4752a9 to glitch-soc	6 years ago
Thibaut Girka	bf26c23205	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	e48b428ef3	[Glitch] Implement adding a user to a list from their profile ... Port bb5558de62 to glitch-soc	6 years ago
Eugen Rochko	9a32abcbac	Use local instead of global loading indicator for timelines, account timelines (#9224) ... So that opening a profile feels faster. Also, pinned toots are not shown before other toots have loaded. Also, if no toots are loaded, added empty message	6 years ago
Eugen Rochko	142940f4c6	Add "Show thread" link to self-replies (#9228) ... Fix #4716	6 years ago
Eugen Rochko	718e4752a9	Fix form validation flash message color and input borders (#9235) ... * Fix form validation flash message color and input borders * Fix typo	6 years ago
Eugen Rochko	5f613d55e6	Optimize the process of following someone (#9220) ... * Eliminate extra accounts select query from FollowService * Optimistically update follow state in web UI and hide loading bar Fix #6205 * Asynchronize NotifyService in FollowService And fix failing test * Skip Webfinger resolve routine when called from FollowService if possible If an account is ActivityPub, then webfinger re-resolving is not necessary when called from FollowService. Improve options of ResolveAccountService	6 years ago
Les Orchard	54bc905a57	Cancel list scroll reset after mouse move on wheel scroll (#9233) ... - Use object properties rather than component state for mouseMovedRecently and scrollToTopOnMouseIdle flags - Remove redundant scrollToTop prop call, also fixing an attempt to call an undefined prop. Fixes #9217	6 years ago
Eugen Rochko	3e6a35d3ee	Increase default column width from 330px to 350px (#9227)	6 years ago
Thibaut Girka	c29da32add	[Glitch] Update reset.scss from upstream	6 years ago
Thibaut Girka	e18018e930	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Les Orchard	6e72dda7ef	Temporarily hold timeline if mouse moved recently (fixes #8630) (#9200) ... - On recent mouse movement, hold timeline position so statuses remain in place for interactions in progress. - If the timeline had been scrolled to the top before mouse movement, restore scroll on mouse idle.	6 years ago
James Kiesel	d2a9ea58da	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	6 years ago
namelessGonbai	43bfd0a7d0	Implement adding a user to a list from their profile (#9062) ... * Add add user to list from thier profile * Fix listAdderCss	6 years ago
Steven Tappert	6cd08a266a	Check for empty "last_status" before sorting DM column (#9207) ... * Check for empty "last_status" before sorting * Small touchups for codeclimate	6 years ago
Sorin Davidoi	bd31e76dcf	fix(reset): Property name for styled scrollbars (#9210) ... https://webplatform.news/issues/2018-10-26	6 years ago
Thibaut Girka	235e9b13ff	Fix timestamp position in public pages with RTL languages	6 years ago
Thibaut Girka	080a6cb6f3	Fix styling of display names in public pages	6 years ago
Thibaut Girka	33ad16faa7	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	13567f13af	[Glitch] Port some of upstream's getting started footer links	6 years ago
Eugen Rochko	083f015f9f	Fix reducer error when conversation has no last status in web UI (#9173) ... Fix #9170	6 years ago
Quentí	407cab9844	[i18n] Update for Occitan (#9169) ... * Update oc.json * Update oc.yml * Update simple_form.oc.yml * Update simple_form.oc.yml * Update oc.json	6 years ago
Thibaut Girka	5ad4bcbece	[Glitch] Fix empty display name precedence over username in web UI ... Port 4084814d8a to glitch-soc	6 years ago
Thibaut Girka	fd18ed4cea	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.	6 years ago
Thibaut Girka	8bef422043	Add a local setting for inline preview cards	6 years ago
Thibaut Girka	4fe81a99c6	Add a “link” status icon for toots with a preview card	6 years ago
Thibaut Girka	7f023b3b98	[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning ... Port 766a808de4 to glitch-soc	6 years ago
Thibaut Girka	18870c45f1	[Glitch] Include preview cards in status entity in REST API ... Port cf2ab9c394 to glitch-soc	6 years ago
Eugen Rochko	4084814d8a	Fix empty display name precedence over username in web UI (#9163) ... Fix #9131	6 years ago
Quentí	a43fdd72ba	[i18n] Update for Occitan (#9157) ... * Update oc.json * Update devise.oc.yml * Update oc.yml * Update oc.json	6 years ago
Masoud Abkenar	bdcdc35df7	[Glitch] RTL: fix toot privacy preferences radio buttonss ... Port 27b5a57f6d to glitch-soc	6 years ago
Masoud Abkenar	cecd8b25c4	[Glitch] RTL: fix preferences page checkbox margins ... Port 4e034437e3 to glitch-soc	6 years ago
Thibaut Girka	7406141a71	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
trwnh	fcd79aba0b	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	6 years ago
Masoud Abkenar	27b5a57f6d	RTL: fix toot privacy preferences radio buttonss (#9146)	6 years ago
Masoud Abkenar	4e034437e3	RTL: fix preferences page checkbox margins (#9145) ... * RTL: fix preferences page checkbox margins * Update rtl.scss	6 years ago
Thibaut Girka	13ea29754d	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.	6 years ago
Renato "Lond" Cerqueira	e362029b5d	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	6 years ago
Eugen Rochko	766a808de4	Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133)	6 years ago
ThibG	f945bbac81	Merge pull request #794 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Thibaut Girka	c954f89bdd	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
kedama	854d492e34	Set z-index of dropdown to 9999. (#9126)	6 years ago
Eugen Rochko	cf2ab9c394	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	6 years ago
Thibaut Girka	2ad5e2c933	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.	6 years ago
ThibG	11fc53d394	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.	6 years ago
Thibaut Girka	d091159140	Do not rely on hover for upload form options if touch is used	6 years ago
Thibaut Girka	f679c8d70d	[Glitch] RTL: fix column-back-button__icon margins/content ... Port 38bd132c46 to glitch-soc	6 years ago
Thibaut Girka	65cc5faf80	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Masoud Abkenar	38bd132c46	RTL: fix column-back-button__icon margins/content (#9112) ... * RTL: fix column-back-button__icon margins/content * Update rtl.scss * Update rtl.scss	6 years ago
Thibaut Girka	c32a5f86b6	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.	6 years ago
Eugen Rochko	3a115d3f49	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	6 years ago
Eugen Rochko	f8596e3b5a	Fix direct messages column not loading more items on scroll (#9102) ... Fix #9097	6 years ago
Eugen Rochko	ebaef6e3df	Fix conversations not being marked read on click (#9103) ... Fix #9096	6 years ago
Eugen Rochko	e29581a150	Fix RTL layout of status display names (#9075) ... Fix #2350	6 years ago
Eugen Rochko	256a10c192	Show upload options on click as well as hover (#9074) ... Fix #8918	6 years ago
Eugen Rochko	27e829b362	Fix JS error when posting from page without router context (#9073) ... Fix #9057	6 years ago
Thibaut Girka	2b7b807df0	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	b49f2eef89	Fix public timelines not instantly updating on compose (#9050) ... Fix #9034	6 years ago
Eugen Rochko	541fda5fc8	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	6 years ago
Eugen Rochko	a984d5a1c4	Revert "RTL: remove blank character inside bdi (#9038)" (#9056) ... This reverts commit 4bfec4b32d.	6 years ago
Thibaut Girka	1a63a8f74e	[Glitch] Surround mid-text display names with bdi tags ... Port 19aaf0e99f to glitch-soc	6 years ago
Thibaut Girka	6651d4fa7c	[Glitch] fix: initial state of PrivacyDropdown is should not be null ... Port 8f0c64baf1 to glitch-soc	6 years ago
Thibaut Girka	2159add1d6	[Glitch] RTL: fix cardbar margins and alignment ... Port eb62f72990 to glitch-soc	6 years ago
Thibaut Girka	f48cff1a95	[Glitch] RTL: fix admin account avatar margin in about page ... Port a105bf8516 to glitch-soc	6 years ago
Thibaut Girka	15e3b0f070	[Glitch] RTL: fix column settings toggle label ... Port 26c662792c to glitch-soc	6 years ago
Thibaut Girka	c47e40cd6e	[Glitch] Fix domain label position and color ... Port 45b8a91983 to glitch-soc	6 years ago
Thibaut Girka	69d348ed98	[Glitch] RTL: fix preferences layout ... Port 6b1f1c32c5 to glitch-soc	6 years ago
Thibaut Girka	7dc82e1eb2	[Glitch] Fix admin account avatar margin ... Port 064b26f03c to glitch-soc	6 years ago
Thibaut Girka	acd870ccba	[Glitch] RTL: fix user stats in about page ... Port 4a95304331 to glitch-soc	6 years ago
Thibaut Girka	81c0cbaa9e	[Glitch] RTL: fix domain append at signup form ... Port ec15808edd to glitch-soc	6 years ago
Thibaut Girka	0631c9ed7c	[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog" ... Port 024326e6e6 to glitch-soc	6 years ago
Thibaut Girka	d779b09ed7	[Glitch] RTL: fix admin account margins in about page ... Port 3d51268c4c to glitch-soc	6 years ago
Thibaut Girka	d804ed1dd4	[Glitch] undo part of PR 8202 to fix RTL ... Port 96696a40ff to glitch-soc	6 years ago
Thibaut Girka	2ecd3d97ba	[Glitch] Improve style of notice/alert messages ... Port ce6772690f to glitch-soc	6 years ago
Thibaut Girka	46259a36d0	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.	6 years ago
Masoud Abkenar	4bfec4b32d	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>	6 years ago
Masoud Abkenar	eb62f72990	RTL: fix cardbar margins and alignment (#9044)	6 years ago
Masoud Abkenar	a105bf8516	RTL: fix admin account avatar margin in about page (#9039) ... * RTL: fix admin account avatar margin in about page * fix code style	6 years ago
Thibaut Girka	3d8c1f6104	Attempt at fixing inline video player	6 years ago
Thibaut Girka	9614abc713	Update mediaGallery component's width when opening CWs	6 years ago
Masoud Abkenar	26c662792c	RTL: fix column settings toggle label (#9037)	6 years ago
kedama	45b8a91983	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	6 years ago
Thibaut Girka	8c2027ebe2	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.	6 years ago
Thibaut Girka	1cb7fe932d	Focus the UI when pressing Escape in the CW field	6 years ago
Eugen Rochko	40d23fc4d1	Add option to block reports from domain (#8830)	6 years ago
Eugen Rochko	9309e5981d	Redesign direct messages column (#9022)	6 years ago
Masoud Abkenar	6b1f1c32c5	RTL: fix preferences layout (#9021)	6 years ago
bsky	064b26f03c	Fix admin account avatar margin (#9020)	6 years ago
Masoud Abkenar	4a95304331	RTL: fix user stats in about page (#9018)	6 years ago
Eugen Rochko	e3b2234382	Add unread indicator to conversations (#9009)	6 years ago
takayamaki	8f0c64baf1	fix: initial state of PrivacyDropdown is should not be null (#9008)	6 years ago
Masoud Abkenar	ec15808edd	RTL: fix domain append at signup form (#9007)	6 years ago
ThibG	b420d15a9b	Fix fav/boosts hotkeys not working on detailed statuses (#9006)	6 years ago
Thibaut Girka	a8e896af12	Fix fav/boosts hotkeys not working on detailed statuses	6 years ago
Masoud Abkenar	3d51268c4c	RTL: fix admin account margins in about page (#9005)	6 years ago
ThibG	6e5f9ee743	Handle global hotkeys even when no element has focus (#8998) ... This fixes hotkeys not working when pressing the column “back” button, for instance.	6 years ago
Masoud Abkenar	024326e6e6	Fixes 8987 broken alignment at "Remote interaction dialog" (#8988)	6 years ago
Masoud Abkenar	96696a40ff	undo part of PR 8202 to fix RTL (#8979)	6 years ago
Thibaut Girka	ccf5ddfd88	Handle alt+enter in the spoiler input as shortcut for secondary post ... Fixes #780	6 years ago
Eugen Rochko	ce6772690f	Improve style of notice/alert messages (#8973)	6 years ago
Eugen Rochko	c04048aae8	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	6 years ago
Thibaut Girka	794b2dad99	Fix auto-unfold CWs when no regexp is set ... Fixes #778	6 years ago
Eugen Rochko	2a36092328	Display customized mascot in web UI and fix admin form for it (#8964) ... Follow-up to #8766	6 years ago
ThibG	10ed0ddd2a	Merge pull request #775 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Eugen Rochko	8efdf1a898	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	6 years ago
Thibaut Girka	bf559a477a	Really fix HotKeys	6 years ago
Thibaut Girka	8cb843039c	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	6 years ago
mayaeh	cf43973ecd	Fix that the copy button of verify link did not work. (#8938)	6 years ago
Thibaut Girka	f9fc7d7660	Fix CW icon color in local-settings modal	6 years ago
Thibaut Girka	d21c9f08e5	Define some local-settings hints	6 years ago
Thibaut Girka	c40ba63f42	Add support for hints (or extended descriptions) in local-settings pages	6 years ago
Thibaut Girka	c598692cdf	When screen width is too narrow, hide local-settings page text, keep only icons	6 years ago
Thibaut Girka	56773bc55c	Change “preferences” icon to match settings page icon	6 years ago
Thibaut Girka	065a19b18b	Add icons for each of the local-setting pages	6 years ago
Thibaut Girka	f09150f2a9	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	d73c1df33b	Merge pull request #770 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Thibaut Girka	e968dcea13	Fix app-wide hotkeys randomly failing to work	6 years ago
mayaeh	bcb43baf50	Add Japanese translations. (#8927)	6 years ago
Thibaut Girka	683608dd60	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mayaeh	96a313d02b	Fixed error occurrence when pinning the DM column. (#8922)	6 years ago
Thibaut Girka	74e411f4e8	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	3f68e9ed11	Move “Show action buttons in collapsed toots” option	6 years ago
Thibaut Girka	caa56b01a9	Switch from selects to radio buttons for local settings, improve styling	6 years ago
Eugen Rochko	c9b5168ebd	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	6 years ago
Thibaut Girka	58cbb9ef8f	[Glitch] Change documentation URL ... Port 7635a136c9 to glitch-soc	6 years ago
Thibaut Girka	52f97080e7	[Glitch] RTL: fix margins of public-account-header__tabs ... Port e2065ceead to glitch-soc	6 years ago
Thibaut Girka	bdbbbb1bdb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	b4bab7eb35	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.	6 years ago
Marcin Mikołajczak	07d123fd3c	i18n: Update Polish translation (#8901) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
Eugen Rochko	7635a136c9	Change documentation URL (#8898) ... * Change documentation URL * Fix hardcoded documentation URL in locales	6 years ago
Masoud Abkenar	e2065ceead	RTL: fix margins of public-account-header__tabs (#8897) ... * RTL: fix margins of public-account-header__tabs * fix style * even more stylish code :)	6 years ago
Thibaut Girka	463f250f26	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	72305816ea	[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty	6 years ago