Matthew Hodgson
33f0eaada0
autogen _components.css
2016-12-28 02:02:23 +00:00
Matthew Hodgson
c5fa84cd28
autogenerate the _components.scss index
2016-12-28 02:02:05 +00:00
Matthew Hodgson
bacb284415
basic jig for SASS-based themed CSS (one bundle per theme)
2016-12-28 02:01:28 +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
Kevin McDonald
650269d356
Add ISSUE_TEMPLATE
2016-12-26 21:33:27 -07:00
Matthew Hodgson
9c4671568d
fix disasterous thinko in 69b277b282
2016-12-24 22:33:04 +00:00
Matthew Hodgson
b0319ec0f1
merge
2016-12-24 19:32:29 +00:00
Matthew Hodgson
6e0f83a298
Merge branch 'release-v0.9.5'
2016-12-24 19:29:42 +00:00
Matthew Hodgson
747408871d
v0.9.5
2016-12-24 19:07:31 +00:00
Matthew Hodgson
0129da4dd6
Prepare changelog for v0.9.5
2016-12-24 19:07:30 +00:00
Matthew Hodgson
3f3772463b
bump react dep
2016-12-24 19:04:00 +00:00
Matthew Hodgson
4de042bf58
empirically fix win32 shortcut in start menu
2016-12-24 19:03:46 +00:00
Matthew Hodgson
8c523be6f5
add gnu-tar to debian electron build deps
2016-12-24 19:03:46 +00:00
Matthew Hodgson
078493912c
make electron send email validation URLs with a nextlink of riot.im rather than file:///
2016-12-24 19:03:46 +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
cbf105f2a0
Revert "bump to dep on react-sdk 0.8.3-electron"
...
This reverts commit bba6664b1c
2016-12-24 18:59:41 +00:00
Matthew Hodgson
bba6664b1c
bump to dep on react-sdk 0.8.3-electron
2016-12-24 18:58:42 +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
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
