about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-06-30Version bumps for gems (#4002)Matt Jankowski
* Update aws-sdk to version 2.10.4 * Update bootsnap to version 1.1.1 * Update capistrano to version 3.8.2 * Update capybara to version 2.14.4 * Update cld3 to version 3.1.3 * Update http_accept_language to version 2.1.1 * Update sidekiq to version 5.0.3 * Update rspec-sidekiq to version 3.0.3 * Update sidekiq-scheduler to version 2.1.7 * Update oj to version 3.2.0 * Update openssl to version 2.0.4 * Update pg to version 0.21.0 * Update twitter-text to version 1.14.6 * Update unicode-display_width to version 1.3.0 * Update scss_lint to version 0.54.0 * Update hamlit to version 2.8.4 * Update erubi to version 1.6.1 * Update httplog to version 0.99.4 * Update aws-sdk to version 2.10.6
2017-06-30Fix that AdminMailer does not send (#4012)Yamagishi Kazutoshi
2017-06-30Remove babel-cli (#4011)Yamagishi Kazutoshi
2017-06-30Fix broken style in media gallery (regression from #3963) (#4014)Yamagishi Kazutoshi
2017-06-30Do not raise an error if PrecomputeFeed could not find any status (#4015)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-30Rescue Addressable::URI::InvalidURIError at Remotable (#4017)abcang
2017-06-30Replace state to /web when root path (#4009)Yamagishi Kazutoshi
2017-06-30Fix media-gallery, overflow is hidden. (#4008)Naoki Kosaka
2017-06-29rescue HTTP::ConnectionError (#3992)abcang
2017-06-29Upgrade jsdom to version 11.0.0 (#3994)Yamagishi Kazutoshi
2017-06-29Cover Admin::AccountsController more (#3327)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-29Use multiple pairs for zadd in PrecomputeFeedService (#3990)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-29Reduce number of commands in FeedManager#trim (#3989)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-28Bump version to 1.4.7Eugen Rochko
2017-06-28Do not fail to create access token if superapp was never created (#3986)Eugen Rochko
2017-06-28Add Japanese translations (#3985)Yamagishi Kazutoshi
ref #3929, #3935, #3949, #3981
2017-06-28Overwrite old statuses with reblogs in PrecomputeFeedService (#3984)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-28i18n: added email to activerecord.pl.yml (#3981)m4sk1n
2017-06-27i18n: Minor fix in devise.pl.yml (#3978)m4sk1n
2017-06-27i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-06-27i18n: E-mail notifications to admins about new reports (pl) (#3975)m4sk1n
2017-06-27i18n: Turn report screen into a modal (pl) (#3974)m4sk1n
2017-06-27fix(components/status): Up & down jump due to content being added to the DOM ↵Sorin Davidoi
(#3972)
2017-06-27Turn report screen into a modal (#3965)Eugen Rochko
2017-06-27Use instance name in email notifications instead of "Mastodon" (#3763)Midgard
* Use instance name in "password changed" mail instead of "Mastodon". Fixes tootsuite#2620. * Use instance name in password reset mail instead of "Mastodon".
2017-06-27 #1456 Added rake task to add a user. (#1482)Debanshu Kundu
2017-06-27Responsive images in media gallery (#3963)Sorin Davidoi
* feat(components/media_gallery): Responsive images * fix(components/media_gallery): Link to image URL
2017-06-27Update dependencies for Node.js (#3967)Yamagishi Kazutoshi
* Update @storybook/addon-actions to v3.1.6 * Update @storybook/react to v3.1.6 * Update babel-loader to v7.1.0 * Update babel-plugin-transform-react-remove-prop-types to v0.4.6 * Update enzyme to v2.9.1 * Update fsevents to v1.1.2 * Update intersection-observer to v0.3.2 * Update npmlog to v4.1.2 * Update pg to v6.4.0 * Update postcss-loader to v2.0.6 * Update rails-ujs to v5.1.2 * Update react to v15.6.1 * Update react-addons-shallow-compare to v15.6.0 * Update react-dom to v15.6.0 * Update react-notification to v6.7.1 * Update react-test-renderer to v15.6.1 * Update react-textarea-autosize to v5.0.7 * Update redux to v3.7.1 * Update resolve-url-loader to v2.1.0 * Update sass-loader to v6.0.6 * Update sinon to v2.3.5 * Update stringz to v0.2.2 * Update uuid to v3.1.0 * Update websocket.js to v0.1.12 * Update yargs to v8.0.2 * yarn upgrade
2017-06-27Maintain aspect ratio for preview image (#3966)Yamagishi Kazutoshi
2017-06-27Update Rails to v5.1.2 (#3968)Yamagishi Kazutoshi
2017-06-27Fix #1624 - Send e-mail notifications to admins about new reports (#3949)Eugen Rochko
2017-06-26Raise an error if salmon request response is unsatisfactory (#3960)ThibG
2017-06-26i18n: Updated Polish translation (#3956)m4sk1n
* i18n: Updated Polish translation * Update pl.yml
2017-06-26i18n: Warning to look into the spam folder (pl) (#3955)m4sk1n
2017-06-26Add .gitattributes file to avoid unwanted CRLF (#3954)Daniel Hunsaker
When Windows checks out files, it defaults to changing line endings to CRLF. If these files are then copied to a Linux system to be run, and the endings aren't changed at some point in that process, things break. This file forces git to use LF for all text files on all systems (except the request testing specfiles) to prevent issues everywhere.
2017-06-26Translate pin/unpin and fix some inconsistencies in gender neutral strings ↵Alda Marteau-Hardi
(#3952)
2017-06-26Stop using Babel with streaming server (#3950)Yamagishi Kazutoshi
2017-06-26Re-fix errorMiddleware (#3922)Takuya Yoshida
2017-06-26Ignore DB_NAME for development env on streaming as well as rails side (#3948)unarist
2017-06-25Fix #3910 - Require OTP authentication to disable 2FA (#3935)Eugen Rochko
* Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability to generate new OTP backup codes *after* initial backup codes were handed out during activation * Restore recovery code re-generation * Improve display of some 2FA elements
2017-06-25Bind web UI access tokens to sessions (#3940)Eugen Rochko
* Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test * Fix #2347 - Bind web UI access token to session When you logout, session also destroys the access token, so it's no longer valid. If access token is destroyed some other way, the session is also destroyed, requiring a re-login. Fix #1681 - Add scheduler to remove revoked access tokens and grants * Fix test
2017-06-25fix unnecessary variable (#3947)amazedkoumei
2017-06-25Rename "Credentials" page to "Security" for clarity (#3941)Eugen Rochko
* Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock
2017-06-25fix(features/compose): Handle external changes to the textarea (#3632)Sorin Davidoi
2017-06-25Cover Auth::RegistrationsController more (#3353)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-25Cover Admin::DomainBlocksController more (#3329)Akihiko Odaki (@fn_aki@pawoo.net)
Also domain_block fabricator now sets unique domains
2017-06-25more free pgconfig by .env (#3909)amazedkoumei
* more free pgconfig for streaming by .env * fix wrong default values * database.yml read ENV as same as streaming server
2017-06-25Add overview of active sessions (#3929)Eugen Rochko
* Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test
2017-06-25Fix "undefined" in className (#3939)PFM
2017-06-25Don't set ASSET_HOST on build:development (#3936)unarist
Setting ASSET_HOST to `http://0.0.0.0:8080` makes urls in manifest.json to be invalid, e.g. `http://0.0.0.0:8080/packs/application.js`. Anyway, we don't need set this on build:development because assets would be delivered from same origin in development (and w/o dev-server).