3419 Commits (c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f)

Author	SHA1	Message	Date
Thibaut Girka	cd534830ad	Fix text color of some formatted elements in notifications	6 years ago
nzws	3e15a845c1	Fix some colors in light theme (#10754) ... * Fix typo in light theme * Fix background color of empty column	6 years ago
ThibG	dd118449c2	Fix incorrect reference to raw_content (it is raw_text instead) (#10753)	6 years ago
ThibG	93085c273c	[Glitch] Use raw content if available on Delete & Redraft ... Port front-end changes from 6d44f2441b to glitch-soc	6 years ago
Thibaut Girka	2b97d9d780	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	3ea5c045d7	Use a checkbox for the “Mark media as sensitive” composer button ... Fixes #1039	6 years ago
ThibG	fe00f7a7e4	Merge pull request #1043 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
ThibG	6d44f2441b	Add toot source to delete result to ease Delete & Redraft (#10669) ... * Return Status with raw text in raw_content when deleting a status * Use raw content if available on delete & redraft * Rename raw_content to text; do not serialize formatted content when source is requested	6 years ago
Maciek Baron	14d855c429	[Glitch] Improve poll link accessibility ... Port 0402c52f28 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
nzws	78ff7e3821	[Glitch] Fix some colors of high contrast theme ... Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Aurélien Reeves	96f0747afe	[Glitch] Add confirm modal for unboosting toots ... Port fe8a8f779e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Alix Rossi	775ee63b71	i18n: Update French translations (#10747) ... * Update French JSON * i18n: Update fr.yml * i18n: Update simple_form.fr.yml * Update simple_form.fr.yml * Update fr.yml	6 years ago
Alix Rossi	d25e358f9f	i18n: Update Corsican translations (#10746) ... * i18n: Update Corsican translations * Update co.yml * Fix a translation in co.yml	6 years ago
ThibG	6dc9baad2a	Change icon and label depending on whether media is marked as sensitive (#10748) ... * Change icon and label depending on whether media is marked as sensitive * WiP use a checkbox	6 years ago
Thibaut Girka	68629f2773	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	6 years ago
Thibaut Girka	d4d4e84324	Fix media description confirmation modal ... Fixes #1040	6 years ago
Aurélien Reeves	fe8a8f779e	Add confirm modal for unboosting toots (#10287) ... [#3815] Display the boost modal also when unboosting toots.	6 years ago
ThibG	f2be71c293	Add emoji suggestions to CW and poll option fields (#10555) ... * Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focus	6 years ago
Maciek Baron	0402c52f28	Improve poll link accessibility (#10720) ... * Add distinction between hover and active/focus states * Resolves #10198	6 years ago
Jeong Arm	09eea46631	Bring back crossed eye icon on gallery (#10715)	6 years ago
Thibaut Girka	3191c3b349	Fix tabs bar on mobile ... Fixes #1037	6 years ago
nzws	5c82d660d1	Fix some colors of high contrast theme (#10711) ... * Fix "nothing here" text color of high contrast * Fix counter border color of high contrast	6 years ago
Thibaut Girka	2c767f44bf	Fix front-end crash when a video has a blurhash and is hidden behind a CW	6 years ago
spla	7562602df8	i18n Update Catalan translation (#10719) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translation * i18n Update Catalan translation	6 years ago
ThibG	b2f5b1045f	Add description on hover in media gallery (#10713)	6 years ago
Thibaut Girka	89d2859296	Fix content warning button displaying a link icon when no status card is set	6 years ago
mayaeh	1eb14ef774	i18n: Update Japanese translations (#10706) ... * Update Japanese translations. run yarn manage:translations This commit includes translations by some users that were done at the transifex. * Reduce translation text because it becomes two lines.	6 years ago
jeroenpraat	e742bff19b	1 NL string update (#10709) ... * 1 NL string update No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language * Update nl.json	6 years ago
Kirishima21	8383222026	fix pinned columns ’s Media-only button ... Media-only toggles could not be used on pinned columns. The commit fixes this problem.	6 years ago
Baptiste Gelez	eef8802325	[Glitch] Make sure the instance banner is never cropped ... Port 21209c2b52 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Thibaut Girka	832cf92c74	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Aditoo17	b7741ed732	I18n: Update Czech translation 🇨🇿 (#10704) ... * I18n: Update Czech translation * Tiny fix	6 years ago
Baptiste Gelez	21209c2b52	Make sure the instance banner is never cropped (#10702)	6 years ago
Thibaut Girka	f2cf8144b4	Minor style fixes	6 years ago
Eugen Rochko	9b1ef58c95	[Glitch] Change font weight of sensitive button to 500 ... Port 63b1388fef to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Eugen Rochko	f59973cc85	[Glitch] Make the "mark media as sensitive" button more obvious in web UI ... Port 05ef3462ba to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Thibaut Girka	b1ab4d5ebe	Add visibility icon back in media gallery	6 years ago
Thibaut Girka	cbda1b8b66	Add back description on hover	6 years ago
ThibG	8e221cd22b	[Glitch] Fix transition: all ... Port 7aa749ab46 to glitch-soc	6 years ago
ThibG	b7f69beebe	[Glitch] Make the cursor icon consistant across media types in account media gallery	6 years ago
Thibaut Girka	52a4284fe5	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	bc97fd641f	[Glitch] Add button to view context to media modal ... Port eb63217210 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Eugen Rochko	209c080280	[Glitch] Fix alignment of items in the account gallery in web UI and load more per page ... Port 967e419f8f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Eugen Rochko	a5da59f140	[Glitch] Change account gallery in web UI ... Port 3f143606fa to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
Thibaut Girka	373dd1fdf1	Minor CSS fixes	6 years ago
Eugen Rochko	ccf4f3240a	[Glitch] Add blurhash ... Port front-end changes from fba96c808d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	6 years ago
ThibG	7aa749ab46	Fix transition: all (#10699)	6 years ago
ThibG	4f73cde4e1	Minor account media gallery fixes (#10695) ... * Make the cursor icon consistant across media types in account media gallery * Fix the video player modal causing scroll position to reset	6 years ago
ThibG	1149ddd3da	Fix glitch SCSS for links in error messages in admin interface ... Port SCSS changes from 011b032300	6 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
Thibaut Girka	9f25ab9792	Fix polls icon not showing in CW button in detailed statuses	6 years ago
Eugen Rochko	63b1388fef	Change font weight of sensitive button to 500 (#10682)	6 years ago
ThibG	011b032300	Provide a link to existing domain block when trying to block an already-blocked domain (#10663) ... * When trying to block an already-blocked domain, provide a link to the block * Fix styling for links in flash messages * Allow blocks to be upgraded but not downgraded	6 years ago
Thibaut Girka	7617f78359	Fix crash in onboarding modal ... Fixes #1027	6 years ago
Eugen Rochko	eb63217210	Add button to view context to media modal (#10676) ... * Add "view context" button to media modal when opened from gallery * Add "view context" button to video modal Allow closing the video modal by navigating back in the browser, just like the media modal	6 years ago
ThibG	5121d9c12f	When selecting a toot via keyboard, ensure it is scrolled into view (#10593)	6 years ago
Eugen Rochko	05ef3462ba	Make the "mark media as sensitive" button more obvious in web UI (#10673) ... * Make the "mark media as sensitive" button more obvious in web UI * Use eye-slash icon instead of eye icon to mean "hide"	6 years ago
Eugen Rochko	967e419f8f	Fix alignment of items in the account gallery in web UI and load more per page (#10674)	6 years ago
Eugen Rochko	3f143606fa	Change account gallery in web UI (#10667) ... - 3 items per row instead of 2 - Use blurhash for previews - Animate/hover-to-play GIFs and videos - Open media modal instead of opening status - Allow opening status instead with ctrl+click and open in new tab	6 years ago
Thibaut Girka	cc5a81b7d8	Make hi-color privacy icons opt-in instead of opt-out	6 years ago
Thibaut Girka	ac54292d69	Add high color privacy icons ... Fixes #1015	6 years ago
Thibaut Girka	d4c95e6a8a	When selecting a toot via keyboard, ensure it is scrolled into view ... Fixes detailed status column	6 years ago
Thibaut Girka	3e095cab83	Add support for missing formatting tags	6 years ago
Thibaut Girka	67fb9a8679	Add keyboard shortcut to collapse/uncollapse toots	6 years ago
Thibaut Girka	f3acf8f414	Add hotkey for bookmarking a toot	6 years ago
partev	5e79dd3f17	Update hy.json (#10644)	6 years ago
Thibaut Girka	cd9a284702	Fix regression with textarea's caret position when selecting a suggestion	6 years ago
Eugen Rochko	fba96c808d	Add blurhash (#10630) ... * Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues	6 years ago
Thibaut Girka	aa1832ac4d	Hide suggestions by default ... They will be enabled if the input has focus	6 years ago
Thibaut Girka	fddd8251dd	Attempt to fix CSS	6 years ago
Thibaut Girka	d7e4be285a	Add emoji suggestion to poll options	6 years ago
Thibaut Girka	df52004fe6	Add suggestions in CW field	6 years ago
Thibaut Girka	3a671470ec	Refactor selectComposeSuggestion so that different paths can be updated	6 years ago
ThibG	852ccea676	Fix upload progressbar when image resizing is involved (#10632)	6 years ago
Thibaut Girka	1c0402c103	Do not ask to register web intent handler	6 years ago
Thibaut Girka	b13c90f3e3	Fix color of muted statuses content not wrapped in a p tag	6 years ago
Thibaut Girka	e4b65e6349	Redesign blockquote styling	6 years ago
Thibaut Girka	8753e5317f	Better distinguish titles from text	6 years ago
Thibaut Girka	3631c3314a	Remove extra margin in paragraphs inside blockquotes	6 years ago
Thibaut Girka	9b86707b1e	Make bold text bolder	6 years ago
Thibaut Girka	5a8495dabe	Remove margins around `p` tags in lists	6 years ago
Thibaut Girka	ef249a2718	Rename status__text to status__content__text for consistency with upstream	6 years ago
Thibaut Girka	adbb174c9c	Fix status header display in toot mobile menu	6 years ago
Thibaut Girka	ef1504d625	Fix upload progressbar when image resizing is involved	6 years ago
Thibaut Girka	ffab9d626a	Hide media upload form if no media are attached	6 years ago
Thibaut Girka	416aa832e5	Fix file upload	6 years ago
Thibaut Girka	3d722b0c4e	Fix settings modal	6 years ago
Thibaut Girka	27e8354914	Add support for lists in statuses	6 years ago
Thibaut Girka	659f972bed	Do not switch to italic for status media buttons	6 years ago
Thibaut Girka	2e3640ecbb	Accept richer text from remote statuses ... Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5 HTML elements in remote statuses, add corresponding CSS.	6 years ago
kedama	039e35560c	[Glitch] Fix modal items cannot scroll on touch devices ... Port d763d39d26 to glitch-soc	6 years ago
Thibaut Girka	a9eaa780f5	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc	6 years ago
Thibaut Girka	c3fa4e8e07	Fix ReferenceError in dropdown	6 years ago
Thibaut Girka	d779ec1f0e	Fix broken reference to handleSubmit	6 years ago
Thibaut Girka	e949861176	Cleanup	6 years ago
Thibaut Girka	faff152ae5	Move ComposerPublisher to Compose	6 years ago
Thibaut Girka	df951c319c	Add OptionsContainer	6 years ago
Thibaut Girka	14028655df	Move composer Dropdown from features/composer to features/compose	6 years ago
Thibaut Girka	4c6221929f	Move ComposerTextareaIcons to TextareaIcons	6 years ago
Thibaut Girka	47faf47ed5	ComposerTextarea → AutosuggestTextarea	6 years ago
Thibaut Girka	a243567a3e	ComposerUploadForm → UploadForm + UploadFormContainer	6 years ago
Thibaut Girka	c5f49a92dc	Move PollForm from features/composer to features/compose	6 years ago
Thibaut Girka	f1a22e33e2	Inline spoiler input	6 years ago
Thibaut Girka	8fd599fb40	ComposerReply → ReplyIndicator	6 years ago
Thibaut Girka	f72af5794d	Refactor Compose*Warning → ContainerWarning ... Regression: only one warning at a time	6 years ago
Thibaut Girka	1bc4b8a0a5	features/composer/index.js → ComposeForm	6 years ago
Thibaut Girka	281a82d878	DrawerHeader → Header + HeaderContainer	6 years ago
Thibaut Girka	9a2f10fe8b	DrawerAccount → NavigationBar + NavigationContainer	6 years ago
Eugen Rochko	9b9816aba6	[Glitch] Show suggested follows on search screen in mobile layout ... Port ad510db3a1 to glitch-soc	6 years ago
Thibaut Girka	149aa07409	DrawerResults → SearchResults + SearchResultsContainer	6 years ago
Thibaut Girka	67771e6d65	Rework DrawerResults to make them closer to upstream	6 years ago
Thibaut Girka	ab3e8fc542	Move DrawerSearch to Search + SearchContainer	6 years ago
Thibaut Girka	c92ab35b19	Inline DrawerSearchPopout in DrawerSearch	6 years ago
Thibaut Girka	c19b983986	Refactor a bit DrawerSearch to make it closer to upstream	6 years ago
Thibaut Girka	eed2c9dd44	Rename flavours/glitch/features/drawer to flavours/glitch/features/compose	6 years ago
ThibG	0e78862b61	Allow switching between singe-option and multiple-option polls (#10603)	6 years ago
kedama	d763d39d26	Fix modal items cannot scroll on touch devices (#10605)	6 years ago
ThibG	bdec58b514	Minor code cleanup (#10613)	6 years ago
Yamagishi Kazutoshi	80c9cb0eb3	Add hi.json (#10573)	6 years ago
partev	d210d0a655	Update hy.json (#10591)	6 years ago
Jessica	01b1c377b1	Animate avatar GIFs on-hover on public profiles (#10549) ... * Third time is the charm? * Use full asset URL for data-static and data-original ̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host	6 years ago
jeroenpraat	951f8d5b44	Update NL (Dutch) translation (#10601) ... * Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml	6 years ago
ThibG	6e620dcab1	Use correct local names for fonts (#10594)	6 years ago
Sho Kusano	3e6c7f3617	Configrationable repository url (#10600) ... * config: Add GITHUB_REPOSITORY for repository name * config: Add SOURCE_BASE_URL for repository url * Show source_url and repository name on getting started	6 years ago
Thibaut Girka	8b7b65e995	[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals ... Port 7f75792bf3 to glitch-soc	6 years ago
Thibaut Girka	268417daf3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	e3c1472040	Shift+click on column Back button to return to last pinable column	6 years ago
Thibaut Girka	8d57c0e70e	When selecting a toot via keyboard, ensure it is scrolled into view	6 years ago
Thibaut Girka	fbec0edf08	Fix opening/closing gifv sometimes making the timeline scroll	6 years ago
ThibG	7f75792bf3	Allow modal secondary button to shrink and allow wider confirmation modals (#10586) ... Fixes #10531	6 years ago
Renato "Lond" Cerqueira	d305d8747d	Add new pt-br translations (#10564)	6 years ago
Thibaut Girka	2f422b708f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Evgeny Petrov	5dd14dfded	i18n: Russian localization update (#10515) ... * i18n: Updated ru.json for Russian language * i18n: Updated ru.yml * Normalize ru.yml * i18n: Updated simple_form.ru.yml * i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings * Added new strings to ru.json * Deleted unused (?) string * i18n: Added recent strings (Settings refactor)	6 years ago
Eugen Rochko	793b0513eb	Weblate translations (2019-04-10) (#10545) ... * Translated using Weblate (Occitan) Currently translated at 95.7% (780 of 815 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Greek) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/ * Translated using Weblate (French) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 97.4% (372 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Thai) Currently translated at 75.4% (288 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ * Translated using Weblate (Slovak) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (German) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Slovak) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (Kazakh) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/ * Translated using Weblate (Persian) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Kazakh) Currently translated at 99.0% (378 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/ * i18n-tasks normalize * yarn manage:translations * Fix empty string in Occitan	6 years ago
Aditoo17	4e59f709aa	I18n: Final Czech translation 🇨🇿 (#10542) ... * I18n: Update Czech translation * I18n: Why do you want to join translation * I18n: Translating a bunch of more stuff	6 years ago
Marek Ľach	3dea62bfa2	Updates the grammar of the SK translation (#10541)	6 years ago
Eugen Rochko	92e1950194	[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI ... Port 56f29c38b6 to glitch-soc	6 years ago
Eugen Rochko	fa4b51a110	[Glitch] Add "why do you want to join" field to invite requests ... Port SCSS changes from 8b69a66380 to glitch-soc	6 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Yağızhan	2cb16c20a6	Fixed terrible grammar and translated the most (#10527) ... The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon. I'll come back and finish the translation.	6 years ago
Eugen Rochko	8b69a66380	Add "why do you want to join" field to invite requests (#10524) ... * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted	6 years ago
Eugen Rochko	56f29c38b6	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
Quentí	ba1a78d168	[i18n] Update and correction (#10511) ... * [i18n] Update and correction * Update oc.json * Update oc.json	6 years ago
Thibaut Girka	cb410f80a4	Add column title to “Favourited by” and “Boosted by” columns	6 years ago
ashleyhull-versent	ac071d65de	[Glitch] Duplicate values ... Port bd365cc38b to glitch-soc	6 years ago
Eugen Rochko	df42de68e5	[Glitch] Port SCSS changes from "Improve blocked view of profiles" ... Port public pages SCSS changes from 67b3b62b98	6 years ago
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	6 years ago
koyu	3f036ac6b8	Updated German locales (#10505) ... * Updated German locales * Added account approval locales (German) * Updated JSON locales (German)	6 years ago
Alix Rossi	6e111152e0	i18n: Update Corsican translations (#10504)	6 years ago
Aditoo17	ae58bbd705	i18n: Update Czech translation (#10506)	6 years ago
Jeong Arm	619bbc23ef	Translate Korean (#10499)	6 years ago
mayaeh	a265696991	i18n: Update Japanese translations (#10494) ... * Update Japanese translations * Update Japanese translations.	6 years ago
Eugen Rochko	67b3b62b98	Improve blocked view of profiles (#10491) ... * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a1. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well	6 years ago
Marek Ľach	78a8a99b0b	Improve sk translation further (#10484) ... * Further improving Slovak translation * Update sk.json	6 years ago
ashleyhull-versent	2b68fe5442	tinyfix 2: unrequired arguments (#10471) ... * unrequired argument * unrequired argument	6 years ago
marcin mikołajczak	4be7952892	i18n: Update Polish translation (#10479) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>	6 years ago
Marek Ľach	e0137c5884	Updates the Slovak translation (#10477) ... * Update sk.json * Update sk.json * Update sk.json	6 years ago
jeroenpraat	48a52c9372	Dutch (nl) translation (#10474) ... * Translation Dutch * Update activerecord.nl.yml * Update devise.nl.yml * Update nl.yml * Update nl.yml * Update devise.nl.yml * Update nl.yml	6 years ago
ashleyhull-versent	bd365cc38b	Duplicate values (#10470)	6 years ago
ThibG	30500dff7c	Merge pull request #981 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
ThibG	be6885eb93	[Glitch] Update poll remaining time just like with status timestamps ... Port daab45d4ae to glitch-soc	6 years ago
Thibaut Girka	1682ac5717	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.	6 years ago
spla	26bd9fa508	i18n: update Catalan translation (#10458) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations	6 years ago
Thibaut Girka	14bad3f472	Do not handle clicks in detailed status content	6 years ago
ThibG	daab45d4ae	Update poll remaining time just like with status timestamps (#10466)	6 years ago
ThibG	d07b0c038f	Hopefully fix input text selection quirks on iOS (#10463) ... Fix #10448 (hopefully)	6 years ago
Jeong Arm	f984f2ea4e	Esperanto translations (#10461) ... * Esperanto translations * Translate untranslated Esperanto strings * Normalize eo translation	6 years ago
Renato "Lond" Cerqueira	83190fffc7	Re-dd PT-br translations (#10459)	6 years ago
spla	3f75b0929e	i18n: update catalan translations (#10455) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations	6 years ago
Aditoo17	0705e4b177	I18n: Improve Czech translation (#10454)	6 years ago
Thibaut Girka	12dae9d583	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml	6 years ago
ThibG	62bafa20a1	Hide blocking accounts from blocked users (#10442) ... * Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup from bd02ec6daa * Refactor by adding `without_blocking` scope	6 years ago
mayaeh	abdf225353	i18n: Update Japanese translations (#10427) ... * Update Japanese translations. run yarn manage:translations && i18n-tasks add-missing * Update Japanese translations. * Fix mistake * Change to be concise.	6 years ago
Eugen Rochko	b9b472d519	[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile ... Port 79227d153b to glitch-soc	6 years ago
Eugen Rochko	59551ece31	[Glitch] Fix search in web UI not setting a limit, restore limit of 10 ... Port 379c3e237f to glitch-soc, but changing the 5 limit to 10, since that's what we had previously	6 years ago
Thibaut Girka	4444d8f9b3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Jeong Arm	51625d3423	Remove unused code (#10426)	6 years ago
Eugen Rochko	8fb69f1366	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) ... Fix #10315 This reverts commit db06b25376.	6 years ago
Eugen Rochko	79227d153b	Fix transparent avatars showing underlying elements in avatar stack and profile (#10422)	6 years ago
Eugen Rochko	379c3e237f	Fix search in web UI not setting a limit, restore limit of 5 (#10421) ... The search API now supports returning more results and pagination, but until the web UI implements pagination, it makes no sense to dump so many results at once. This fix restores the behaviour before the API change	6 years ago
Eugen Rochko	bd02ec6daa	Add indication that you have been blocked in web UI (#10420)	6 years ago
Aditoo17	1d62b88f8d	I18n: Update Czech translation (#10419)	6 years ago
Jeong Arm	e5d79d1635	Add missing Korean translations (#10416) ... * Fix Korean translation * Add missing translation	6 years ago
Alix Rossi	34090a85e4	Update Corsican translations (#10418) ... * Update Corsican translation * Update Corsican YML * Corsican JSON fix * Update co.yml	6 years ago
Masoud Abkenar	2a326940e8	l10n update: fa (#10417)	6 years ago
Alex Gessner	b6fa500806	[Glitch] squashed identity proof updates ... Port JS from 69141dca26 to glitch-soc	6 years ago
Thibaut Girka	a74d300b68	Fix background color transition in destructive buttons	6 years ago
ThibG	f4b038f779	[Glitch] Fix opacity of relationship tags ... Port 58667072d9 to glitch-soc	6 years ago
Thibaut Girka	0318b23395	Fix left border of profile navigation tab	6 years ago
Thibaut Girka	ab39ffb175	Add fa-info-circle to disclaimer	6 years ago
Thibaut Girka	6c58367f36	Fix double border for account disclaimer	6 years ago
slice	6fdd829d8c	[Glitch] Add rel='noopener' to redesigned profile column header avatar link ... Port 73f5711fb8 to glitch-soc	6 years ago
ThibG	841d2c9f23	[Glitch] Move the account dropdown menubar to the right, make sure it doesn't move ... Port a91acf79b5 to glitch-soc	6 years ago
Aditoo17	37ad0478ef	[Glitch] Make clicking on avatar open public profile in new tab ... Port 6f6abc369f to glitch-soc	6 years ago
mayaeh	cf3f063e10	[Glitch] Fix menu items that don't action ... Port 186f7bcbb6 to glitch-soc	6 years ago
Eugen Rochko	00f251b8fe	[Glitch] Redesign profile column in web UI to match design on public pages ... Port a96181f16f to glitch-soc	6 years ago
Thibaut Girka	abb53fa338	Fix centering on public pages	6 years ago
Thibaut Girka	60fc04756a	Fix padding and centering of display names	6 years ago
Thibaut Girka	58da5e93c0	Port search results styling to glitch-soc	6 years ago
Thibaut Girka	ce7d055d3c	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago