205676a97d
Back to develop js-sdk & react-sdk
2017-01-17 11:30:59 +00:00
0456cadff6
Merge branch 'master' into develop
2017-01-17 11:30:31 +00:00
aa6d584ae3
Merge pull request #2965 from vector-im/rav/fix_font_links
...
Fix links to fonts and images from CSS
2017-01-17 11:00:27 +00:00
ef07a6035e
Fix links to fonts and images from CSS
...
https://github.com/vector-im/riot-web/pull/2961 put the CSS in a subdirectory,
which meant that links from CSS to images and fonts were broken. Fix them up.
2017-01-17 10:48:38 +00:00
86b66120d0
Merge pull request #2961 from vector-im/rav/build_hash_in_filename
...
Put parent build hash in webpack output filenames
2017-01-17 09:58:27 +00:00
b3bff92cc2
Put parent build hash in webpack output filenames
...
In order to better support a world where old build artifacts are available
(which is necessary to support bundle.js splitting), collect all the webpack
artifacts for the build into a single directory. Then we'll be able to clear
out old builds after a few weeks, knowing they won't be in use any more.
2017-01-16 18:01:25 +00:00
ae7820e8f2
Fix merge
2017-01-16 13:37:18 +00:00
3023ea5335
Merge branch 'release-v0.9.6'
2017-01-16 13:34:41 +00:00
22060ac5a4
v0.9.6
2017-01-16 13:26:22 +00:00
3f3a31e475
Prepare changelog for v0.9.6
2017-01-16 13:26:21 +00:00
231306ea7c
Update js-sdk & react-sdk
2017-01-16 13:24:44 +00:00
61251d20c1
Merge pull request #2846 from uhoreg/patch-2
...
update README to point to new names/locations
2017-01-13 22:05:55 +00:00
ccf7db7cc2
Fix a couple more references to vector-web in README.md
2017-01-13 15:06:29 -05:00
e1c1937855
v0.9.6-rc.1
2017-01-13 11:21:08 +00:00
9471c30f89
Prepare changelog for v0.9.6-rc.1
2017-01-13 11:21:08 +00:00
40545bd48e
Released react-sdk & js-sdk
2017-01-13 11:15:55 +00:00
6b02bf8e8c
Merge pull request #2920 from vector-im/dbkr/ci_build_js_sdk
...
Build the js-sdk in the CI script
2017-01-12 17:37:18 +00:00
0d05e607f0
install js-sdk in travis too
2017-01-12 17:24:28 +00:00
717aa94ba9
Merge pull request #2917 from vector-im/dbkr/fix_windows_shortcuts
...
Hopefully fix Windows shortcuts
2017-01-12 10:43:26 +00:00
9caba57c14
Merge pull request #2921 from vector-im/dbkr/update_readme_for_js_sdk_transpiled
...
Update README now the js-sdk has a transpile step
2017-01-12 10:05:55 +00:00
70f48343ee
It's now just build
2017-01-11 19:03:52 +00:00
f17f103d12
s/build/compile/ for js sdk
2017-01-11 18:19:44 +00:00
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
10f0631487
Build the js-sdk in the CI script
...
now it's transpiled
2017-01-11 17:20:27 +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
06718c580e
Hopefully fix Windows shortcuts
...
* Revert 79d164309fhttps://github.com/vector-im/riot-web/issues/2775 but #79d1643
seems to break shortcut creation as far as I can see.
2017-01-11 16:27:40 +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
d1a9695a35
update README to point to new names/locations
2016-12-28 20:57:31 -05:00
b0319ec0f1
merge
2016-12-24 19:32:29 +00:00
6e0f83a298
Merge branch 'release-v0.9.5'
2016-12-24 19:29:42 +00:00
747408871d
v0.9.5
2016-12-24 19:07:31 +00:00
0129da4dd6
Prepare changelog for v0.9.5
2016-12-24 19:07:30 +00:00
3f3772463b
bump react dep
2016-12-24 19:04:00 +00:00
4de042bf58
empirically fix win32 shortcut in start menu
2016-12-24 19:03:46 +00:00
8c523be6f5
add gnu-tar to debian electron build deps
2016-12-24 19:03:46 +00:00
078493912c
make electron send email validation URLs with a nextlink of riot.im rather than file:///
2016-12-24 19:03:46 +00:00
cbf105f2a0
Revert "bump to dep on react-sdk 0.8.3-electron"
...
This reverts commit bba6664b1c
2016-12-24 18:59:41 +00:00
bba6664b1c
bump to dep on react-sdk 0.8.3-electron
2016-12-24 18:58:42 +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
David Baker