Yamagishi Kazutoshi
57a3bc1b4f
Update dependencies for Node.js ( #3967 )
...
* 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-27 13:46:11 +02:00
Yamagishi Kazutoshi
8a9408b7c3
Maintain aspect ratio for preview image ( #3966 )
2017-06-27 13:43:53 +02:00
Yamagishi Kazutoshi
9127df69d3
Update Rails to v5.1.2 ( #3968 )
2017-06-27 13:41:03 +02:00
Surinna Curtis
01f1c9dec6
Eyes with variation-selector-16 now also do local-only
2017-06-26 20:51:11 -05:00
kibigo!
1ccb8a2d09
Disable account linking on collapsed toots too
2017-06-26 15:41:09 -07:00
kibigo!
ebd299413c
Disable links on collapsed toots
2017-06-26 15:22:03 -07:00
Eugen Rochko
d0221b05bc
Fix #1624 - Send e-mail notifications to admins about new reports ( #3949 )
2017-06-27 00:04:00 +02:00
kibigo!
04bbba479a
Notifications collapsed by default
2017-06-26 14:28:43 -07:00
beatrix-bitrot
c6302f6fc4
fix account spec broken by change to 500char bios
2017-06-26 20:55:44 +00:00
ThibG
b9e0e43128
Raise an error if salmon request response is unsatisfactory ( #3960 )
2017-06-26 19:39:58 +02:00
m4sk1n
196bd78b60
i18n: Updated Polish translation ( #3956 )
...
* i18n: Updated Polish translation
* Update pl.yml
2017-06-26 17:18:45 +02:00
m4sk1n
f37382eb68
i18n: Warning to look into the spam folder (pl) ( #3955 )
2017-06-26 17:10:54 +02:00
Surinna Curtis
8f15cca3e2
Bio length on client side mostly doesn't count metadata
2017-06-26 09:34:31 -05:00
Surinna Curtis
8db313f13a
don't count bio metadata against bio length on server
2017-06-26 09:34:31 -05:00
Daniel Hunsaker
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
Alda Marteau-Hardi
103f87f9ae
Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )
2017-06-26 13:04:36 +02:00
Yamagishi Kazutoshi
188098ce62
Stop using Babel with streaming server ( #3950 )
2017-06-26 04:49:39 +02:00
kibigo!
88e1254643
Time needs to be just a little wider to accomodate minutes
2017-06-25 19:38:58 -07:00
kibigo!
6f6795841a
We want wrapping here, sorry 😥
2017-06-25 19:26:59 -07:00
kibigo!
bae5b5c074
Merge branch 'master' of https://github.com/glitch-soc/mastodon
2017-06-25 19:19:52 -07:00
kibigo!
734d681fe8
Expand toot by clicking on body [fixed!]
2017-06-25 19:19:45 -07:00
beatrix-bitrot
002484b9d2
keyword muting and local only tooting WIP
2017-06-26 02:19:21 +00:00
beatrix-bitrot
ecfb516588
update bio length to 500
2017-06-26 02:18:52 +00:00
kibigo!
d9cb3941d8
Stick images inside of CWs
2017-06-25 19:15:03 -07:00
kibigo!
cfb2072045
Fixes to overflows wrt drawer/column
2017-06-25 18:05:28 -07:00
kibigo!
69e8ff3661
Fixed bad drawer custom.css
2017-06-25 17:55:48 -07:00
kibigo!
ecbc3a3b8f
Improvements to action bar positioning
2017-06-25 17:35:27 -07:00
Takuya Yoshida
84d2df3ec6
Re-fix errorMiddleware ( #3922 )
2017-06-26 01:46:15 +02:00
unarist
104c7d7f96
Ignore DB_NAME for development env on streaming as well as rails side ( #3948 )
2017-06-26 01:45:50 +02:00
Surinna Curtis
82f11f07f1
Move status action bar left
...
This also resolves the issues where sometimes the timestamps wrap and also sits unpleasantly close to the … button.
2017-06-25 18:24:50 -05:00
kibigo!
92c404d703
Clicking on a collapsed toot just uncollapses it.
2017-06-25 16:09:32 -07:00
kibigo!
ab0e92d337
Auto-uncollapse when expanding CW
2017-06-25 15:52:55 -07:00
kibigo!
f5cc235d7a
[custom.scss] More media height fixes
2017-06-25 15:29:23 -07:00
kibigo!
be33f28968
Disables CW [Show More/Less] links in collapsed toots
2017-06-25 15:25:19 -07:00
Eugen Rochko
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
Eugen Rochko
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
kibigo!
dfb494e69e
[custom.scss] max-height of media now a fixed value
2017-06-25 14:44:52 -07:00
amazedkoumei
b686b4350c
fix unnecessary variable ( #3947 )
2017-06-25 23:29:22 +02:00
kibigo!
fe70393072
Color adjustment to media icons
2017-06-25 14:25:35 -07:00
kibigo!
f5a90db7ef
Adds media icons to toots
2017-06-25 14:22:11 -07:00
kibigo!
d5cf3e5570
Media previews for collapsed toots
2017-06-25 13:57:52 -07:00
Eugen Rochko
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
kibigo!
a988d0065a
Patching rebase errors
2017-06-25 12:51:31 -07:00
Sorin Davidoi
2b1ab274fe
fix(features/compose): Handle external changes to the textarea ( #3632 )
2017-06-25 21:43:27 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
4ca14209d1
Cover Auth::RegistrationsController more ( #3353 )
2017-06-25 21:42:55 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
071c6f392e
Cover Admin::DomainBlocksController more ( #3329 )
...
Also domain_block fabricator now sets unique domains
2017-06-25 21:42:36 +02:00
Shel Raphen
97f99bca98
Glitchsocification
2017-06-25 19:21:51 +00:00
amazedkoumei
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
Eugen Rochko
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
PFM
f4d0f6954e
Fix "undefined" in className ( #3939 )
2017-06-25 16:02:56 +02:00
