about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-06-27Merge remote-tracking branch 'upstream/master'beatrix-bitrot
2017-06-27i18n: E-mail notifications to admins about new reports (pl) (#3975)m4sk1n
2017-06-27i18n: Turn report screen into a modal (pl) (#3974)m4sk1n
2017-06-27fix(components/status): Up & down jump due to content being added to the DOM ↵Sorin Davidoi
(#3972)
2017-06-27Turn report screen into a modal (#3965)Eugen Rochko
2017-06-27Profile metadata improvementskibigo!
2017-06-27Use instance name in email notifications instead of "Mastodon" (#3763)Midgard
* 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 #1456 Added rake task to add a user. (#1482)Debanshu Kundu
2017-06-27Responsive images in media gallery (#3963)Sorin Davidoi
* feat(components/media_gallery): Responsive images * fix(components/media_gallery): Link to image URL
2017-06-27Update dependencies for Node.js (#3967)Yamagishi Kazutoshi
* 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-27Maintain aspect ratio for preview image (#3966)Yamagishi Kazutoshi
2017-06-27Update Rails to v5.1.2 (#3968)Yamagishi Kazutoshi
2017-06-26Eyes with variation-selector-16 now also do local-onlySurinna Curtis
2017-06-26Disable account linking on collapsed toots tookibigo!
2017-06-26Disable links on collapsed tootskibigo!
2017-06-27Fix #1624 - Send e-mail notifications to admins about new reports (#3949)Eugen Rochko
2017-06-26Notifications collapsed by defaultkibigo!
2017-06-26fix account spec broken by change to 500char biosbeatrix-bitrot
2017-06-26Raise an error if salmon request response is unsatisfactory (#3960)ThibG
2017-06-26i18n: Updated Polish translation (#3956)m4sk1n
* i18n: Updated Polish translation * Update pl.yml
2017-06-26i18n: Warning to look into the spam folder (pl) (#3955)m4sk1n
2017-06-26Bio length on client side mostly doesn't count metadataSurinna Curtis
2017-06-26don't count bio metadata against bio length on serverSurinna Curtis
2017-06-26Add .gitattributes file to avoid unwanted CRLF (#3954)Daniel Hunsaker
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-26Translate pin/unpin and fix some inconsistencies in gender neutral strings ↵Alda Marteau-Hardi
(#3952)
2017-06-26Stop using Babel with streaming server (#3950)Yamagishi Kazutoshi
2017-06-25Time needs to be just a little wider to accomodate minuteskibigo!
2017-06-25We want wrapping here, sorry 😥kibigo!
2017-06-25Merge branch 'master' of https://github.com/glitch-soc/mastodonkibigo!
2017-06-25Expand toot by clicking on body [fixed!]kibigo!
2017-06-26keyword muting and local only tooting WIPbeatrix-bitrot
2017-06-26update bio length to 500beatrix-bitrot
2017-06-25Stick images inside of CWskibigo!
2017-06-25Fixes to overflows wrt drawer/columnkibigo!
2017-06-25Fixed bad drawer custom.csskibigo!
2017-06-25Improvements to action bar positioningkibigo!
2017-06-26Re-fix errorMiddleware (#3922)Takuya Yoshida
2017-06-26Ignore DB_NAME for development env on streaming as well as rails side (#3948)unarist
2017-06-25Move status action bar leftSurinna Curtis
This also resolves the issues where sometimes the timestamps wrap and also sits unpleasantly close to the … button.
2017-06-25Clicking on a collapsed toot just uncollapses it.kibigo!
2017-06-25Auto-uncollapse when expanding CWkibigo!
2017-06-25[custom.scss] More media height fixeskibigo!
2017-06-25Disables CW [Show More/Less] links in collapsed tootskibigo!
2017-06-25Fix #3910 - Require OTP authentication to disable 2FA (#3935)Eugen Rochko
* 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-25Bind web UI access tokens to sessions (#3940)Eugen Rochko
* 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[custom.scss] max-height of media now a fixed valuekibigo!
2017-06-25fix unnecessary variable (#3947)amazedkoumei
2017-06-25Color adjustment to media iconskibigo!
2017-06-25Adds media icons to tootskibigo!
2017-06-25Media previews for collapsed tootskibigo!