6275 Commits (3e703fe7570622ee9ef94bf33d45e561a1bc73a3)

 

All Branches   

Search

Author	SHA1	Message	Date
Eugen Rochko	ec74c3d7da	Do not default SMTP verify mode to "peer", default to "none" (#6996)	7 years ago
unarist	d88504ec84	Add missing rejection handling for Promises (#7008) ... * Add eslint-plugin-promise to detect uncaught rejections * Move alert generation for errors to actions/alert * Add missing rejection handling for Promises * Use catch() instead of onReject on then() Then it will catches rejection from onFulfilled. This detection can be disabled by `allowThen` option, though.	7 years ago
Emelia Smith	0408944627	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)	7 years ago
Emelia Smith	4be5383b91	Fix issues with sending direct messages from user profile (#6999) ... * Clear compose textarea when starting a new direct message Previous behaviour resulted in potentially misdirected direct messages. * Hide search when starting to compose a direct message	7 years ago
Yamagishi Kazutoshi	21fa7b6520	Weblate translations (2018-04-02) (#7007) ... * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Arabic) Currently translated at 76.6% (450 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 92.6% (544 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.6% (550 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Korean) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (278 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 87.3% (513 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (279 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * bundle exec i18n-tasks normalize && yarn manage:translations * revert	7 years ago
Evgeny Petrov	2964c7a7b8	Russian language updated (#7005) ... * Russian language updated * Small fixes for RU language * bundle exec i18n-tasks normalize	7 years ago
luzi82	89d3bc36a3	i18n: update zh-HK translation (#7004) ... * i18n: update zh-HK translation * i18n: update zh-HK translation * i18n-tasks normalize	7 years ago
David Yip	21394c5462	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	7 years ago
Eugen Rochko	40afedc030	Support all ActivityPub actor types (#6997) ... Fix #6973	7 years ago
Eugen Rochko	10fc551576	Fix unpermitted parameters warning when generating pagination URLs (#6995)	7 years ago
David Underwood	44274257de	[WIP] Enable custom emoji on account pages and in the sidebar (#6124) ... Federate custom emojis with accounts	7 years ago
Yamagishi Kazutoshi	1fbeac0c82	Update Ruby to version 2.4.4 (#6964) ... https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/ > This release includes some bug fixes and some security fixes. > > - CVE-2017-17742: HTTP response splitting in WEBrick > - CVE-2018-6914: Unintentional file and directory creation with directory traversal in tempfile and tmpdir > - CVE-2018-8777: DoS by large request in WEBrick > - CVE-2018-8778: Buffer under-read in String#unpack > - CVE-2018-8779: Unintentional socket creation by poisoned NUL byte in UNIXServer and UNIXSocket > - CVE-2018-8780: Unintentional directory traversal by poisoned NUL byte in Dir > - Multiple vulnerabilities in RubyGems	7 years ago
Emelia Smith	7d791f494b	Fix: Prevent submission using same logic as submit button disabling. (#6993) ... This prevents submission through ctrl/cmd+enter when the submit button is disabled.	7 years ago
luzi82	3233c46796	improve zh-HK localization by referring zh-TW and zh-CN (#6988)	7 years ago
Marcin Mikołajczak	9458e263d5	i18n: Update Polish translation (#6985) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
mayaeh	e0046b2c13	i18n: Add Japanese translations for domain blocks (#6979) ... * run yarn manage:translations * Update Japanese translations for domain blocks.	7 years ago
Daniel Hunsaker	9eb4735e0a	[Nanobox] Enable ElasticSearch support by default (#6977) ... Admins can still disable the feature by adding `ES_ENABLED=false` to their environment, if they prefer not to use it. Be sure to set the variable before you deploy!	7 years ago
unarist	11fb748041	Ignore AbortError when cancelled sharing (#6978) ... `navigator.share()` rejects Promise if user cancelled sharing, and it may print it as an error on JavaScript console. This patch ignores it and prints other errors on the console.	7 years ago
Jenkins	658440838b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	a7cd93032e	Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js ... Add “public” pack to admin controller, as it is included in upstream …	7 years ago
beatrix	766a008931	Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui ... Port #6628 to glitch-soc flavour	7 years ago
David Yip	0f8f4969bd	Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes ... Backport dropdown menu fixes from Mastodon	7 years ago
David Yip	1612cbd150	Merge pull request #407 from ThibG/glitch-soc/fixes/migration-page ... Fix migration page style	7 years ago
Thibaut Girka	e282d19700	Add “public” pack to admin controller, as it is included in upstream admin layout ... Fixes CW unfolding in moderation	7 years ago
ThibG	1cda8b247a	Fix compatibility with PeerTube (#6968) ... * Support fetching objects of convertible types by URL (fixes #6924) * Ignore invalid hashtags	7 years ago
Thibaut Girka	f7d23998c8	Fix migration page style	7 years ago
Thibaut Girka	769c536db4	[Glitch] Remove pointer events on the entire UI when a dropdown menu is open ... Port 95fce1bca0 to glitch-soc	7 years ago
ThibG	aa4a16c94f	Add some UI for user-defined domain blocks (#6628) ... * Keep list of blocked domains Might be overkill, but I'm trying to follow the same logic as for blocked users * Add basic domain block UI * Add the domain blocks UI to Getting Started * Fix undefined URL in `fetchDomainBlocks` * Update all known users' domain_blocking relationship instead of just one's	7 years ago
Thibaut Girka	caa6611877	[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport ... Port 27b532cc98 to glitch-soc	7 years ago
Thibaut Girka	957d5c36c7	Add the domain blocks UI to Getting Started Misc	7 years ago
Thibaut Girka	d2b9747a50	Add basic domain block UI	7 years ago
Thibaut Girka	38feef43ad	Keep list of blocked domains ... Might be overkill, but I'm trying to follow the same logic as for blocked users	7 years ago
Thibaut Girka	e47593cac8	Update all known users' domain_blocking relationship instead of just one's	7 years ago
Thibaut Girka	876cc5c02b	Fix undefined URL in `fetchDomainBlocks`	7 years ago
Pierre-Morgan Gate	ccacb263da	Upgrade charlock_holmes to version 0.7.6 (#6966) ... This version fixes compilation errors when trying to build its native extension with ICU 61.	7 years ago
takayamaki	43ab4a3985	update ja locale (#6965) ... related https://github.com/tootsuite/mastodon/pull/6956	7 years ago
Emelia Smith	df62fc20bf	Feature: Direct message from menu (#6956) ... * Implement ability to send direct messages from the user menu * Implement message warning users that direct messages are visible to all mentioned users * Update locales	7 years ago
David Yip	bc51e7509b	Merge pull request #404 from ThibG/glitch-soc/features/moved-note ... [Untested] [Glitch] Profile redirect notes	7 years ago
Thibaut Girka	32ede640af	[Glitch] Display unfollow button even if account moved ... Backport 1a90ef9c25 to glitch-soc	7 years ago
Thibaut Girka	f63450c7ec	[Glitch] Profile redirect notes ... Port WebUI changes from b89f614bd7	7 years ago
unarist	2974df3c2f	Fix ReferenceError when Cache API is missing (#6953) ... Cache API is not supported on Safari 11.0 / iOS 11. Since those caching is optional, this patch simply ignores it.	7 years ago
unarist	5a9c8aeb42	Fix TypeError on follow notification (#6950) ... `notification.status` may not be present, e.g. follow notification.	7 years ago
ThibG	f7a96189b6	Do not ignore unknown media attachments, only skip them (#6948) ... That way, they are displayed in a list below the corresponding toot.	7 years ago
David Yip	299cfa4bc7	Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents ... Render toots with empty contents	7 years ago
David Yip	998a2eff76	Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup ... Fix attachment lists	7 years ago
Thibaut Girka	166fe6e6dd	Fix attachment lists	7 years ago
Thibaut Girka	4975cee02f	Render toots with empty contents ... This is necessary to display toots with media but otherwise no contents, as glitch-soc displays the media as a child of StatusContent, unlike Mastodon.	7 years ago
Yuto Tokunaga	7551951094	Add double-tap zoom functionary to `ZoomableImage` (#6944) ... add <div.zoomable-image__margin/> to keep margin of the image on zooming move setting `scrollLeft` and `scrollTop` of container from callback of `setState` to `componentDidUpdate` add 'hammerjs' package for touch gesture detection rewrite `ZoomableImage` using 'hammerjs'	7 years ago
Akihiko Odaki	aec3ebab81	Document CORS requirement for asset host (#6941)	7 years ago
David Yip	e6e537d002	Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter ... Remove ignored 'u' parameter on regexp (#392)	7 years ago