about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-21Allow access token in URI (#3208)happycoloredbanana
2017-05-21Update Ukrainian translation (#3203)ster
2017-05-21Fix mutes_controller error and incorrect statuses_controller report (#3202)Akihiko Odaki
This commit fixes a regression in commit f55480756337dd4df7513e89673e81e003f1201a.
2017-05-21Update .gitignore (#3197)Hayato IZUMI
* Remove duplicate 'node_modules' * Replace 'public/packs'
2017-05-21Enhance for the Chinese translation (#3198)vidarlee
* Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175
2017-05-21Add a Japanese translation for PR #3175 (#3192)Daigo 3 Dango
2017-05-20Bump version to 1.4.0.2 (#3190)Eugen Rochko
2017-05-20Adjust REDIS_URL usage in node_redis (#3183)Eugen Rochko
Resolves #2780
2017-05-20Some Dockerfile improvements (#3182)Wonderfall
- improve docker_entrypoint.sh - serve static files with puma by default - sort packages list - use virtual package for build deps - show how to assign UID/GID
2017-05-20Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180)Eugen Rochko
sidekiq-scheduler jobs Resolves #2495
2017-05-20Improve language filter preferences look (#3184)Eugen Rochko
2017-05-20Adds bootsnap. Faster boot time (#3176)Eugen Rochko
2017-05-20Add MS Edge support to public.js (#3179)Yamagishi Kazutoshi
2017-05-20Catalan translation update (#3177)spla
* Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml
2017-05-20Fix regressions in api/v1 (#3178)Akihiko Odaki
The regressions are introduced at commit f55480756337dd4df7513e89673e81e003f1201a by me (Akihiko Odaki)
2017-05-20Filter languages with opt out (#3175)Matt Jankowski
* Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages
2017-05-20Improve eslint rules (#3147)Yamagishi Kazutoshi
* Add semi to ESLint rules * Add padded-blocks to ESLint rules * Add comma-dangle to ESLint rules * add config/webpack and storyboard * add streaming/ * yarn test:lint -- --fix
2017-05-20Ensure unique identifiers in fabricated objects in tests (#3173)Eugen Rochko
2017-05-20Fix block list 500 (#3174)Yamagishi Kazutoshi
2017-05-20More tests for public timeline method (#3171)Eugen Rochko
2017-05-20Remove unnecessary status__info-time div (#3172)Nolan Lawson
2017-05-20Use joins for account properties (#3167)Akihiko Odaki
2017-05-20Fix #2680 - Run processes in Docker as non-root user (#3159)Wonderfall
2017-05-20Performance improvements (#3168)Sorin Davidoi
* refactor(components/status_list): Avoid quering scrollTop if not necessary * refactor(components/dropdown_menu): Do not render items if not expanded * refactor: Cherry-pick react-motion imports * refactor(compose/privacy_dropdown): Do not render options if not open * refactor(components/column_collapsable): Do not render children if collapsed
2017-05-20Add Japanese translations (domain block & admin page) (#3160)Yamagishi Kazutoshi
https://github.com/tootsuite/mastodon/pull/3100 https://github.com/tootsuite/mastodon/pull/3127
2017-05-20Update reset_password_instructions.ar.html.erb (#3163)ButterflyOfFire
Forgot to translate this string :p. Now Done !
2017-05-20Updating the French translations for the web client (#3164)June Sallou
2017-05-20guard against empty domain block list in status scope (#3161)beatrix
2017-05-20Add account media gallery view to web UI (#3120)Eugen Rochko
* Add account media gallery view to web UI * Link media view from account dropdown * Adjust link
2017-05-20feat: Use CSS contain to avoid computations (#3158)Sorin Davidoi
2017-05-20Enable and fill in JSON response test in API::AccountsController (#3157)Jack Jennings
2017-05-19Fix JavaScript error (#3153)PFM
JavaScript error at Safari 10.1(macOS 10.12.4) / iPhone Safari(iOS 10.3.2)
2017-05-19Add coverage for api/v1 controllers (#3155)Matt Jankowski
2017-05-19Fix federated timeline excluding local toots when any domain blocks are set ↵Eugen Rochko
(#3151)
2017-05-19Add buttons to block and unblock domain (#3127)Eugen Rochko
* Add buttons to block and unblock domain * Relationship API now returns "domain_blocking" status for accounts, rename "block entire domain" to "hide entire domain", fix unblocking domain, do not block notifications from domain-blocked-but-followed people, do not send Salmons to domain blocked users * Add test * Personal domain blocks shouldn't affect Salmon after all, since in this direction of communication the control is very thin when it comes to public stuff. Best stay consistent and not affect federation in this way * Ignore followers and follow request from domain blocked folks, ensure account domain blocks are not created for empty domain, and avoid duplicates in validation * Purge followers when blocking domain (without soft-blocks, since they are useless here) * Add tests, fix local timeline being empty when having any domain blocks
2017-05-19Avoid useless renders (#3141)Sorin Davidoi
* feat(eslint): Set react/jsx-no-bind: error * refactor(notifications/setting_toggle): Do not use bind * refactor(components/dropdown_menu): Do not use bind * refactor(components/autosuggest_textarea): Do not use bind * refactor(compose/privacy_dropdown): Do not use bind * refactor(compose/upload_form): Do not use bind * refactor(components/status): Do not use bind * refactor(components/onboarding_modal): Do not use bind * refactor: PR feedback * chore(notifications/setting_toggle): Lint * refactor: PR feedback
2017-05-19Adds better documentation to LOCAL_DOMAIN and LOCAL_HTTPS (#3149)Audun Larsen
Fixes #2254
2017-05-19Unify the method of extracting tags (#3138)abcang
2017-05-19Add spec coverage for regeneration worker (#3143)Matt Jankowski
2017-05-19Remove unused style helper (#3145)Matt Jankowski
2017-05-19Gem updates without rails five one (#3137)Matt Jankowski
* Update terminal-table to version 1.8.0 * Update aws-sdk to version 2.9.20 * Update cld3 to version 3.1.2 * Update microformats2 to version 3.1.0 * Update rails-controller-testing to version 1.0.2 * Update oj to version 3.0.8 * Update http-form_data to version 1.0.3 * Update nokogumbo to version 1.4.11 * Update simplecov-html to version 0.10.1 * Update aws-sdk to version 2.9.21 * Update oj to version 3.0.9 * Update sass to version 3.4.24 * Update simple_form to version 3.5.0
2017-05-19Specs for precompute feed service (#3142)Matt Jankowski
* Add spec for precompute feed service * Refactor PrecomputeFeedService * spec wip
2017-05-19Remove react-autosuggest (#3140)Yamagishi Kazutoshi
react-autosuggest is added from c49f6290eb9c93720bd5407f4320bb0fd6c96ed9 Dependence removed from b27066e154c8c2da57f23bf659907bacd37ce4da
2017-05-19Downgrade eslint-plugin-jsx-a11y to v4.0.0 (#3131)Yamagishi Kazutoshi
In Code Climate, eslint-plugin-jsx-a11y v4.0.0 is used. Therefore, it seems that a warning is displayed. ref https://github.com/codeclimate/codeclimate-eslint/pull/273
2017-05-19Enable caching dependencies in Travis CI (#3132)Yamagishi Kazutoshi
2017-05-19Improve how params from controller are permitted in filter helper (#3129)Matt Jankowski
The `params` variable here was quite overloaded. It exists via the controller to hold the request params, and was sometimes being used in this helper as that object, but other times was being used as a local variable, or to pass to another method, and this was confusing. This change renames the args for a method away from `params` for more clarity, and extracts the actual usage of the controller-provided `params` to a better-named method for clarity.
2017-05-19Replace inline styles with stylesheet (#3115)Yamagishi Kazutoshi
2017-05-19i18n: Hebrew Spam folder check warning added (#3134)Ira
2017-05-19Define instance method outside #included (#3128)alpaca-tc
2017-05-19Conditional validations no longer accept strings for if/unless (#3124)Matt Jankowski