OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,056 Commits
219 Branches
563 Tags
448 MiB
Commit Graph

3056 Commits (e37bf6b7be824caade5019da1bc1a4b92c9d6114)

Author SHA1 Message Date
Richard van der Hoff e37bf6b7be Skip crypto tests on PhantomJS 2017-01-14 01:41:48 +00:00
Richard van der Hoff d63f7e8359 Expose megolm import/export via the devtools 2017-01-14 01:34:34 +00:00
Richard van der Hoff f8e56778ea Encryption and decryption for megolm backups 2017-01-14 01:34:34 +00:00
Richard van der Hoff 1d5d44d63d TextEncoder polyfill 
Apparently Safari doesn't sport a TextEncoder, so here's a polyfill for it.
 2017-01-14 00:45:51 +00:00
Kegsay 07b3c58c61 Merge pull request #614 from matrix-org/kegan/show-error-on-pl-change-fail 
Show the error dialog when requests to PUT power levels fail
 2017-01-13 15:26:26 +00:00
Kegan Dougal dcd0acb2b5 Review comments 2017-01-13 15:17:34 +00:00
Kegan Dougal e196cfaf91 Show the error dialog when requests to PUT power levels fail 
This is why I dislike Q.
 2017-01-13 14:51:01 +00:00
David Baker 6d07a1b7e3 Merge pull request #612 from matrix-org/dbkr/ci_build_js_sdk 
Build the js-sdk in the CI script
 2017-01-12 17:37:09 +00:00
David Baker 3706d6e32a js-sdk, not react-sdk 2017-01-12 17:14:51 +00:00
David Baker 4ca4441f77 Build js-sdk in travis too 2017-01-12 17:09:49 +00:00
David Baker 05d2836581 Retest 2017-01-12 16:55:34 +00:00
David Baker 2708859b34 npm install the js-sdk 
otherwise we don't have uglifyjs
 2017-01-12 16:38:48 +00:00
David Baker 314c57ca6b Retest 2017-01-12 16:29:27 +00:00
Matthew Hodgson cc8b3d4ba4 spell out email invites better 2017-01-12 13:46:19 +00:00
David Baker fcc40ee372 It's now just build 2017-01-11 19:03:20 +00:00
David Baker 5142cb63c8 s/build/compile/ for js sdk 2017-01-11 18:18:46 +00:00
David Baker a4aa74e85a Build the js-sdk in the CI script 
now it's transpiled
 2017-01-11 17:18:37 +00:00
David Baker 1f96467145 Merge pull request #609 from matrix-org/luke/fix-join-part-collapsing-redacted-joins 
Fix redacted member events being visible
 2017-01-11 17:10:35 +00:00
David Baker 4e1af30186 Merge pull request #611 from matrix-org/luke/fix-join-part-collapsing-use-state-key 
Use `getStateKey` instead of `getSender`
 2017-01-11 17:09:14 +00:00
Luke Barnard baaf827c48 Use `getStateKey` instead of `getSender` 
This makes sure that the kickee is not the user used for the MemberEventListSummary
 2017-01-11 17:03:14 +00:00
Luke Barnard 6e2a75bbee Fix redacted member events being visible 
This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765.
 2017-01-11 11:27:07 +00:00
David Baker e95f5b959f Merge pull request #608 from matrix-org/dbkr/move_screen_sharing_error 
Move screen sharing error check into platform
 2017-01-11 10:12:51 +00:00
David Baker 37d9108ceb Add error popup if screen sharing fails 2017-01-11 10:06:48 +00:00
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