glitchier-soc

Commit Graph

Author	SHA1	Message	Date
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
ThibG	d6df42df16	Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893 ) * Add a confirmation dialog when hitting reply and the compose box isn't empty Fixes #878 * Performance improvement	6 years ago
Thibaut Girka	1476e653ec	Make hidden media clickable in account media gallery	6 years ago
Thibaut Girka	c2f963256c	Add media description (or status spoiler) in account media gallery	6 years ago
Thibaut Girka	a62e47672e	Fix account gallery hidden media background color in mastodon-light	6 years ago
Thibaut Girka	e9f2659066	[Glitch] Honour displayMedia setting in accountMedia gallery Inspired by `aeca336e22`	6 years ago
Thibaut Girka	536d95ae7c	[Glitch] Add support for new display_media setting Port `bb8afc4608` to glitch-soc [API] [vanilla required] [glitch-soc optional] initial_state show_sensitive_media boolean changed to show_media string with options "default", "hide_all", "show_all"	6 years ago
Thibaut Girka	56714ef14c	[Glitch] RTL: fix margins: public-layout.header.nav-button Port `bf20094a3f` to glitch-soc	6 years ago
Thibaut Girka	9bec970736	[Glitch] RTL: fix statubar action buttons/counter margins Port `b837c636ac` to glitch-soc	6 years ago
Thibaut Girka	9617c07724	[Glitch] Separate font-family into variable Port `8913189055` to glitch-soc	6 years ago

1 2 3 4 5 ...

2627 Commits (d2e5b51060adce969e013fdc2c6af2dc8a10c1db)