about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2017-05-19Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation ↵Matt Jankowski
warning (#3123)
2017-05-19feat(babel): Strip prop types (#3122)Sorin Davidoi
* feat(babel): Strip prop types * chore(babel): Indent * fix(babel): Move babel-plugin-transform-react-remove-prop-types to dependencies
2017-05-19Skip asset pipeline for static file in public/ (#3125)Matt Jankowski
2017-05-19Account domain blocks (#2381)Eugen Rochko
* Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb
2017-05-18After remote follow worker specs (#3098)Matt Jankowski
* Add specs for the after remote follow workers * Refactor the after remote follow workers
2017-05-18Add transform-runtime for smaller Babel helpers (#3116)Nolan Lawson
2017-05-18refactor: Import from react-router/lib (#3117)Sorin Davidoi
2017-05-18Fetch remote image using http.rb (#3114)Yamagishi Kazutoshi
2017-05-18i18l: Hebrew translation updates (#3109)Ira
2017-05-18update (#3113)Quent-in
2017-05-18Update oc.yml (#3112)Quent-in
Normally fully complete
2017-05-18Add rel="noopener" to getting started (#3104)Yamagishi Kazutoshi
2017-05-18Fix character counter not updating for bio (#3101)Eugen Rochko
2017-05-18Add reset button to admin accounts search, improve looks a little (#3100)Eugen Rochko
2017-05-17Fix minor Japanese translations (#3099)Yamagishi Kazutoshi
- add translation "Bon Appetoot!" - add whitelist what doesn't require translation - replace exclamation mark full width - add space after question mark - remove blank between words - run yarn manage:translations
2017-05-17Refactor Status#ancestors/descendants (#3092)alpaca-tc
2017-05-17Render translated view (#3093)alpaca-tc
2017-05-17Use REDIS_DB in streaming (#3094)Hayato IZUMI
2017-05-17Add filter to AccountFilter (#2968)alpaca-tc
2017-05-17Catch import promise in application.js (#3041)Stephen Burgess
* fix(polyfil): Catch error from promise https://pouchdb.com/2015/05/18/we-have-a-problem-with-promises.html * fix(catch): Error Make import promise catch a noop with commented out console.log for a debugging hint. * fix(eslint): Disable eslint console rule * fix(application): Use console error
2017-05-17Added a warning to look into the spam folder (#2921)jeroenpraat
Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.
2017-05-17One string NL update (#3090)jeroenpraat
2017-05-17Fix #2549 - Do not hardcode the exclamation in "toot!", wrap it in an extra ↵Eugen Rochko
locale key (#3089)
2017-05-17Fix #2572 - Resolve preview cards for remote statuses as well as local ones ↵Eugen Rochko
(#3088)
2017-05-17Add catalan language (#3084)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
2017-05-17Make .column-collapse animation simple (#3086)unarist
* Always set `overflow: auto` to allow scroll just after opening * Remove bounce animation which may cause unintended behavior due to max-height * Use CSS transition instead of react-motion * Some CSS refactoring including className changing
2017-05-16feat(ja): add missing ja translation. (#3083)Hiroaki Ninomiya
ref: https://github.com/tootsuite/mastodon/pull/2584
2017-05-16Enable to handle app immediately after closing modal (#3082)geta6
2017-05-16Make faster ProcessFeedService (#3080)Shunsuke Michii
* Add index accounts on uri. * Remove a blank line.
2017-05-16use-symbol-in-order (#3081)masarakki
2017-05-16Improve Account#triadic_closures (#3079)alpaca-tc
2017-05-16Order by symbol value (#3077)alpaca-tc
2017-05-16Optimize Status#permitted_for 24x (#3069)alpaca-tc
* Build query with arel node * Add spec for current Status#permitted_for implementation * Refactor status.rb * Order by visibility to optimize query
2017-05-16chore(landing_strip): hide signup path unless the instance allows ↵Hiroaki Ninomiya
registration. (#3055)
2017-05-16Improve ja translation (#3071)Hiroaki Ninomiya
* chore(ja): replace with reasonable word. * chore(ja): add periods.
2017-05-15Update devise to version 4.3.0 (#3074)Matt Jankowski
Supports rails 5.1
2017-05-15Fix #2646 - Do not override ctrl/cmd+click on Permalinks (#3073)Eugen Rochko
2017-05-15Fix change of status callbacks not setting in_reply_to_account_id and (#3072)Eugen Rochko
possibly others when expected. Add some tests for it
2017-05-15Introduce common JavaScript file (#2981)Akihiko Odaki
* Create common chunk rather than vendor chunk vendor chunk is a set of modules provided by external vendors, but now we can have a chunk as a set of modules shared by multiple entry points, which could be more efficent than having vendor chunk. * Start rails-ujs in common.js This is used by /settings/two_factor_authentication.
2017-05-15Update Japanese tranlsation of conversations muting (#3070)Kazuhiro NISHIYAMA