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
b06d045188
Merge pull request #2808 from vector-im/matthew/electron-captcha2
...
make electron send email validation URLs with a nextlink of riot.im
2016-12-24 18:38:29 +00:00
Matthew Hodgson
79d164309f
empirically fix win32 shortcut in start menu
2016-12-24 18:13:33 +00:00
Matthew Hodgson
f2afcc0bc8
add gnu-tar to debian electron build deps
2016-12-24 18:13:20 +00:00
Matthew Hodgson
43f82cd95d
Merge pull request #2809 from k3vmcd/master
...
add Debian Stretch install steps to readme
2016-12-24 16:47:20 +00:00
Kevin McDonald
2b70cb436e
add Debian Stretch install steps to readme
2016-12-23 22:32:16 -07:00
Matthew Hodgson
9a861f46d0
make electron send email validation URLs with a nextlink of riot.im rather than file:///
2016-12-24 03:18:12 +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
bb28903c8e
fix warning page
2016-12-24 01:36:00 +00:00
Matthew Hodgson
b1c4c759f4
blind fix for captcha on electron
2016-12-23 14:35:40 +00:00
Matthew Hodgson
e8eadc5d20
Merge pull request #2793 from joelostblom/patch-1
...
Update desktop build instructions fixes #2792
2016-12-22 20:42:01 +00:00
joelostblom
e741a4f294
Update desktop build instructions fixes #2792
...
This is based on what I had to do to get the desktop app running, as per the advice in https://github.com/vector-im/riot-web/issues/2792 . I am not familiar with `npm`, so please change this pull request if there is a more appropriate way of achieving the same result.
2016-12-22 14:53:03 -05:00
Richard van der Hoff
1678a25fd6
Merge branch 'master' into develop
2016-12-22 18:33:37 +00:00
Richard van der Hoff
ff70b0a2c8
v0.9.4
2016-12-22 18:24:04 +00:00
Richard van der Hoff
3803c64226
prep 0.9.4 changelog
2016-12-22 18:15:00 +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
Richard van der Hoff
35a541c824
Bump to olm 2.1.0
2016-12-22 17:23:27 +00:00
Richard van der Hoff
ab8420f5a9
Bump to olm 2.1.0
2016-12-22 16:30:14 +00:00
David Baker
fa46757830
Merge pull request #2784 from vector-im/dbkr/delete_threepid
...
CSS for the delete threepid button
2016-12-22 15:31:38 +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
ed35a90cfb
Back to develop js & react sdk
2016-12-22 14:36:05 +00:00
David Baker
d8bce0f202
v0.9.3
2016-12-22 14:18:23 +00:00
David Baker
e6f600bb47
Prepare changelog for v0.9.3
2016-12-22 14:18:22 +00:00
David Baker
519af6a5d0
Bump to matrix-react-sdk 0.8.3
2016-12-22 14:14:44 +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
Richard van der Hoff
c6c4aff8ae
Redeploy script: put each build in a separate directory ( #2790 )
...
* Redeploy script: put each build in a separate directory
Hopefully this will fix the problem whereby we can overwrite the live
deployment.
2016-12-22 12:02:54 +00:00
Matthew Hodgson
6d4abac016
Merge pull request #2755 from Mikaela/readme-nativefier
...
README.md: fix GFMD for nativefier
2016-12-22 02:37:17 +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
d34cb80b68
CSS for the delete threepid button
2016-12-21 18:50:35 +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
Luke Barnard
714b63519a
Remove empty line
2016-12-20 11:50:35 +00:00
Matthew Hodgson
d0d056e308
hide read markers
2016-12-20 02:26:23 +00:00
Matthew Hodgson
57641f7228
typo
2016-12-20 00:05:49 +00:00
Luke Barnard
583f86eb06
Handle the case where the other 1-1 user left
2016-12-19 18:41:34 +00:00
