about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2017-05-15Feature conversations muting (#3017)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
2017-05-15Fix style regressions (#3062)Eugen Rochko
From #2327 - Elephant friend was overlapping with text, oversized in single column layout From #2021 - Centered layout goes against design principles, changes UX for everybody who's already used to the current one From #2271 - CPU/RAM overusage from keeping columns in DOM (fix #2648, possibly also #2101)
2017-05-14Update capistrano lock version to 3.8.1 (#3056)esetomo
2017-05-14Update rails to version 5.0.3 (#3054)Matt Jankowski
* Update rails to version 5.0.3 * Update aws-sdk to version 2.9.17 * Update capistrano to version 3.8.1 * Update climate_control to version 0.2.0 * Update debug_inspector to version 0.0.3 * Update et-orbi to version 1.0.4 * Update oj to version 3.0.7 * Update microformats2 to version 2.9.0 * Update lograge to version 0.5.1 * Clean up usage of Microformats2 object to remove deprecation warnings * Update microformats2 to version 3.0.1
2017-05-14Use babel-preset-env on Streaming Server (#2998)Yamagishi Kazutoshi
* Use babel-preset-env on Streaming Server Change the streaming server to use babel-preset-env as well as asset compilation. This shortens the load time at first boot. * remove babel-plugin-lodash
2017-05-14Remove Babel plugin for ES Modules (#2975)Yamagishi Kazutoshi
* Remove Babel plugin for ES Modules Processing of ES Modules is executed by Webpack. Don't have to do it on Babel side. * Add plugin for test
2017-05-14Fix only typo (#3035)Paul
2017-05-14Add browserslist config for autoprefixer (#3053)Yamagishi Kazutoshi
We will reduce the weight of the style sheet by specifying the target web browser of autoprefixer.
2017-05-14Add heroku APT buildpack for scalingo. (#3051)William Pitcock
2017-05-14Do not cancel PuSH subscriptions after encountering "permanent" error… (#3046)Eugen Rochko
* Do not cancel PuSH subscriptions after encountering "permanent" error response After talking with MMN about it, turns out some servers/php setups do return 4xx errors while rebooting, so this anti-feature that was meant to take load off of the hub is doing more harm than good in terms of breaking subscriptions * Update delivery_worker.rb
2017-05-13tiny js fix for 'show more' button in chrome (#3045)beatrix
2017-05-13feat(count): Just yml count syntax to provide different rule for 1 (#2685)Stephen Burgess
Update all translation forms that use this "counter" element.
2017-05-13i18n: Hebrew string updates (#3037)Ira
2017-05-13Small FR localisation enhancements (#3033)Bastien
* Small localisation enhancement. Be consistent regarding "e-mail" vs "courriel": I suggest using "courriel" to refer to the electronic message and "e-mail" when used in "adresse e-mail". This reflects the usage I generally observe, but I may be wrong. * Localisation enhancements. Omit some commas: "..., ..., ou ..." should be "..., ... ou ..." since "ou" already articulates the sentence. Also replace "demande" by "requête" when it makes sense.
2017-05-13Fix og:url. (#3031)Shunsuke Michii
2017-05-13Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)alpaca-tc
2017-05-13Fix broken storybook (#3030)Yamagishi Kazutoshi
2017-05-13Revert HTML CW changes (#3020)beatrix
* selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
2017-05-13Make direct statuses stand out more (#3025)Eugen Rochko
Resolves #2515
2017-05-13Finalizing Dutch strings (#3028)jeroenpraat
for this file.
2017-05-12Rebuild node-sass (#3002)Daigo 3 Dango
Got an error in asset precompile on Heroku: Module build failed: Error: ENOENT: no such file or directory, scandir '/tmp/.../node_modules/node-sass/vendor' ref: https://github.com/rails/webpacker#troubleshooting
2017-05-12fix #3008 : props was not defined (#3022)Wonderfall
2017-05-12Spec coverage and refactor for pubsub/delivery worker (#3021)Matt Jankowski
* Framework for delivery worker spec * Refactor of pubsub delivery worker
2017-05-12Fix color contrast some more in privacy warning (#3018)Shel Raphen
* Fix color contrast some more in privacy warning Latest master appears to have changed the <strong> to this unreadable grey color. If you want that to be white then it should be pure white. If someone would rather revert this to that strong dark blue color it was before that would be good too. * Make domain dark blue again * add missing ; woops
2017-05-12Allow SCSS variables to be overridden (#2987)Koala Yeung
* Allow SCSS variables to be overridden with `app/javascript/pack/variables*.scss` * Allow these SCSS variables to be overriden: * `$base-shadow-color` * `$base-overlay-background` * `$base-border-color` * `$simple-background-color` * `$primary-text-color` * `$valid-value-color * `$error-value-color`
2017-05-12Remove reference to non-existent table in schema rb (#3019)Matt Jankowski
2017-05-12Add conversation model, <ostatus:conversation /> (#3016)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. * Fix conversation migration * More spec coverage for status before_create * Prevent n+1 query when generating Atom with the new conversations * Improve code style * Remove redundant local variable
2017-05-12Prepend reblogs' wrapper content with "RT @original_author", (#3013)Eugen Rochko
so that when a reblog parse fails on another instance, it doesn't look like a misattributed/stolen text