ddafde942c
Merge remote-tracking branch 'upstream/master'
2017-06-27 20:46:13 +00:00
da42bfadb5
i18n: E-mail notifications to admins about new reports (pl) ( #3975 )
2017-06-27 22:21:35 +02:00
6ad72728f6
i18n: Turn report screen into a modal (pl) ( #3974 )
2017-06-27 22:14:31 +02:00
64d9c016bd
fix(components/status): Up & down jump due to content being added to the DOM ( #3972 )
2017-06-27 18:43:53 +02:00
12e7c81dd8
Turn report screen into a modal ( #3965 )
2017-06-27 18:07:21 +02:00
e6300de142
Profile metadata improvements
2017-06-27 05:48:26 -07:00
16d0aed403
Use instance name in email notifications instead of "Mastodon" ( #3763 )
...
* Use instance name in "password changed" mail
instead of "Mastodon".
Fixes tootsuite#2620.
* Use instance name in password reset mail
instead of "Mastodon".
2017-06-27 14:22:36 +02:00
da9317fa56
#1456 Added rake task to add a user. ( #1482 )
2017-06-27 14:18:53 +02:00
be92babd00
Responsive images in media gallery ( #3963 )
...
* feat(components/media_gallery): Responsive images
* fix(components/media_gallery): Link to image URL
2017-06-27 13:46:37 +02:00
e2dd576a1b
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
8f2c91568c
Maintain aspect ratio for preview image ( #3966 )
2017-06-27 13:43:53 +02:00
98eaa2aa27
Update Rails to v5.1.2 ( #3968 )
2017-06-27 13:41:03 +02:00
a6f5111c79
Eyes with variation-selector-16 now also do local-only
2017-06-26 20:51:11 -05:00
59503a88ae
Disable account linking on collapsed toots too
2017-06-26 15:41:09 -07:00
5df7bc3a8b
Disable links on collapsed toots
2017-06-26 15:22:03 -07:00
42b8220632
Fix #1624 - Send e-mail notifications to admins about new reports ( #3949 )
2017-06-27 00:04:00 +02:00
c806fef865
Notifications collapsed by default
2017-06-26 14:28:43 -07:00
49ba78d6f8
fix account spec broken by change to 500char bios
2017-06-26 20:55:44 +00:00
a91d968cab
Raise an error if salmon request response is unsatisfactory ( #3960 )
2017-06-26 19:39:58 +02:00
646de92781
i18n: Updated Polish translation ( #3956 )
...
* i18n: Updated Polish translation
* Update pl.yml
2017-06-26 17:18:45 +02:00
ae2b722f55
i18n: Warning to look into the spam folder (pl) ( #3955 )
2017-06-26 17:10:54 +02:00
7b53d4bbca
Bio length on client side mostly doesn't count metadata
2017-06-26 09:34:31 -05:00
4f36aad6e8
don't count bio metadata against bio length on server
2017-06-26 09:34:31 -05:00
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
f53ed108b0
Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )
2017-06-26 13:04:36 +02:00
285038972b
Stop using Babel with streaming server ( #3950 )
2017-06-26 04:49:39 +02:00
56ca33a6d3
Time needs to be just a little wider to accomodate minutes
2017-06-25 19:38:58 -07:00
aeff898137
We want wrapping here, sorry 😥
2017-06-25 19:26:59 -07:00
b323e00bf3
Merge branch 'master' of https://github.com/glitch-soc/mastodon
2017-06-25 19:19:52 -07:00
a520b118e4
Expand toot by clicking on body [fixed!]
2017-06-25 19:19:45 -07:00
93fc8aa14c
keyword muting and local only tooting WIP
2017-06-26 02:19:21 +00:00
c0a665865e
update bio length to 500
2017-06-26 02:18:52 +00:00
38a1299975
Stick images inside of CWs
2017-06-25 19:15:03 -07:00
96e1f75679
Fixes to overflows wrt drawer/column
2017-06-25 18:05:28 -07:00
3a99552f0c
Fixed bad drawer custom.css
2017-06-25 17:55:48 -07:00
22cc5c0dec
Improvements to action bar positioning
2017-06-25 17:35:27 -07:00
e5563843a2
Re-fix errorMiddleware ( #3922 )
2017-06-26 01:46:15 +02:00
c972e1ee1f
Ignore DB_NAME for development env on streaming as well as rails side ( #3948 )
2017-06-26 01:45:50 +02:00
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
e60f27d649
Clicking on a collapsed toot just uncollapses it.
2017-06-25 16:09:32 -07:00
6a50e73089
Auto-uncollapse when expanding CW
2017-06-25 15:52:55 -07:00
b1f9892e63
[custom.scss] More media height fixes
2017-06-25 15:29:23 -07:00
d6e3918d92
Disables CW [Show More/Less] links in collapsed toots
2017-06-25 15:25:19 -07:00
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
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
6909bbdc9e
[custom.scss] max-height of media now a fixed value
2017-06-25 14:44:52 -07:00
436ce03772
fix unnecessary variable ( #3947 )
2017-06-25 23:29:22 +02:00
ddc6b85912
Color adjustment to media icons
2017-06-25 14:25:35 -07:00
4bc237fcfe
Adds media icons to toots
2017-06-25 14:22:11 -07:00
efacfec3ed
Media previews for collapsed toots
2017-06-25 13:57:52 -07:00
beatrix-bitrot
m4sk1n
Sorin Davidoi
Eugen Rochko
kibigo!
Midgard
Debanshu Kundu
Yamagishi Kazutoshi
Surinna Curtis
ThibG
Daniel Hunsaker
Alda Marteau-Hardi
Takuya Yoshida
unarist
amazedkoumei