kibigo!
56ca33a6d3
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!
aeff898137
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!
b323e00bf3
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
kibigo!
a520b118e4
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
93fc8aa14c
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
beatrix-bitrot
c0a665865e
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!
38a1299975
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!
96e1f75679
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!
3a99552f0c
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
kibigo!
22cc5c0dec
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
Takuya Yoshida
e5563843a2
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
unarist
c972e1ee1f
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
Surinna Curtis
efa425206c
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!
e60f27d649
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!
6a50e73089
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!
b1f9892e63
[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
kibigo!
d6e3918d92
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
5e8d037e27
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
Eugen Rochko
ed7dc1704d
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
kibigo!
6909bbdc9e
[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
amazedkoumei
436ce03772
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!
ddc6b85912
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!
4bc237fcfe
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
kibigo!
efacfec3ed
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
Eugen Rochko
d821aba002
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
