2936 Commits (8e4fc5d5d2e5152df35e0486f13356ec76d590f3)

 

All Branches   

Search

Author	SHA1	Message	Date
Matt Jankowski	3f5b994ff0	Stream entry specs and refactor to use delegate (#2827) ... * Add coverage for stream entry delegated methods * Use delegate with allow_nil to clean up stream entry	8 years ago
gentaro	dacdfec973	Added japanese version of terms of service and privacy policy (#2703) ... * Added japanese version of terms of service and privacy policy * Fix typo * Add trasnlation for title. * Improve translation and update the date.	8 years ago
haoyayoi	72c30f8393	add docker-compose.override to gitignore (#2809)	8 years ago
Matt Jankowski	4e05751346	Move account header and avatar methods to a concern (#2825)	8 years ago
alpaca-tc	ee3e0a93f4	Fixes unknown mime type (#2822)	8 years ago
alpaca-tc	d1290fbd8f	Fixes propTypes warning introduced by #2774 (#2824)	8 years ago
Matt Jankowski	484c9709b6	Misc spec coverage improvements (#2821) ... * Dont use raise_error by itself (avoids warning) * Add coverage for AccountFilter * Improve coverage and refactor for Subscription#lease_seconds * Improve coverage and refactor for NotificationMailer * Simplify assignment of min/max threshold on subscription	8 years ago
masarakki	d08f1112d5	use Twitter::Extractor for creating links (#2502)	8 years ago
Koala Yeung	bcfd9a2f8e	Minor fix in Travis config with bundler call (#2806) ... * Travis: Fix bundler_args `bundler_args` is not functional if using custom install script in `.travis.yml`. Directly attach the argument to the install script. * Travis: Run i18n-tasks through bundle exec Parallel to similar scripts in the same travis config. More resiliant to changes in configuration. * Travis: bundler vendor directory Travis + rvm seems to ignore `.bundle/config` and hence use rvm global vendor directory by default. Adding `--path` will fix this and hence make `cache.bundler = true` really functional. * Travis: disable bundler cache No significant change in build time. Huge cache. Best disabled.	8 years ago
Koala Yeung	886176f854	Update Locale zh-HK (#2818) ... * locale: Add missing translation in zh-HK.yml * locale: fix consistancy in zh-HK.yml translation * locale: Improve zh-HK yml translations * Use "PuSH" in all "PubSubHubBub" occurances. * Simplify text on front page. * Improve doorkeeper authorization table translations. * Simplify setting form text for better layout. * Improve "Business Email" translation. * locale: Update zh-HK.json * Fix untranslated text. * Improve translations.	8 years ago
Yamagishi Kazutoshi	d397d0d681	Run manage:translations (#2816)	8 years ago
Matt Jankowski	20c37ed0f9	Add specs (and refactor) of FetchRemoteResourceService and SearchService (#2812) ... * Coverage for fetch remote resource service * Refactor fetch remote resource service * Coverage for search service * Refactor search service	8 years ago
Yamagishi Kazutoshi	9501a87704	Add Japanese translate to home column when inactive (#2813)	8 years ago
ButterflyOfFire	8f0f4a861a	Update ar.json (#2815) ... Adding more arabic translated strings.	8 years ago
Milan*	8c9ea9b849	Correct typo in german locale (#2805)	8 years ago
ThibG	4d22d03fab	Add additional documentation and warnings to the WEB_DOMAIN setting. (#2386) ... * Add additional documentation and warnings to the WEB_DOMAIN setting. This feature is largely undocumented, and quite a number of users have shot them in the feet already despite the warning. Added a bit of documentation and expanded the warning until we have a mechanism for dealing with conflicting user URIs. * Change WEB_DOMAIN comments to point to the extensive online documentation	8 years ago
Eugen Rochko	81584779cb	More robust PuSH subscription refreshes (#2799) ... * Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron Fix an issue where / in domain would raise exception in TagManager#normalize_domain PuSH subscriptions refresh done in a round-robin way to avoid hammering a single server's hub in sequence. Correct handling of failures/retries through Sidekiq (see also #2613). Optimize Account#with_followers scope. Also, since subscriptions are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire refreshing operation halfway through Fix #2702 - Correct user agent header on outgoing http requests * Add test for SubscribeService * Extract #expiring_accounts into method * Make mastodon:push:refresh no-op * Queues are now defined in sidekiq.yml * Queues are now in sidekiq.yml	8 years ago
R Tucker	61c33652ad	ui: check spoiler_text against regex filter (#1635) (#2665) ... * ui: check spoiler_text against regex filter (#1635) When filtering by regex, also check the spoiler_text if present. * ui: concatenate spoiler and content in reducer Simplifies aa5b03c, clarifies intent of the field	8 years ago
Matt Jankowski	f9d398e8fb	Remove the react-rails gem (#2801) ... * Remove react-rails gem * Fix broken view spec	8 years ago
alpaca-tc	74c8ca699c	Delete records in smaller transaction (#2802)	8 years ago
Eugen Rochko	eddb95b012	When streaming API is disconnected, poll home/notifications (#2776) ... * When streaming API is disconnected, poll home/notifications Display slightly different empty home timeline message if user is following others Cull notifications to 20 items when over 40 get added in real-time Run manage:translations * Optimize <HomeTimeline /> a little	8 years ago
Matt Jankowski	84eb425f38	Remove redis clear from before in spec (#2795)	8 years ago
AA4ch1	a50a87457e	Fix language selector on preferences page (#2794)	8 years ago
Yamagishi Kazutoshi	566e0a772d	Improve style for form in site settings (#2796)	8 years ago
Masoud Abkenar	11077af52f	Persian translation update (#2788) ... * Persian translation update * fix newline typo	8 years ago
Wonderfall	0fc73a6e47	about page : use slightly more space (#2791)	8 years ago
Matt Jankowski	2bd132d458	Replace best_in_place editor on admin settings page (#2789) ... * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n	8 years ago
abcang	91ddd345f2	Enable disableHostCheck option of webpack-dev-server (#2790)	8 years ago
Valentin Ouvrard	75bd141e22	Switch docker-compose to version 3. (#2747) ... * Switch docker-compose to version 3. It allow possibility to Deploy Mastodon in a Swarm cluster directly from the compose file. * switch to compose v3 without depend.	8 years ago
Akihiko Odaki	0cdcf32865	Use ws protocol in streaming API base URL (#2606)	8 years ago
abcang	629a4d0fca	fix DB_URL (#2778)	8 years ago
Yamagishi Kazutoshi	e95983f5df	Decode IDNA in PreviewCard (#2781)	8 years ago
Brian Mock	e37e84d210	Fixes #1830 adds link to development guide (#2783)	8 years ago
unarist	e57e6f509d	Show emoji shortname by a tooltip (#2784)	8 years ago
abcang	bea117a4b6	changed to run foreman with vagrant (#2742) ... * changed to run foreman with vagrant * change port specification method and database setting * delete changes of environment variable related code * hard coated the port	8 years ago
Colin Mitchell	908b96a370	Make vagrant HTTP port configurable (#2510)	8 years ago
Eugen Rochko	13c16b4e95	Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses (#2734) ... * Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses If a delete arrives before the original status, cache that information for 6h, and if the original status arrives in that window, ignore it * Add test case	8 years ago
Eugen Rochko	4fcc0d5ac9	Fix #2725 (#2774)	8 years ago
Eduardo Elias	3b51581f1b	Language: update pt-BR (#2775)	8 years ago
alpaca-tc	db92eec876	Localize 'throttled' (#2755)	8 years ago
goofy-bz	44969307c7	Update fr.json (#2757) ... ajout espace insécable derrière pouet - pour voir	8 years ago
m4sk1n	4babdff72f	i18n: updated Polish translation (#2768) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
Eugen Rochko	c997091166	Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732) ... connection options instead of setting REDIS_HOST etc individually Close #1986	8 years ago
yhirano	005f1fd360	update gems (#2754)	8 years ago
ThibG	8d4e7504b1	Additional specs for URI handling (#2759)	8 years ago
Tomohiro Suwa	aa6a26a2d5	Correct Account model for rubocop (#2587) ... * Correct Account model for rubocop * Undo these changes	8 years ago
Matt Jankowski	d91ba3c8d0	Remove screenshot image (#2736)	8 years ago
Eugen Rochko	bafd22ecf4	Fix #2706 - Always respond with 200 to PuSH payloads (#2733) ... Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified Fix #2629 - Correctly handle confirm_domain? for local accounts Unify rules for extracting author acct from XML, prefer <email>, fall back to <name> + <uri> (see also #2017, #2172)	8 years ago
kawax	dd9d57300b	Vagrantfile: node 6 (#2752)	8 years ago
Matt Jankowski	8c5ad23b24	Language improvements, replace whatlanguage with CLD (#2753) ... * add failing en specs * add cld2 gem * Replace WhatLanguage with CLD	8 years ago