Commit Graph

  • e75c21e9f9 Merge pull request #683 from matrix-org/luke/mels-xor Luke Barnard 2017-03-02 14:08:06 +00:00
  • 8be66d0f04 Merge pull request #730 from Half-Shot/hs/video-gif-autoplay David Baker 2017-03-02 13:41:30 +00:00
  • 4b5e8d66b8 Fixed styling + removed log line Will Hunt 2017-03-02 13:39:56 +00:00
  • 0035a91596 Merge pull request #731 from matrix-org/luke/warn-users-e2e-first-time David Baker 2017-03-02 13:28:15 +00:00
  • 95cff17698 Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog David Baker 2017-03-02 13:13:45 +00:00
  • b951713f7f Remove custom attribs as consumed Luke Barnard 2017-03-02 11:39:40 +00:00
  • 36795fa192 Use data-mx[-bg]-color instead of stripping style Luke Barnard 2017-03-02 11:36:56 +00:00
  • 9c5fb00da4 Fix syntax David Baker 2017-03-01 18:33:45 +00:00
  • ef5d2bca91 Get errorText from error in stageUpdated David Baker 2017-03-01 16:59:25 +00:00
  • c9ef879afa PR feedback: Move the email token request here David Baker 2017-03-01 16:04:15 +00:00
  • b7bd93c613 var -> const Luke Barnard 2017-03-01 15:55:15 +00:00
  • 187c91b76a Adjust warning message Luke Barnard 2017-03-01 15:42:05 +00:00
  • 6d296a0e7a Warn users about using e2e for the first time Luke Barnard 2017-03-01 15:41:13 +00:00
  • 39427839b9 Use ES6 export style Luke Barnard 2017-03-01 14:33:25 +00:00
  • dd33624454 Merge remote-tracking branch 'origin/develop' into dbkr/register_ui_auth David Baker 2017-03-01 10:45:17 +00:00
  • 66e93c8a8c Fix for vector-im/riot-web#3298 - height:100% for welcome pages on Safari Luke Barnard 2017-03-01 10:04:48 +00:00
  • f85c452e35 Merge pull request #726 from matrix-org/luke/rts-set-team-token-on-login Luke Barnard 2017-02-28 15:57:22 +00:00
  • a339316ede Use a "normal" promise in order to .then Luke Barnard 2017-02-28 15:40:49 +00:00
  • 0ef8e2a8f4 Various fixes Luke Barnard 2017-02-28 15:18:00 +00:00
  • 48a3d0d595 Refactor to not set team token in bad ways Luke Barnard 2017-02-28 15:05:49 +00:00
  • 8a7ec27dc7 fix whitespace in urlpreview title Matthew Hodgson 2017-02-28 00:16:43 +00:00
  • 9afbe8e3fc Change wording in notification description turt2live 2017-02-27 15:47:21 -07:00
  • 9b42fbe42f Expose notification option for username/MXID turt2live 2017-02-27 15:32:58 -07:00
  • ae145ff32e oops, fix #3270 properly Matthew Hodgson 2017-02-27 22:24:51 +00:00
  • 1995c16013 Add a user option to enable autoplaying gifs and videos. Will Hunt 2017-02-27 22:17:43 +00:00
  • 4509901592 image (gifs) and video messages will autoplay if enabled. Will Hunt 2017-02-27 22:16:56 +00:00
  • c22db1db5f Fix race when signup is completed elsewhere David Baker 2017-02-27 18:22:26 +00:00
  • e5853a6571 Put back server picker for registration David Baker 2017-02-27 17:24:28 +00:00
  • 7221900497 Refactor remove resend_all_events and cancel_all_events dispatches Luke Barnard 2017-02-27 13:39:12 +00:00
  • b3b16d1858 Merge pull request #727 from matrix-org/luke/fix-rrs Luke Barnard 2017-02-27 11:44:34 +00:00
  • 5fc828f24c Allow span, and only allow style attrib Luke Barnard 2017-02-27 11:32:57 +00:00
  • 886b0a3f13 Sanitise for *, fix style issues Luke Barnard 2017-02-27 11:23:37 +00:00
  • 5be2c62011 Fix a couple of issues with RRs Luke Barnard 2017-02-27 11:16:13 +00:00
  • 454aa0757a Poll for authentication completion David Baker 2017-02-24 17:24:10 +00:00
  • 76b381b849 Spurious newline David Baker 2017-02-24 12:01:06 +00:00
  • a8e99109b1 Support InteractiveAuth based registration David Baker 2017-02-24 11:45:28 +00:00
  • 51467506f8 Port registration over to use InteractiveAuth David Baker 2017-02-24 11:41:23 +00:00
  • e1a40a8ef0 Notify MatrixChat of teamToken after login Luke Barnard 2017-02-23 16:30:26 +00:00
  • bb4d8ee3e8 Merge pull request #3311 from vector-im/rav/rageshake_culling Richard van der Hoff 2017-02-23 14:38:36 +00:00
  • 038f5767f2 Add a comment Richard van der Hoff 2017-02-23 14:37:46 +00:00
  • e2cec7b69c More aggressive rageshake log culling Richard van der Hoff 2017-02-23 14:22:03 +00:00
  • 439bde309e General ChatInviteDialog optimisations Luke Barnard 2017-02-23 12:12:25 +00:00
  • fd3c1ab9e1 Merge pull request #718 from matrix-org/luke/ignore-no-tile-events David Baker 2017-02-23 10:17:16 +00:00
  • 8737112a8c Merge pull request #715 from matrix-org/luke/mels-scrolling-fix David Baker 2017-02-23 10:12:26 +00:00
  • 0a76e0f621 Merge pull request #723 from matrix-org/luke/fix-e2e-input-placeholder David Baker 2017-02-23 10:09:07 +00:00
  • 8bd42693f7 Fix message composer placeholders Luke Barnard 2017-02-23 09:05:26 +00:00
  • b41787c335 Initial work on improving invite dialog Luke Barnard 2017-02-23 09:03:20 +00:00
  • b68b0e25c8 Merge Matthew's wording patch Luke Barnard 2017-02-22 16:59:45 +00:00
  • f92708fbe6 In practice the MELS-1,2,3 solves nothing, revert it Luke Barnard 2017-02-22 16:54:32 +00:00
  • 436e6b36f1 Move UDE handling to a its own file, adjust wording Luke Barnard 2017-02-22 16:42:14 +00:00
  • 2b91b0d9c4 Merge pull request #720 from matrix-org/luke/clarify-e2e-input-box David Baker 2017-02-22 16:20:26 +00:00
  • 816e0be3a0 Retry->Send anyway Luke Barnard 2017-02-22 16:17:49 +00:00
  • 9515cf2cf2 Only hangup on call errors, not errors on sendEvent Luke Barnard 2017-02-22 16:12:37 +00:00
  • 799e5ee0e9 Less jargon Luke Barnard 2017-02-22 14:40:07 +00:00
  • e9318f5c02 Merge pull request #722 from matrix-org/luke/fix-status-bar-tab-complete David Baker 2017-02-22 14:33:29 +00:00
  • f230b0a3c0 Fix status bar expanded on tab-complete Luke Barnard 2017-02-22 14:03:30 +00:00
  • c13ff254b1 Add "Retry" button to UDE Luke Barnard 2017-02-22 10:21:43 +00:00
  • 6690df1203 Merge pull request #3282 from Half-Shot/develop Matthew Hodgson 2017-02-22 01:13:14 +00:00
  • c21cdf5b02 add .editorconfig Aviral Dasgupta 2017-02-21 23:37:02 +05:30
  • f600121dd5 Merge pull request #713 from aviraldg/add-editorconfig David Baker 2017-02-21 18:06:41 +00:00
  • e0724e7521 add .editorconfig Aviral Dasgupta 2017-02-10 01:04:18 +05:30
  • 878e31eba2 Show UDDialog on m.call.invite failure Luke Barnard 2017-02-21 17:22:22 +00:00
  • 7cbd5a7f07 Merge pull request #719 from matrix-org/kegan/db-name Kegsay 2017-02-21 17:18:41 +00:00
  • 658c34abf3 Change the name of the database Kegan Dougal 2017-02-21 15:44:57 +00:00
  • fd146a732b Clarify non-e2e vs. e2e /w composers placeholder Luke Barnard 2017-02-21 15:33:44 +00:00
  • 581c8c138e Do not push a dummy element with a scroll token for invisible events Luke Barnard 2017-02-21 15:01:18 +00:00
  • 05d242cb5c allow @local:domain style mxids Matthew Hodgson 2017-02-21 14:49:30 +00:00
  • 995e59b973 Merge pull request #716 from matrix-org/luke/feature-default-hs Luke Barnard 2017-02-21 14:43:36 +00:00
  • 37f320c4a4 Don't overflow directory network options Will Hunt 2017-02-21 12:25:29 +00:00
  • 454dc8e7b8 Merge pull request #717 from matrix-org/matthew/auth-cache Matthew Hodgson 2017-02-21 09:51:00 +00:00
  • 629f8caad7 oops, remove unneeded import Matthew Hodgson 2017-02-21 09:50:10 +00:00
  • aabf9255d2 anchor the authcache on LoggedInView to prevent it persisting over logouts Matthew Hodgson 2017-02-21 01:03:22 +00:00
  • 6af0b9618a first cut of improving UX for deleting devices. Matthew Hodgson 2017-02-21 00:19:49 +00:00
  • 9eef3c53a3 Allow setting the default HS from the query parameter Luke Barnard 2017-02-20 16:53:26 +00:00
  • 6fead66f89 MELS: check scroll on load + use mels-1,-2,... key Luke Barnard 2017-02-20 10:59:11 +00:00
  • feb8115d24 Desktop instructions: npm run build, not dist David Baker 2017-02-20 10:32:14 +00:00
  • 7d07e7f958 Merge pull request #711 from matrix-org/dbkr/fix_commonmark_quote_multiline Richard van der Hoff 2017-02-20 09:19:41 +00:00
  • 5c87b8045a Merge remote-tracking branch 'origin/master' into develop Richard van der Hoff 2017-02-20 09:14:22 +00:00
  • d8c877fe6e Update ISSUE_TEMPLATE.md Richard van der Hoff 2017-02-20 09:14:01 +00:00
  • 67a7ed1e34 fix spacing of permalinks to info events Matthew Hodgson 2017-02-20 01:49:11 +02:00
  • eabe4f5c29 hopefully fix https://github.com/vector-im/riot-web/issues/3270 Matthew Hodgson 2017-02-20 01:48:10 +02:00
  • 8990e770b7 fix colouring in voip dark theme Matthew Hodgson 2017-02-20 01:43:55 +02:00
  • f91f5cb65e fix RTE dark theme Matthew Hodgson 2017-02-20 01:27:05 +02:00
  • 5951e8fb27 don't try to darktheme scalar for now Matthew Hodgson 2017-02-20 01:18:48 +02:00
  • be79ccccf6 fix dark theme room join bar Matthew Hodgson 2017-02-20 01:15:54 +02:00
  • aba121aab0 fix cursor Matthew Hodgson 2017-02-19 04:13:29 +02:00
  • 2db53c2284 whitelist data & mxc URIs on img tags: readds PR #333 now that punkave/sanitize-html#137 has landed Matthew Hodgson 2017-02-19 03:04:42 +02:00
  • 5ac76acc05 limit avatar uploads to images Matthew Hodgson 2017-02-19 02:07:00 +02:00
  • c146ddf29b turn on rageshake for desktop Matthew Hodgson 2017-02-18 23:59:45 +02:00
  • 5469270e41 spell out where the PGP key lives for releases Matthew Hodgson 2017-02-18 23:48:58 +02:00
  • 457b64037d renormalise ringtone to 66% amplitude Matthew Hodgson 2017-02-18 23:04:31 +02:00
  • e79d38467b Oops, un-hardcode correctly David Baker 2017-02-17 19:27:50 +00:00
  • 1819ff0939 Un-hardcode home in jenkins.sh David Baker 2017-02-17 19:26:21 +00:00
  • a0f572c26e Don't hardcode home dir in jenkins script David Baker 2017-02-17 19:18:58 +00:00
  • 4f4e9a6c3a Fix block quotes all being on a single line David Baker 2017-02-17 18:06:00 +00:00
  • 3fcea0f586 Merge pull request #710 from matrix-org/dbkr/support_kick_ban_reasons David Baker 2017-02-17 17:39:45 +00:00
  • f51669664c Merge pull request #3250 from vector-im/dbkr/support_kick_ban_reasons David Baker 2017-02-17 17:39:38 +00:00
  • 75f2ba6b19 CSS for ban / kick reason prompt David Baker 2017-02-17 17:29:57 +00:00
  • db4b9691cc Support reasons for kick / ban David Baker 2017-02-17 17:27:46 +00:00
  • 10534e7df4 Merge pull request #709 from matrix-org/dbkr/show_when_banned David Baker 2017-02-17 16:48:59 +00:00