glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Jenkins	6e961f0731	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	1ffb500242	Hide status content when spoiler text is not empty (#7797 )	7 years ago
Yamagishi Kazutoshi	70b5274caa	Fix "Invalid DOM property `class`" (#7798 )	7 years ago
David Yip	206fcde962	Merge pull request #540 from lanodan/glitch-soc-pr/charLimit Put maxChars back in compose.js	7 years ago
Shuhei Kitagawa	223b854b3b	Add tests for following accounts controller (#7800 )	7 years ago
Lain Iwakura	8a66ab68e8	Handle character limit in initial state in frontend.	7 years ago
chr v1.x	bc9d1ea0e3	Add profile options on compose form (#7789 ) * Add profile options on compose form * Remove unused imports to appease codeclimate * Play nicely with cancel button and use ellipsis-v instead of hamburger * Fix whitespace and quotes to appease codeclimate	7 years ago
Shuhei Kitagawa	31cf3094fd	Add tests for followers_accounts_controller (#7794 )	7 years ago
David Yip	76f9fc26a8	Merge pull request #531 from glitch-soc/454-allow-keyword-mutes-to-skip-mentions Allow keyword mutes to skip mentions (#454)	7 years ago
David Yip	4692eed7bd	Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions	7 years ago
David Yip	8d90aaa1e3	Merge pull request #539 from glitch-soc/merge-upstream Merge upstream	7 years ago
David Yip	a130fcf7a9	keyword mute: Add missing scope for regex escape test	7 years ago
David Yip	4cc75efb7b	Port emojimart 2.6.1 changes to glitch flavour See also the following commits: - `ae0b751a30` - `2e4a1d3109`	7 years ago
David Yip	b8205550dd	keyword mute: use mentions scope in home feed filtering (#454 ) If a status shows up in mentions because all keyword mutes that might apply to it are marked as "don't apply to mentions", then it ought to show up in the home feed also.	7 years ago
David Yip	f9c8642a11	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions Conflicts: app/models/glitch/keyword_mute.rb	7 years ago
Jenkins	695674b2fa	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Shuhei Kitagawa	42ef87518d	Add missing tests for admin/accounts_controller (#7791 )	7 years ago
Eugen Rochko	daf9bf9f12	Bump version to 2.4.1	7 years ago
Lynx Kotoura	cd1d25b9d0	Uniform media and video spoiler settings and fix them of the light theme (#7778 )	7 years ago
Yamagishi Kazutoshi	51c639980c	Weblate translations (2018-06-10) (#7779 ) * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.4% (593 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Persian) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 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% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 66.3% (412 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Korean) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.9% (596 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	7 years ago
kedama	101f5544e1	Control the focus when clicking the "CW" button. (#7776 ) * Focus to the spoiler text when CW turns on. * Focus back to the textarea when CW turns off.	7 years ago
Renato "Lond" Cerqueira	2e4a1d3109	Rename emoji sheet to avoid caching issue (#7777 )	7 years ago
Eugen Rochko	e23ccfa059	Bump version to 2.4.1rc4	7 years ago
nightpool	896589e034	Migration to cleanup blocked users that are still following (#7773 ) * Migration to cleanup blocked users that are still following * use follow directly, commit schema	7 years ago
Shuhei Kitagawa	d230066746	Add tests for intents_controller (#7763 )	7 years ago
Eugen Rochko	b051d74029	Fix domain hiding logic (#7765 ) * Send rejections to followers when user hides domain they're on * Use account domain blocks for "authorized followers" action Replace soft-blocking (block & unblock) behaviour with follow rejection * Split sync and async work of account domain blocking Do not create domain block when removing followers by domain, that is probably unexpected from the user's perspective. * Adjust confirmation message for domain block * yarn manage:translations	7 years ago
Lynx Kotoura	d997fb520a	Fix background color of emoji-mart-bar in light theme (#7768 ) * Fix background color of emoji-mart-bar * Uniform emoji-mart-search background color in light theme as default	7 years ago
Lynx Kotoura	2d2002436c	Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772 )	7 years ago
Eugen Rochko	39930a8432	Fix has_one association on Web::PushSubscription (#7767 ) * Fix has_one association on Web::PushSubscription * Fix code style issues	7 years ago
Eugen Rochko	a26c884f25	Ensure emoji-mart dependency is updated (#7771 ) Regression from `bf508b9` since version string was not updated	7 years ago
David Yip	bcc27d9234	Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants Delete references to removed constants (fixes #537)	7 years ago
Thibaut Girka	5af047df32	Delete references to removed constants (fixes #537 )	7 years ago
David Yip	34ac79cb68	Merge pull request #506 from ThibG/glitch-soc/fixes/static-500 Hardcode default skin/theme in error layout (fixes #373)	7 years ago
SerCom_KC	77c94ffe82	Update Chinese (Simplified) translations (#7769 ) * i18n: (zh-CN) #7718 * i18n: (zh-CN) #7735 * i18n: (zh-CN) #7676	7 years ago
Eugen Rochko	cbec0de81e	Migrate old web push subscriptions to ensure deliveries (#7764 )	7 years ago
Renato "Lond" Cerqueira	bf508b9f74	Fix issues with updated emoji mart (#7761 ) * Changes behavior from search light to keep custom search The new version of emoji-mart needs the search function to constantly receive the custom emoji array. This changes the behavior back to the previous one in the search light method to keep the emoji autocomplete as before * Change test order The order was breaking the tests * Fix codeclimate issues * Update to emoji mart to version without issue in picker Fixes #7760	7 years ago
David Yip	c114937660	Merge pull request #535 from glitch-soc/merge-upstream Merge upstream	7 years ago
Yamagishi Kazutoshi	3e2eddaba7	Weblate translations (2018-06-08) (#7759 ) * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.4% (593 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Persian) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 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% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 66.3% (412 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	7 years ago
Eugen Rochko	5aa5b86bf1	Do not accept ActivityPub follow requests from blocked user (#7756 ) * Do not accept ActivityPub follow requests from blocked user Fix #7745 * Deliver auto-rejection immediately when follow-requested by blocked account * Fix trailing whitespace	7 years ago
Eugen Rochko	e1054a747e	Add "Edit profile" link to public profile page, increase bottom padding (#7754 )	7 years ago
Renato "Lond" Cerqueira	ae0b751a30	Update to emojimart 2.6.1 (#7746 ) * Update to emojimart 2.6.1 WIP using local updated version. Sheet comes from emoji-data@4.0.4, file sheet_twitter_32_indexed_256.png. * Update to 2.6.1 and uncompress data if needed * Remove changes that were not needed * Fix yarn lock file * Match emojiToShowFilter behavior to new version of emoji-mart * Fix codeclimate issue * Match custom emoji behavior to new version of emoji-mart * Replace emoji without shortcode in tests * Fix code climate issues	7 years ago
David Yip	c2f7676dfc	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/models/status.rb The conflict in the Status model was due to `3114ac9655`. It was resolved by accepting tootsuite's changes.	7 years ago
David Yip	4b7ceed3f0	Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation Use history.state to decide whether we should goBack() or go to / (fixes #247)	7 years ago
Marcin Mikołajczak	a5e289e273	🌍🇵🇱 (#7753 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Eugen Rochko	e28866b313	Bump version to 2.4.1rc3	7 years ago
Eugen Rochko	ecec45ff9b	Filter out blocked/muted people from profile timelines (#7747 ) Fix #7741	7 years ago
Yamagishi Kazutoshi	29f4196d87	Fix fetch of remote image with multiple Content-Type headers (#7749 )	7 years ago
Eugen Rochko	5d419119de	Preserve newlines in delete & redraft and desktop notifications (#7750 ) Fix #7748	7 years ago
Yamagishi Kazutoshi	7ed181c41c	Add missing dot for remote image (#7751 )	7 years ago
David Yip	63a5f8a4e4	Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists Escape metacharacters in non-whole-word keyword mutes (#463, #533)	7 years ago

... 5 6 7 8 9 ...

7150 Commits (45ee8e304e335db821d2939c8fbc0a8a777c44b7) All Branches Search

7150 Commits (45ee8e304e335db821d2939c8fbc0a8a777c44b7)

All Branches