b9e0e43128
Raise an error if salmon request response is unsatisfactory ( #3960 )
2017-06-26 19:39:58 +02:00
196bd78b60
i18n: Updated Polish translation ( #3956 )
...
* i18n: Updated Polish translation
* Update pl.yml
2017-06-26 17:18:45 +02:00
f37382eb68
i18n: Warning to look into the spam folder (pl) ( #3955 )
2017-06-26 17:10:54 +02:00
b6d9cee287
Add .gitattributes file to avoid unwanted CRLF ( #3954 )
...
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-26 13:15:24 +02:00
103f87f9ae
Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )
2017-06-26 13:04:36 +02:00
188098ce62
Stop using Babel with streaming server ( #3950 )
2017-06-26 04:49:39 +02:00
84d2df3ec6
Re-fix errorMiddleware ( #3922 )
2017-06-26 01:46:15 +02:00
104c7d7f96
Ignore DB_NAME for development env on streaming as well as rails side ( #3948 )
2017-06-26 01:45:50 +02:00
b90a44b6d0
Fix #3910 - Require OTP authentication to disable 2FA ( #3935 )
...
* 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-25 23:51:46 +02:00
ad531f90b1
Bind web UI access tokens to sessions ( #3940 )
...
* 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-25 23:51:32 +02:00
b686b4350c
fix unnecessary variable ( #3947 )
2017-06-25 23:29:22 +02:00
7814133f0a
Rename "Credentials" page to "Security" for clarity ( #3941 )
...
* Rename "Credentials" page to "Security" for clarity
* Change "security" icon from cog to lock
2017-06-25 22:13:02 +02:00
2b1ab274fe
fix(features/compose): Handle external changes to the textarea ( #3632 )
2017-06-25 21:43:27 +02:00
4ca14209d1
Cover Auth::RegistrationsController more ( #3353 )
2017-06-25 21:42:55 +02:00
071c6f392e
Cover Admin::DomainBlocksController more ( #3329 )
...
Also domain_block fabricator now sets unique domains
2017-06-25 21:42:36 +02:00
a1fd5d7f61
more free pgconfig by .env ( #3909 )
...
* more free pgconfig for streaming by .env
* fix wrong default values
* database.yml read ENV as same as streaming server
2017-06-25 18:13:31 +02:00
c465c5b3a8
Add overview of active sessions ( #3929 )
...
* 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-25 16:54:30 +02:00
f4d0f6954e
Fix "undefined" in className ( #3939 )
2017-06-25 16:02:56 +02:00
7129cca17a
Don't set ASSET_HOST on build:development ( #3936 )
...
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-25 12:52:42 +02:00
7968c69df4
Fix react-intl/locale-data import issue on production build ( #3937 )
...
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-25 12:49:53 +02:00
9a65f85934
Fix elephant in onboarding modal being very small sized on small devices ( #3932 )
2017-06-24 23:18:32 +02:00
fdd982a562
Clean column collapsible ( #3931 )
...
* Remove unused column_collapsable.js
* Remove old styles
* Extract `> div` style to independent class
2017-06-24 23:18:11 +02:00
8180d8bc35
feat(components/onboarding_modal): Swipe between pages ( #3934 )
2017-06-24 23:17:39 +02:00
741fd15f4e
Fix webpack config for Windows ( #3926 )
2017-06-24 14:03:52 +02:00
6779ba5f18
Fix #3924 (regression from #3906 ) ( #3925 )
2017-06-24 12:24:02 +02:00
45058b5fde
Use debounce for dispatch scrollTopNotification and expandNotifications ( #3700 )
2017-06-24 02:43:26 +02:00
0c8f23b69f
Fix a typo and give CW'd statuses the right cursor ( #3918 )
2017-06-23 23:13:27 +02:00
d7318b6840
Fix webpack-dev-server until it's fixed upstream ( #3916 )
2017-06-23 19:40:51 +02:00
e2027fbe42
Use Class and Property Decorators ( #3730 )
...
ref https://tc39.github.io/proposal-decorators/
2017-06-23 19:36:54 +02:00
e81b5b25aa
Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" ( #3913 )
...
* Fix errorMiddleware
* Add "eslint-disable-line no-unused-vars"
2017-06-23 19:22:02 +02:00
1280559503
Revocable sessions ( #3616 )
...
* feat: Revocable sessions
* fix: Tests using sign_in
* feat: Configuration entry for the maximum number of session activations
2017-06-23 18:50:53 +02:00
9c246cac5c
Apply babel to react-intl to remove prop-types ( #3914 )
2017-06-23 18:21:33 +02:00
12d1565d23
Merge branch 'sorin-davidoi-swipe-gestures'
2017-06-23 17:52:56 +02:00
88458a1638
Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures
2017-06-23 17:52:39 +02:00
794afdca8d
Add index statuses on account_id and id ( #3895 )
2017-06-23 17:46:00 +02:00
61634505c1
Upgrade to Webpack 3 with module concatenation ( #3912 )
2017-06-23 17:44:55 +02:00
81a2d672a7
Bump version to 1.4.6
2017-06-23 17:02:14 +02:00
8fb81e1372
Add important test for full-width hashtags ( #3911 )
2017-06-23 17:01:53 +02:00
539dbaa049
Remove unused variables ( #3906 )
2017-06-23 16:05:04 +02:00
bc21ffd237
Add prefix to setting toggle ID ( #3907 )
2017-06-23 13:55:05 +02:00
9366672d53
fix: Apply :hover, :focus and :active only when multiple columns
2017-06-23 13:48:46 +02:00
501a3cf944
feat: Swipeable media
2017-06-23 13:48:46 +02:00
598bb06687
feat: Swipeable columns
2017-06-23 13:48:46 +02:00
ae78ac379b
chore(yarn): Install react-swipeable
2017-06-23 13:40:58 +02:00
d9eeb1340d
Update Russian translation ( #3902 )
...
* 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-22 23:28:58 +02:00
fd4276a6be
Use the stable RVM installer ( #3901 )
...
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-22 23:28:52 +02:00
0468e7ccb7
fixed vagrantfile ( #3897 )
2017-06-22 18:35:27 +02:00
561ca10d86
Some minor change and spec for Account ( #3813 )
...
* 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-22 18:34:27 +02:00
b0debe35d6
Update of doorkeeper.oc.yml ( #3896 )
...
Just some adjustements
2017-06-22 13:39:13 +02:00
1668881b80
Fix travis builds
...
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
2017-06-22 13:24:00 +02:00
ThibG