glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	3e686beaea	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.	6 years ago
ThibG	e25947db4a	Sanitize and sandbox toot embeds (#9552 )	6 years ago
Eugen Rochko	bb62827c16	Remove links to bridge.joinmastodon.org (non-functional) (#9608 ) Add link to profile directory	6 years ago
Eugen Rochko	3c033c4352	Add moderation warnings (#9519 ) * Add moderation warnings Replace individual routes for disabling, silencing, and suspending a user, as well as the report update route, with a unified account action controller that allows you to select an action (none, disable, silence, suspend) as well as whether it should generate an e-mail notification with optional custom text. That notification, with the optional custom text, is saved as a warning. Additionally, there are warning presets you can configure to save time when performing the above. * Use Account#local_username_and_domain	6 years ago
Quentí	00862dcaff	[i18n] Occitan update (#9607 ) * Update for new On Board messages * Update oc.json	6 years ago
Thibaut Girka	1a3088364f	Fix composer not getting focus after reply confirmation dialog The modal-handling code gives back focus to the element focused when the modal opened. However, in the case of reply confirmation, it would do so after the composer code itself requested focus.	6 years ago
Thibaut Girka	0605c004a5	Fix incorrect and duplicate onConfirm callback	6 years ago
Thibaut Girka	6166751f9e	[Glitch] Fix that translation is not applied to "joining hashtags" Port `bfec030a4e` to glitch-soc	6 years ago
Thibaut Girka	3611ea02e2	[Glitch] Deep compare tags for hashtag column reload Port `4fdefffb99` to glitch-soc	6 years ago
Thibaut Girka	4be7313298	[Glitch] Allow joining several hashtags in a single column Port `4c03e05a4e` to glitch-soc This introduces new requirements in the API: `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none` It now returns status matching tag :tag or any of the :any, provided that they also include all tags in `all` and none of `none`.	6 years ago
Marcin Mikołajczak	aa0e1ff286	i18n: Update Polish translation (#9594 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
ThibG	a6079a42b6	Fix composer not getting focus after reply confirmation dialog (#9602 ) The modal-handling code gives back focus to the element focused when the modal opened. However, in the case of reply confirmation, it would do so after the composer code itself requested focus.	6 years ago
Thibaut Girka	6073195a7d	[Glitch] Display customized mascot in web UI Port relevant parts of `9d4541c612` to glitch-soc	6 years ago
Thibaut Girka	fb63941c47	Make drawer markup and styling closer to upstream WARNING: This may break some custom skins! `.drawer > .contents` has been moved to `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved from `.drawer > .contents` to `.drawer__inner__mastodon`!	6 years ago
Thibaut Girka	5eaf2c9e02	[Glitch] Back to the getting-started when pins the timeline Port `5bf100f87b` to glitch-soc	6 years ago
Thibaut Girka	1b18eb49e3	Hide negative follower counts from glitch flavour	6 years ago
ThibG	8389b496ba	Fix unnecessary loadMore calls when the end of a timeline has been reached (#9581 ) Fixes #9568	6 years ago
Renato "Lond" Cerqueira	af37f4a70f	Weblate translations (2018-12-19) (#9578 ) * Translated using Weblate (Greek) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Japanese) Currently translated at 97.5% (699 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Korean) Currently translated at 100.0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Portuguese (Brazil)) Currently translated at 98.9% (709 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 97.8% (91 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Corsican) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (French) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Arabic) Currently translated at 96.8% (90 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 96.8% (694 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 100,0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Slovak) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Czech) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * 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 (Czech) Currently translated at 99,9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * 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% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Occitan) Currently translated at 100,0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 99,7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * 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 (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Greek) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * 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 (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 (German) Currently translated at 99,9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Japanese) Currently translated at 97,5% (699 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Korean) Currently translated at 100,0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Czech) Currently translated at 100.0% (350 of 350 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Normalize translations * Normalize translations, remove unused, add missing plurals	6 years ago
Thibaut Girka	2228655848	[Glitch] Improved appearance of notification filter on safari Port `2e1b5edfea` to glitch-soc	6 years ago
Thibaut Girka	add74816a5	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mayaeh	ff472d2cfb	Update Japanese translations. (#9574 )	6 years ago
Hinaloe	2e1b5edfea	improved appearance of notification filter on safari (#9564 )	6 years ago
ThibG	e70e496e29	Clean up dead code in public timeline code (#9565 )	6 years ago
Thibaut Girka	655da1be20	Reword confirm_before_clearing_draft description	6 years ago
Thibaut Girka	9a7201f2ee	Allow disabling the reply confirmation dialog	6 years ago
Thibaut Girka	056a8a8ee4	Allow disabling media confirmation from the confirmation dialog itself	6 years ago
Thibaut Girka	490d8fff0b	Remove dead code	6 years ago
Thibaut Girka	82b01a6c9f	[Glitch] Put "Media Only" option in column settings instead of content area headline Port `4f42238c29` to glitch-soc	6 years ago
Thibaut Girka	9fc7ad7b9c	[Glitch] Always display tab navigation on local/federated timeline even when empty Port `90b64c0069` to glitch-soc	6 years ago
Thibaut Girka	c644e6ea89	Do not replace history state This is both for consistency with account timelines and to not mess with the logic used to decide whether going back in the browser's history is going to make us leave the WebUI.	6 years ago
Thibaut Girka	200a8bdd3a	[Glitch] Enable media timeline Port `8182b61518` to glitch-soc	6 years ago
Thibaut Girka	a693d6e2f2	[Glitch] Hide section headline for timelines in production Port `4eeda67727` to glitch-soc	6 years ago
Thibaut Girka	593f88acb1	[Glitch] Change column params on pinned timeline Port `06252ec71e` to glitch-soc	6 years ago
Thibaut Girka	c03cbb9471	[Glitch] Save onlyMedia prop when pinning column Port `5ea643b279` to glitch-soc	6 years ago
Thibaut Girka	1a9e78b9bc	[Glitch] Add exact attribute to WrappedRoute for community timeline Port `46061dc041` to glitch-soc	6 years ago
Thibaut Girka	1fb4bf87f7	[Glitch] Add media timeline Port `7403e5d306` to glitch-soc	6 years ago
Thibaut Girka	0ef2c1415a	[Glitch] Make notifications quick-filter use consistent style with profile tabs Port `12ab15e584` to glitch-soc	6 years ago
Thibaut Girka	06a7c07eda	[Glitch] Add notification quick-filter bar in the frontend app Port `13dce12665` to glitch-soc	6 years ago
Thibaut Girka	a18a46ca6e	[Glitch] Responsive design for profile directory Port SCSS changes from `087e118971` to glitch flavour	6 years ago
Thibaut Girka	034ffc079e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	6 years ago
kedama	5bf100f87b	Back to the getting-started when pins the timeline. (#9561 )	6 years ago
Thibaut Girka	36d27e2891	Sandbox toot embeds in the embed modal It should not be necessary thanks to our Content Security Policy, but best be sure in case a server's CSP is incorrect. Also, avoids a CSP warning about loading remote scripts.	6 years ago
Thibaut Girka	30de4e4dfc	[Glitch] Minor scrollable list fixes * Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator Port `4ede51743e` to glitch-soc	6 years ago
Eugen Rochko	12ab15e584	Make notifications quick-filter use consistent style with profile tabs (#9554 )	6 years ago
ThibG	4ede51743e	Minor scrollable list fixes (#9551 ) * Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator	6 years ago
Thibaut Girka	8266d224ef	Split out is_changing_upload from is_submitting Fixes #855	6 years ago
Eugen Rochko	9cb26bb56b	Add new first-time tutorial (#9531 ) * Prepare to load onboarding as a full page * Update the first-time introduction * Improve responsive design * Replace speech bubble with logo * Increase text size and reword first paragraph	6 years ago
Eugen Rochko	087e118971	Remove "most popular" tab from profile directory, add responsive design (#9539 ) * Remove "most popular" tab from profile directory, add responsive design * Remove unused translations	6 years ago
ThibG	4297de34cf	Split out is_changing_upload from is_submitting (#9536 ) There is no reason to disable the composer textarea when some media metadata is being modified, nor is there any reason to focus the textarea when some media metadata has been modified (prevents clicking one image's description field right after having modified another).	6 years ago
Thibaut Girka	7238e4ea5f	[Glitch] Fix padding on select elements in preferences Port `c58c00651b` to glitch-soc	6 years ago

1 2 3 4 5 ...

2753 Commits (3e686beaea1931c76c778d8ca6b03c41caaf69db)