Yamagishi Kazutoshi
8f2c91568c
Maintain aspect ratio for preview image ( #3966 )
2017-06-27 13:43:53 +02:00
Yamagishi Kazutoshi
98eaa2aa27
Update Rails to v5.1.2 ( #3968 )
2017-06-27 13:41:03 +02:00
Surinna Curtis
a6f5111c79
Eyes with variation-selector-16 now also do local-only
2017-06-26 20:51:11 -05:00
kibigo!
59503a88ae
Disable account linking on collapsed toots too
2017-06-26 15:41:09 -07:00
kibigo!
5df7bc3a8b
Disable links on collapsed toots
2017-06-26 15:22:03 -07:00
Eugen Rochko
42b8220632
Fix #1624 - Send e-mail notifications to admins about new reports ( #3949 )
2017-06-27 00:04:00 +02:00
kibigo!
c806fef865
Notifications collapsed by default
2017-06-26 14:28:43 -07:00
beatrix-bitrot
49ba78d6f8
fix account spec broken by change to 500char bios
2017-06-26 20:55:44 +00:00
ThibG
a91d968cab
Raise an error if salmon request response is unsatisfactory ( #3960 )
2017-06-26 19:39:58 +02:00
m4sk1n
646de92781
i18n: Updated Polish translation ( #3956 )
...
* i18n: Updated Polish translation
* Update pl.yml
2017-06-26 17:18:45 +02:00
m4sk1n
ae2b722f55
i18n: Warning to look into the spam folder (pl) ( #3955 )
2017-06-26 17:10:54 +02:00
Surinna Curtis
7b53d4bbca
Bio length on client side mostly doesn't count metadata
2017-06-26 09:34:31 -05:00
Surinna Curtis
4f36aad6e8
don't count bio metadata against bio length on server
2017-06-26 09:34:31 -05:00
Daniel Hunsaker
7aeb9168b0
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
f53ed108b0
Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )
2017-06-26 13:04:36 +02:00
Yamagishi Kazutoshi
285038972b
Stop using Babel with streaming server ( #3950 )
2017-06-26 04:49:39 +02:00
kibigo!
56ca33a6d3
Time needs to be just a little wider to accomodate minutes
2017-06-25 19:38:58 -07:00
kibigo!
aeff898137
We want wrapping here, sorry 😥
2017-06-25 19:26:59 -07:00
kibigo!
b323e00bf3
Merge branch 'master' of https://github.com/glitch-soc/mastodon
2017-06-25 19:19:52 -07:00
kibigo!
a520b118e4
Expand toot by clicking on body [fixed!]
2017-06-25 19:19:45 -07:00
beatrix-bitrot
93fc8aa14c
keyword muting and local only tooting WIP
2017-06-26 02:19:21 +00:00
beatrix-bitrot
c0a665865e
update bio length to 500
2017-06-26 02:18:52 +00:00
kibigo!
38a1299975
Stick images inside of CWs
2017-06-25 19:15:03 -07:00
kibigo!
96e1f75679
Fixes to overflows wrt drawer/column
2017-06-25 18:05:28 -07:00
kibigo!
3a99552f0c
Fixed bad drawer custom.css
2017-06-25 17:55:48 -07:00
kibigo!
22cc5c0dec
Improvements to action bar positioning
2017-06-25 17:35:27 -07:00
Takuya Yoshida
e5563843a2
Re-fix errorMiddleware ( #3922 )
2017-06-26 01:46:15 +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
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!
e60f27d649
Clicking on a collapsed toot just uncollapses it.
2017-06-25 16:09:32 -07:00
kibigo!
6a50e73089
Auto-uncollapse when expanding CW
2017-06-25 15:52:55 -07:00
kibigo!
b1f9892e63
[custom.scss] More media height fixes
2017-06-25 15:29:23 -07:00
kibigo!
d6e3918d92
Disables CW [Show More/Less] links in collapsed toots
2017-06-25 15:25:19 -07: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
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!
6909bbdc9e
[custom.scss] max-height of media now a fixed value
2017-06-25 14:44:52 -07:00
amazedkoumei
436ce03772
fix unnecessary variable ( #3947 )
2017-06-25 23:29:22 +02:00
kibigo!
ddc6b85912
Color adjustment to media icons
2017-06-25 14:25:35 -07:00
kibigo!
4bc237fcfe
Adds media icons to toots
2017-06-25 14:22:11 -07:00
kibigo!
efacfec3ed
Media previews for collapsed toots
2017-06-25 13:57:52 -07: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!
8ea779e59a
Patching rebase errors
2017-06-25 12:51:31 -07:00
Sorin Davidoi
4ce1540094
fix(features/compose): Handle external changes to the textarea ( #3632 )
2017-06-25 21:43:27 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
67243bda31
Cover Auth::RegistrationsController more ( #3353 )
2017-06-25 21:42:55 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
8f991831b8
Cover Admin::DomainBlocksController more ( #3329 )
...
Also domain_block fabricator now sets unique domains
2017-06-25 21:42:36 +02:00
Shel Raphen
7eda83a36a
Glitchsocification
2017-06-25 19:21:51 +00:00
amazedkoumei
87efa38721
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
f7301bd5b9
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
099a3b4eac
Fix "undefined" in className ( #3939 )
2017-06-25 16:02:56 +02:00
unarist
3d4e21f1ec
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
