about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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).
2017-06-25Fix react-intl/locale-data import issue on production build (#3937)unarist
Webpack seems to fail to import `react-intl/locale-data/*.js` if those files has been proceed by babel, and this also breaks applying our translation. Note that this won't be a problem on English locale, because react-intl includes it as default and works fine without manually added locale-data. Also this issue seems to only occurs on production build, but I'm not sure about reason.
2017-06-24Fix elephant in onboarding modal being very small sized on small devices (#3932)unarist
2017-06-24Clean column collapsible (#3931)unarist
* Remove unused column_collapsable.js * Remove old styles * Extract `> div` style to independent class
2017-06-24feat(components/onboarding_modal): Swipe between pages (#3934)Sorin Davidoi
2017-06-24Fix webpack config for Windows (#3926)unarist
2017-06-24Fix #3924 (regression from #3906) (#3925)Yamagishi Kazutoshi
2017-06-24Use debounce for dispatch scrollTopNotification and expandNotifications (#3700)unarist
2017-06-23Fix a typo and give CW'd statuses the right cursor (#3918)Daniel Hunsaker
2017-06-23Fix webpack-dev-server until it's fixed upstream (#3916)Eugen Rochko
2017-06-23Use Class and Property Decorators (#3730)Yamagishi Kazutoshi
ref https://tc39.github.io/proposal-decorators/
2017-06-23Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" ↵Takuya Yoshida
(#3913) * Fix errorMiddleware * Add "eslint-disable-line no-unused-vars"
2017-06-23Revocable sessions (#3616)Sorin Davidoi
* feat: Revocable sessions * fix: Tests using sign_in * feat: Configuration entry for the maximum number of session activations
2017-06-23Apply babel to react-intl to remove prop-types (#3914)Nolan Lawson
2017-06-23Merge branch 'sorin-davidoi-swipe-gestures'Eugen Rochko
2017-06-23Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon ↵Eugen Rochko
into sorin-davidoi-swipe-gestures
2017-06-23Add index statuses on account_id and id (#3895)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-23Upgrade to Webpack 3 with module concatenation (#3912)Nolan Lawson
2017-06-23Bump version to 1.4.6Eugen Rochko
2017-06-23Add important test for full-width hashtags (#3911)Eugen Rochko
2017-06-23Remove unused variables (#3906)Yamagishi Kazutoshi
2017-06-23Add prefix to setting toggle ID (#3907)Yamagishi Kazutoshi
2017-06-23fix: Apply :hover, :focus and :active only when multiple columnsSorin Davidoi
2017-06-23feat: Swipeable mediaSorin Davidoi
2017-06-23feat: Swipeable columnsSorin Davidoi
2017-06-23chore(yarn): Install react-swipeableSorin Davidoi
2017-06-22Update Russian translation (#3902)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line
2017-06-22Use the stable RVM installer (#3901)nightpool
as mentioned by ElvenSpellmaker here: https://github.com/rvm/rvm/issues/4068 Adds a workaround for the issue mentioned by @abcang here: https://github.com/tootsuite/mastodon/pull/3897#issuecomment-310436668 and makes sure that we're using the stable installer to install the stable version.
2017-06-22fixed vagrantfile (#3897)Charlotte Fields
2017-06-22Some minor change and spec for Account (#3813)Akihiko Odaki (@fn_aki@pawoo.net)
* Introduce domains method to Account relation Account had followers_domains method, which was excessively specific. Let relation of Account have domains method instead. * Move follow_mapping in Account to AccountInteractions * Introduce shared examples for AccountAvatar inclusion * Cover Account more
2017-06-22Update of doorkeeper.oc.yml (#3896)Quent-in
Just some adjustements
2017-06-22Fix travis buildsEugen Rochko
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597