7057 Commits (6141c2a035fc8fe76b2b460aeeeeed59a1bd29f9)

 

All Branches   

Search

Author	SHA1	Message	Date
Eugen Rochko	09147186b7	Fix regression where CW is focused on reply (#7811)	7 years ago
Eugen Rochko	53f0452b70	Remove rack-timeout (#7809) ... Timeout considered harmful due to leaving the app in a broken state, including unreaped database connections	7 years ago
Eugen Rochko	ca85658975	Add autofollow option to invites (#7805) ... * Add autofollow option to invites * Trigger CodeClimate rebuild	7 years ago
Eugen Rochko	33dd9bf36d	Fix vertical alignment of navigation bar (#7807)	7 years ago
Eugen Rochko	c3b3594305	Remove placeholder text for media-only toots (#7806) ... Ref: cfa9b6e13a This breaks compatibility with pre-2.3.0 Mastodon and older software, but at the time of writing the network is >80% above that version. Compatibility broken only for toots with no text.	7 years ago
Eugen Rochko	1cc775200e	Add "find friends", "invite people", and more to getting started footer (#7803) ... - Find friends from Twitter (bridge) - Invite people (when invites enabled) - Security (change e-mail/password) - Developers (create OAuth apps/tokens)	7 years ago
chr v1.x	4f42238c29	Put "Media Only" option in column settings instead of content area headline (#7801) ... * Action/reducer for changing column settings takes a path and a value instead of a javascript object * Settings menu version and column headline version working simultaneously * remove column headline entirely * remove css for headlines that aren't possible now * Remove commented out code from unfruitful attempt at this feature * Give direct timeline its own column settings bc it doesn't have a media only option * Fix typo in public timeline code that was preventing per-column settings from working properly * Fix codeclimate issues * Missing semicolons * Use redux state to set onlyMedia, let that do the update instead of a callback. Consequently, unpinned setting works without history modification * Unused import	7 years ago
Jenkins	afceef74c2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	f972815f1b	Hide status content when spoiler text is not empty (#7797)	7 years ago
Yamagishi Kazutoshi	79a468016a	Fix "Invalid DOM property `class`" (#7798)	7 years ago
David Yip	9d2b7ef9f8	Merge pull request #540 from lanodan/glitch-soc-pr/charLimit ... Put maxChars back in compose.js	7 years ago
Shuhei Kitagawa	ad8814232f	Add tests for following accounts controller (#7800)	7 years ago
Lain Iwakura	6bae583d2f	Handle character limit in initial state in frontend.	7 years ago
chr v1.x	0338da1699	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	5b47774ab8	Add tests for followers_accounts_controller (#7794)	7 years ago
David Yip	f1bfcb50f0	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	5cff053944	Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions	7 years ago
David Yip	f6bb50b6ec	Merge pull request #539 from glitch-soc/merge-upstream ... Merge upstream	7 years ago
David Yip	99b2bc2668	keyword mute: Add missing scope for regex escape test	7 years ago
David Yip	fac6e392e9	Port emojimart 2.6.1 changes to glitch flavour ... See also the following commits: - 0c3ce41031 - 268d90e810	7 years ago
David Yip	908a770d2b	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	e931cf656d	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	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Shuhei Kitagawa	6151308c47	Add missing tests for admin/accounts_controller (#7791)	7 years ago
Eugen Rochko	0979d4275a	Bump version to 2.4.1	7 years ago
Lynx Kotoura	7e27a3c225	Uniform media and video spoiler settings and fix them of the light theme (#7778)	7 years ago
Yamagishi Kazutoshi	01ee460ceb	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	a99179d31f	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	268d90e810	Rename emoji sheet to avoid caching issue (#7777)	7 years ago
Eugen Rochko	35ae960122	Bump version to 2.4.1rc4	7 years ago
nightpool	6310dd233a	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	7086aa598b	Add tests for intents_controller (#7763)	7 years ago
Eugen Rochko	10f51c9886	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	91e5d9f8af	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	3df8c40508	Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)	7 years ago
Eugen Rochko	17dc07f667	Fix has_one association on Web::PushSubscription (#7767) ... * Fix has_one association on Web::PushSubscription * Fix code style issues	7 years ago
Eugen Rochko	a043f8d277	Ensure emoji-mart dependency is updated (#7771) ... Regression from 85470ec since version string was not updated	7 years ago
David Yip	34f1fd2a62	Merge pull request #538 from ThibG/glitch-soc/fixes/obsolote-constants ... Delete references to removed constants (fixes #537)	7 years ago
Thibaut Girka	7d3c0e4cb4	Delete references to removed constants (fixes #537)	7 years ago
David Yip	f9eb4ea80a	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	fc132915ec	Update Chinese (Simplified) translations (#7769) ... * i18n: (zh-CN) #7718 * i18n: (zh-CN) #7735 * i18n: (zh-CN) #7676	7 years ago
Eugen Rochko	18e1de6a16	Migrate old web push subscriptions to ensure deliveries (#7764)	7 years ago
Renato "Lond" Cerqueira	85470ec872	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	a9515f3186	Merge pull request #535 from glitch-soc/merge-upstream ... Merge upstream	7 years ago
Yamagishi Kazutoshi	6671297e7a	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	6ba7d9d0d9	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	9b9e96eae5	Add "Edit profile" link to public profile page, increase bottom padding (#7754)	7 years ago
Renato "Lond" Cerqueira	0c3ce41031	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	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	7 years ago
David Yip	f8d50a4070	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