27e311f7e8
Address PR comments
2017-01-11 18:15:06 +00:00
5258bf9c84
Update README now the js-sdk has a transpile step
2017-01-11 17:25:58 +00:00
97fc92b1bb
Update to electron 1.4.14
...
This pulls in the chrome change that broke geotrust ssl when the
build hit 10 weeks old, so let's get this one out before we hit
more disasters.
2017-01-11 16:53:01 +00:00
15528ef8d7
Merge pull request #2915 from vector-im/dbkr/use_dev_tools_role
...
Use the role for 'toggle dev tools'
2017-01-11 14:50:15 +00:00
b71f96e4e5
Use the role for 'toggle dev tools'
...
Let electron handle it rather than doing it ourselves
2017-01-11 10:28:04 +00:00
278de1398b
Merge pull request #2909 from vector-im/dbkr/enable_screen_sharing
...
Enable screen sharing easter-egg in desktop app
2017-01-11 10:12:57 +00:00
c5459a2f19
Enable screen sharing easter-egg in desktop app
2017-01-10 18:39:21 +00:00
6a1af891b7
Use a custom script to copy resources ( #2893 )
...
All of those cpx invocations were getting unwieldy, and I suspect the exotic
quoting needed to run them under parallelshell was breaking things on windows.
Replace the unwieldy cpx invocations with an unwieldy custom script.
2017-01-06 10:43:13 +00:00
b0319ec0f1
merge
2016-12-24 19:32:29 +00:00
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
79d164309f
empirically fix win32 shortcut in start menu
2016-12-24 18:13:33 +00:00
f2afcc0bc8
add gnu-tar to debian electron build deps
2016-12-24 18:13:20 +00:00
43f82cd95d
Merge pull request #2809 from k3vmcd/master
...
add Debian Stretch install steps to readme
2016-12-24 16:47:20 +00:00
2b70cb436e
add Debian Stretch install steps to readme
2016-12-23 22:32:16 -07:00
9a861f46d0
make electron send email validation URLs with a nextlink of riot.im rather than file:///
2016-12-24 03:18:12 +00:00
bb28903c8e
fix warning page
2016-12-24 01:36:00 +00:00
e8eadc5d20
Merge pull request #2793 from joelostblom/patch-1
...
Update desktop build instructions fixes #2792
2016-12-22 20:42:01 +00:00
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
1678a25fd6
Merge branch 'master' into develop
2016-12-22 18:33:37 +00:00
ff70b0a2c8
v0.9.4
2016-12-22 18:24:04 +00:00
3803c64226
prep 0.9.4 changelog
2016-12-22 18:15:00 +00:00
35a541c824
Bump to olm 2.1.0
2016-12-22 17:23:27 +00:00
ab8420f5a9
Bump to olm 2.1.0
2016-12-22 16:30:14 +00:00
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
ed35a90cfb
Back to develop js & react sdk
2016-12-22 14:36:05 +00:00
d8bce0f202
v0.9.3
2016-12-22 14:18:23 +00:00
e6f600bb47
Prepare changelog for v0.9.3
2016-12-22 14:18:22 +00:00
519af6a5d0
Bump to matrix-react-sdk 0.8.3
2016-12-22 14:14:44 +00:00
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
6d4abac016
Merge pull request #2755 from Mikaela/readme-nativefier
...
README.md: fix GFMD for nativefier
2016-12-22 02:37:17 +00:00
d34cb80b68
CSS for the delete threepid button
2016-12-21 18:50:35 +00:00
57641f7228
typo
2016-12-20 00:05:49 +00:00
9ae86f2585
README.md: fix GFMD for nativefier
...
GitHub Flavoured MarkDown parsed this as
`sudo npm install nativefier -g nativefier https://riot.im/app/ ` which
is incorrect.
2016-12-17 21:17:58 +02:00
1e7e9d6101
v0.9.2
2016-12-16 17:44:22 +00:00
8bbc16ed4b
Prepare changelog for v0.9.2
2016-12-16 17:44:22 +00:00
4745b3efeb
released js-sdk & react-sdk
2016-12-16 17:40:37 +00:00
09f79b94dd
Merge pull request #2750 from vector-im/dbkr/roomdir_remove_client_filter
...
Remove the client side filtering from the room dir
2016-12-16 16:44:05 +00:00
42357dee0b
Typo
2016-12-16 16:36:24 +00:00
2e73cd6c4d
PR feedback
2016-12-16 16:24:24 +00:00
161978ab05
Fix tests
2016-12-16 15:20:52 +00:00
994bc9279f
Remove the client side filtering from the room dir
...
This removes the ability for the client to filter remote room
directories by network, since the /thirdparty/protocols API does
not yet work for remote servers. They would only get the main list
now though anyway, so there is no point in us continuing to support
it.
2016-12-16 14:17:13 +00:00
fb08910db3
Read the icon from the right place
...
Also don't define image widths in the HTML as it's done in the CSS.
2016-12-16 10:14:38 +00:00
e607f49ae6
Merge pull request #2745 from vector-im/rav/set_olm_heap_size
...
Configure olm memory size
2016-12-15 17:19:04 +00:00
52cf1f6a4b
Missed a wire_onclick
2016-12-15 16:36:14 +00:00
61f9966fe0
Merge pull request #2747 from vector-im/dbkr/third_party_filter
...
Support room dir 3rd party network filtering
2016-12-15 16:21:28 +00:00
5f7cdb8d42
s/wire_onclick/handleClicks/
...
and actually pass handleClicks false as appropriate
2016-12-15 14:29:16 +00:00
901c0e7e41
Remove unused event params
2016-12-15 14:24:55 +00:00
98cad8779c
Add instance_id to initial state
2016-12-15 10:42:11 +00:00
fc597ba86e
Underscore for private method
2016-12-15 10:41:22 +00:00
f5bd8abfda
Support room dir 3rd party network filtering
...
As per https://github.com/matrix-org/synapse/pull/1676
The existing local config system still exists and is used for
remote home server directories (since /thirdparty/protocols
doesn't support listing remote home servers, and also because
people are using it).
2016-12-14 15:41:15 +00:00
David Baker