OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,235 Commits
207 Branches
549 Tags
668 MiB
Commit Graph

3235 Commits (300cd962e572bb0ab3314295721f4d2e5d2d16c7)

Author SHA1 Message Date
David Baker a16aae1124 Move screen sharing error check into platform 
Because on the browser it depends on HTTPS, on electron it doesn't
matter.
 2017-01-10 18:37:57 +00:00
David Baker 085f134e84 Merge pull request #606 from matrix-org/dbkr/fix_forgot_password_create_account 
Fix 'create account' link in 'forgot password'
 2017-01-10 15:27:51 +00:00
David Baker 13a5337e0f Fix 'create account' link in 'forgot password' 
Fixes https://github.com/vector-im/riot-web/issues/2853
 2017-01-10 15:16:39 +00:00
Richard van der Hoff 42de77e588 Remove "Cannot re-join empty room" error 
This is a lying error message. burn it with fire
 2016-12-27 19:17:48 +00:00
Matthew Hodgson 9c4671568d fix disasterous thinko in 69b277b282 2016-12-24 22:33:04 +00:00
Matthew Hodgson 97514cf80e Merge branch 'master' into develop 2016-12-24 19:03:42 +00:00
Matthew Hodgson 45bfb93f17 v0.8.4 2016-12-24 19:03:08 +00:00
Matthew Hodgson b88afab7af Prepare changelog for v0.8.4 2016-12-24 19:03:07 +00:00
Matthew Hodgson 223caae842 Merge branch 'master' into develop 2016-12-24 18:54:00 +00:00
Matthew Hodgson 1976bb70bd v0.8.3-electron 2016-12-24 18:53:24 +00:00
Matthew Hodgson 2e888f7f27 Prepare changelog for v0.8.3-electron 2016-12-24 18:53:24 +00:00
Matthew Hodgson 7d42ef90d6 improve captcha warning 2016-12-24 18:49:03 +00:00
Matthew Hodgson 386770a22a ask electron users to do captchas in a web browser. 
This will happen anyway when they follow email verification links.
make captchas poll for success so if they are completed elsewhere, electron moves on
 2016-12-24 18:48:58 +00:00
Matthew Hodgson 1b46ab7a80 blind fix for captcha on electron 2016-12-24 18:48:52 +00:00
Matthew Hodgson e2e3bc0637 improve captcha warning 2016-12-24 18:40:20 +00:00
Matthew Hodgson cb7ef76dcb Merge pull request #601 from matrix-org/matthew/electron-captcha2 
Let electron users complete captchas in a web browser
 2016-12-24 18:38:40 +00:00
Matthew Hodgson 69b277b282 ask electron users to do captchas in a web browser. 
This will happen anyway when they follow email verification links.
make captchas poll for success so if they are completed elsewhere, electron moves on
 2016-12-24 03:15:30 +00:00
Matthew Hodgson b1c4c759f4 blind fix for captcha on electron 2016-12-23 14:35:40 +00:00
Luke Barnard 2a63017372 Account for timezone in date separator calculation (#595) 
* Account for timezone in date separator calculation

Decide on date separators using MatrixEvent.getDate(). This requires matrix-org/matrix-js-sdk#311
 2016-12-22 17:54:30 +00:00
David Baker fd44d9f4d6 Merge pull request #597 from matrix-org/dbkr/delete_threepid 
Add support for deleting threepids
 2016-12-22 15:31:34 +00:00
David Baker 8a3f2d9e91 Merge pull request #598 from matrix-org/dbkr/display_msisdn_threepid 
Display msisdn threepids as 'Phone'
 2016-12-22 15:28:09 +00:00
David Baker a6fdbda011 Get variable name right 2016-12-22 15:26:08 +00:00
David Baker 98b22460ec They're not all emails anymore 2016-12-22 15:03:24 +00:00
David Baker 9cbe401866 Back to js-sdk develop 2016-12-22 14:13:48 +00:00
David Baker 9bf98161a2 v0.8.3 2016-12-22 14:09:42 +00:00
David Baker df1d48b6a6 Prepare changelog for v0.8.3 2016-12-22 14:09:42 +00:00
David Baker 57412b3315 released matrix-js-sdk 2016-12-22 14:06:42 +00:00
Matthew Hodgson 645349f542 Merge pull request #599 from DanielDent/unbranded-error-messages 
Unbranded error messages
 2016-12-21 22:46:38 +00:00
Matthew Hodgson 197c68c247 s/vector/riot/g 2016-12-21 22:45:57 +00:00
Daniel Dent 7c841a86ef Unbranded error messages 2016-12-21 14:28:01 -08:00
David Baker 3dfffa385e Display msisdn threepids as 'Phone' 
rather than pretending only email exists
 2016-12-21 18:56:50 +00:00
David Baker 5e10ec4ece Add support for deleting threepids 2016-12-21 18:49:38 +00:00
Richard van der Hoff 4804fb3a1c Revert "Fix performance issues with wantsDateSeperator" 
This change broke timezone handling, so that date-separators are shown at the
wrong time of day.

This reverts commit b908e7ef29.
 2016-12-21 09:48:41 +00:00
Richard van der Hoff a014dcc2d0 Merge pull request #594 from matrix-org/luke/fix-scroll-jump-on-video-decryption 
Fix scroll jumping when a video is decrypted
 2016-12-20 12:41:39 +00:00
Luke Barnard 2658cd09b5 Fix scroll jumping when a video is decrypted 
Call the `onWidgetLoad` prop on MVideoBody to notify the scroll panel to keep it's position when the size of the video widget updates.
 2016-12-20 12:33:07 +00:00
Matthew Hodgson d0d056e308 hide read markers 2016-12-20 02:26:23 +00:00
David Baker 70c7facb6f matrix-js-sdk dev 2016-12-16 17:30:43 +00:00
David Baker 29a05dda20 v0.8.2 2016-12-16 17:26:13 +00:00
David Baker 0b767010fe Prepare changelog for v0.8.2 2016-12-16 17:26:12 +00:00
David Baker 03d9d28205 matrix-js-sdk 0.7.2 2016-12-16 17:24:17 +00:00
David Baker 4be14080e1 Fix cancel button on uploads 2016-12-16 17:12:04 +00:00
Richard van der Hoff b8c0fa507e Merge pull request #590 from matrix-org/luke/fix-membereventlistsummary-performance 
Improve the performance of MemberEventListSummary
 2016-12-16 10:53:51 +00:00
Luke Barnard 7475056bb4 MELS component should update if there are fewEvents, effectively expanding the summary 2016-12-15 18:33:13 +00:00
Luke Barnard 6b52b247e7 Update comment on MELS key 2016-12-15 18:26:41 +00:00
Luke Barnard 88aeb6417e Use the first member event ID or "initial" in the MELS key 2016-12-15 18:23:54 +00:00
Kegsay 71132c4610 Merge pull request #592 from matrix-org/kegan/bulk-reject-invites 
Implement bulk invite rejections
 2016-12-15 16:16:55 +00:00
Kegan Dougal ec41fc284a Null guard on componentWillUnmount 2016-12-15 16:13:09 +00:00
Luke Barnard 55f85befc1 Allow component to update if currently expanded or if about to collapse 2016-12-15 14:43:59 +00:00
Kegan Dougal 8a511ed54b Add .done() to catch exceptions which may be thrown in setState 2016-12-15 14:17:29 +00:00
Luke Barnard e7564f4dc5 Spelling 2016-12-15 13:16:36 +00:00