fcb1d7a664
Merge pull request #575 from kyrias/commonmark
...
Replace marked with commonmark
2017-01-17 11:57:08 +00:00
205676a97d
Back to develop js-sdk & react-sdk
2017-01-17 11:30:59 +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
231306ea7c
Update js-sdk & react-sdk
2017-01-16 13:24:44 +00:00
1d5112db5d
Back to develop js-sdk
2017-01-16 13:22:57 +00:00
a9256b0ab1
v0.8.5
2017-01-16 13:21:34 +00:00
3679e47002
js-sdk 0.7.4
2017-01-16 13:19:24 +00:00
8b38a326cb
merge package.json
2017-01-16 00:20:18 +00:00
e1c1937855
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
3ac9ed7f8f
v0.8.5-rc.1
2017-01-13 11:14:26 +00:00
57652c06e3
released js-sdk
2017-01-13 11:13:17 +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
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 https://github.com/vector-im/riot-web/commit/79d164309f7926cb1c24008e464a516d7a872325
as it seems to break shortcuts altogether
* Update electron-builder (and add the squirrel windows package
that the newer version now requires: it's been split out). This
uses a newer version of squirrel which has some fixes for
shortcuts.
I'm unsure exactly what was going wrong originally in
https://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
691fe611d6
experimental postcss
2017-01-10 11:06:09 +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
bacb284415
basic jig for SASS-based themed CSS (one bundle per theme)
2016-12-28 02:01:28 +00:00
b0319ec0f1
merge
2016-12-24 19:32:29 +00:00
747408871d
v0.9.5
2016-12-24 19:07:31 +00:00
3f3772463b
bump react dep
2016-12-24 19:04:00 +00:00
97514cf80e
Merge branch 'master' into develop
2016-12-24 19:03:42 +00:00
45bfb93f17
v0.8.4
2016-12-24 19:03:08 +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
223caae842
Merge branch 'master' into develop
2016-12-24 18:54:00 +00:00
1976bb70bd
v0.8.3-electron
2016-12-24 18:53:24 +00: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
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
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
519af6a5d0
Bump to matrix-react-sdk 0.8.3
2016-12-22 14:14:44 +00:00
9cbe401866
Back to js-sdk develop
2016-12-22 14:13:48 +00:00
9bf98161a2
v0.8.3
2016-12-22 14:09:42 +00:00
57412b3315
released matrix-js-sdk
2016-12-22 14:06:42 +00:00
1e7e9d6101
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
70c7facb6f
matrix-js-sdk dev
2016-12-16 17:30:43 +00:00
29a05dda20
v0.8.2
2016-12-16 17:26:13 +00:00
03d9d28205
matrix-js-sdk 0.7.2
2016-12-16 17:24:17 +00:00
c80d1c15d2
dev js-sdk & react-sdk
2016-12-09 20:12:37 +00:00
b9ba795cb0
v0.9.1
2016-12-09 20:05:41 +00:00
93b3857a9b
Merge branch 'develop' into release-v0.9.1
2016-12-09 20:03:10 +00:00
5414b5d189
Released js-sdk & react-sdk
2016-12-09 19:58:33 +00:00
1fbc938f87
js-sdk develop
2016-12-09 19:57:44 +00:00
57c56992f1
v0.8.1
2016-12-09 19:53:27 +00:00
Kegsay