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
unarist
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
unarist
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
kibigo!
a6c43ea9fc
Removed no-longer-necessary custom style
2017-06-24 21:28:30 -07:00
Gô Shoemake
098b360439
Merge pull request #26 from ekiru/feature/manual-column-layout-setting
...
User-controlled multi-column/single-column overrides
2017-06-24 20:44:43 -07:00
kibigo!
fb3040dfc4
Better style handling at small sizes
2017-06-24 20:36:19 -07:00
kibigo!
1e6267ae2f
Allowed little media rules
2017-06-24 20:14:58 -07:00
kibigo!
cf1a103ee7
OKAY THIS WORKS THIS WORKS
2017-06-24 20:04:46 -07:00
kibigo!
10ca00107d
Better settings handling with localSettings (new!)
2017-06-24 19:56:37 -07:00
kibigo!
2dc82d48ae
Don't change layout of static pages
2017-06-24 18:30:59 -07:00
kibigo!
b4b03c99f1
Use Redux store to keep track of layout
2017-06-24 18:30:30 -07:00
unarist
9a65f85934
Fix elephant in onboarding modal being very small sized on small devices ( #3932 )
2017-06-24 23:18:32 +02:00
unarist
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
Sorin Davidoi
8180d8bc35
feat(components/onboarding_modal): Swipe between pages ( #3934 )
2017-06-24 23:17:39 +02:00
Surinna Curtis
b01b111ca1
Pass in correct "singleColumn" prop value when auto-columns is not used.
2017-06-24 15:29:46 -05:00
Surinna Curtis
e5b6c21f32
Support overriding media queries for deciding between single-column/multi-column layouts with a class
2017-06-24 15:29:46 -05:00
unarist
741fd15f4e
Fix webpack config for Windows ( #3926 )
2017-06-24 14:03:52 +02:00
Yamagishi Kazutoshi
6779ba5f18
Fix #3924 (regression from #3906 ) ( #3925 )
2017-06-24 12:24:02 +02:00
beatrix-bitrot
5be13a0557
clean up old avatar class
2017-06-24 03:51:01 +00:00
