about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-06Streamline javascript translation by improving translationRunner (#2808)Koala Yeung
* package.json: Add "build:*" targets * Improve react-intl-translations-manager workflow. * Added "build:production" to build production bundle. * Added "build:development" to build development bundle. * Fix json translation files * Run `yarn manage:translations` to fix translation files. * Fix `pl.json` for syntax error. * translationRunner: auto detect existing languages * Auto detect existing rfc5646 language tag in *.json filenames in `app/javascript/mastodon/locale` folder. No need to manually define every new language in the languages array here. * translationRunner: add more functionality * Allow script user to specify language code to check. * Added available language check. * Added --force flag to force creation of unexists language. * Added --help flag and help messages. * gitignore: ignore npm-debug.log * Fix webpack error if NODE_ENV is not defined Default to use 'development' in config/webpack/configuration.js
2017-05-06Optimize follower_accounts and following_accounts (#2820)alpaca-tc
2017-05-06Stream entry specs and refactor to use delegate (#2827)Matt Jankowski
* Add coverage for stream entry delegated methods * Use delegate with allow_nil to clean up stream entry
2017-05-06Added japanese version of terms of service and privacy policy (#2703)gentaro
* Added japanese version of terms of service and privacy policy * Fix typo * Add trasnlation for title. * Improve translation and update the date.
2017-05-05add docker-compose.override to gitignore (#2809)haoyayoi
2017-05-05Move account header and avatar methods to a concern (#2825)Matt Jankowski
2017-05-05Fixes unknown mime type (#2822)alpaca-tc
2017-05-05Fixes propTypes warning introduced by #2774 (#2824)alpaca-tc
2017-05-05Misc spec coverage improvements (#2821)Matt Jankowski
* 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
2017-05-05use Twitter::Extractor for creating links (#2502)masarakki
2017-05-05Minor fix in Travis config with bundler call (#2806)Koala Yeung
* 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.
2017-05-05Update Locale zh-HK (#2818)Koala Yeung
* 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.
2017-05-05Run manage:translations (#2816)Yamagishi Kazutoshi
2017-05-05Add specs (and refactor) of FetchRemoteResourceService and SearchService (#2812)Matt Jankowski
* Coverage for fetch remote resource service * Refactor fetch remote resource service * Coverage for search service * Refactor search service
2017-05-05Add Japanese translate to home column when inactive (#2813)Yamagishi Kazutoshi
2017-05-05Update ar.json (#2815)ButterflyOfFire
Adding more arabic translated strings.
2017-05-05Correct typo in german locale (#2805)Milan*
2017-05-05Add additional documentation and warnings to the WEB_DOMAIN setting. (#2386)ThibG
* 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
2017-05-05More robust PuSH subscription refreshes (#2799)Eugen Rochko
* 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
2017-05-04ui: check spoiler_text against regex filter (#1635) (#2665)R Tucker
* 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
2017-05-04Remove the react-rails gem (#2801)Matt Jankowski
* Remove react-rails gem * Fix broken view spec
2017-05-04Delete records in smaller transaction (#2802)alpaca-tc
2017-05-04When streaming API is disconnected, poll home/notifications (#2776)Eugen Rochko
* 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
2017-05-04Remove redis clear from before in spec (#2795)Matt Jankowski
2017-05-04Fix language selector on preferences page (#2794)AA4ch1
2017-05-04Improve style for form in site settings (#2796)Yamagishi Kazutoshi
2017-05-04Persian translation update (#2788)Masoud Abkenar
* Persian translation update * fix newline typo
2017-05-04about page : use slightly more space (#2791)Wonderfall
2017-05-04Replace best_in_place editor on admin settings page (#2789)Matt Jankowski
* 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
2017-05-04Enable disableHostCheck option of webpack-dev-server (#2790)abcang
2017-05-04Switch docker-compose to version 3. (#2747)Valentin Ouvrard
* 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.
2017-05-04Use ws protocol in streaming API base URL (#2606)Akihiko Odaki
2017-05-04fix DB_URL (#2778)abcang
2017-05-04Decode IDNA in PreviewCard (#2781)Yamagishi Kazutoshi
2017-05-04Fixes #1830 adds link to development guide (#2783)Brian Mock
2017-05-04Show emoji shortname by a tooltip (#2784)unarist
2017-05-04changed to run foreman with vagrant (#2742)abcang
* changed to run foreman with vagrant * change port specification method and database setting * delete changes of environment variable related code * hard coated the port
2017-05-04Make vagrant HTTP port configurable (#2510)Colin Mitchell
2017-05-04Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses (#2734)Eugen Rochko
* 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
2017-05-04Fix #2725 (#2774)Eugen Rochko
2017-05-04Language: update pt-BR (#2775)Eduardo Elias
2017-05-03Localize 'throttled' (#2755)alpaca-tc
2017-05-03Update fr.json (#2757)goofy-bz
ajout espace insécable derrière pouet - pour voir
2017-05-03i18n: updated Polish translation (#2768)m4sk1n
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732)Eugen Rochko
connection options instead of setting REDIS_HOST etc individually Close #1986
2017-05-03update gems (#2754)yhirano
2017-05-03Additional specs for URI handling (#2759)ThibG
2017-05-03Correct Account model for rubocop (#2587)Tomohiro Suwa
* Correct Account model for rubocop * Undo these changes
2017-05-03Remove screenshot image (#2736)Matt Jankowski
2017-05-03Fix #2706 - Always respond with 200 to PuSH payloads (#2733)Eugen Rochko
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)