OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,653 Commits
186 Branches
525 Tags
448 MiB
Commit Graph

251 Commits (4a1b04e57be363f3c45f356c1862cf5853769e10)

Author SHA1 Message Date
David Baker 205676a97d Back to develop js-sdk & react-sdk 2017-01-17 11:30:59 +00:00
David Baker ae7820e8f2 Fix merge 2017-01-16 13:37:18 +00:00
David Baker 3023ea5335 Merge branch 'release-v0.9.6' 2017-01-16 13:34:41 +00:00
David Baker 22060ac5a4 v0.9.6 2017-01-16 13:26:22 +00:00
David Baker 231306ea7c Update js-sdk & react-sdk 2017-01-16 13:24:44 +00:00
David Baker e1c1937855 v0.9.6-rc.1 2017-01-13 11:21:08 +00:00
David Baker 40545bd48e Released react-sdk & js-sdk 2017-01-13 11:15:55 +00:00
David Baker 717aa94ba9 Merge pull request #2917 from vector-im/dbkr/fix_windows_shortcuts 
Hopefully fix Windows shortcuts
 2017-01-12 10:43:26 +00:00
David Baker 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
David Baker 06718c580e Hopefully fix Windows shortcuts 
* Revert 79d164309f
   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
Richard van der Hoff 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
Matthew Hodgson b0319ec0f1 merge 2016-12-24 19:32:29 +00:00
Matthew Hodgson 747408871d v0.9.5 2016-12-24 19:07:31 +00:00
Matthew Hodgson 3f3772463b bump react dep 2016-12-24 19:04:00 +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
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 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 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 519af6a5d0 Bump to matrix-react-sdk 0.8.3 2016-12-22 14:14:44 +00:00
David Baker 1e7e9d6101 v0.9.2 2016-12-16 17:44:22 +00:00
David Baker 4745b3efeb released js-sdk & react-sdk 2016-12-16 17:40:37 +00:00
David Baker c80d1c15d2 dev js-sdk & react-sdk 2016-12-09 20:12:37 +00:00
David Baker b9ba795cb0 v0.9.1 2016-12-09 20:05:41 +00:00
David Baker 93b3857a9b Merge branch 'develop' into release-v0.9.1 2016-12-09 20:03:10 +00:00
David Baker 5414b5d189 Released js-sdk & react-sdk 2016-12-09 19:58:33 +00:00
David Baker b4e362d700 Bump to electron 1.4.11 2016-12-09 19:14:59 +00:00
David Baker a9fcf106ab v0.9.1-rc.2 2016-12-06 16:06:15 +00:00
David Baker d4ac5f829f react-sdk rc.2 2016-12-06 16:04:46 +00:00
David Baker df5143c818 v0.9.1-rc.1 2016-12-05 18:02:03 +00:00
David Baker 6934b7ed56 released js-sdk & react-sdk 2016-12-05 17:53:06 +00:00
David Baker b6aa7f430c Merge pull request #2653 from vector-im/dbkr/electron_dist_tweaks 
Final bits to prepare electron distribtion:
 2016-12-05 16:22:44 +00:00
David Baker ec959f0052 Update name & repo to reflect renamed repository 
Unsure whether we want to go through doing a complete
s/vector/riot/ - I'm not sure there's a whole lot of point.
 2016-12-05 14:40:06 +00:00
David Baker 72de35a2a1 Switch back to Squirrel installer 
which it turns out is by far the lesser of two evils.

 * Auto-update works with a proxy
 * The update process is reasonably atomic & faster, rather than
   running the uninstaller then the installer, leaving you with a
   broken install if you shut down your machine at the wrong time
 * Gets the update URL the same way as on mac, rather than baking
   it into the app at build time from package.json. We don't want
   it in package.json because only our builds want our update URL.
 2016-12-05 14:08:27 +00:00
David Baker 7871a3edb5 Just rm dist in the clean step 2016-12-01 19:43:04 +00:00
David Baker 9f51e2c407 Auto-update & build process with NSIS for windows 
Amalgamate the electron build packaging into one script.
Use update_base_url so we can compute the actual URL in the
script for windows (because we need to put it in the build) and
at runtime for mac os.
 2016-12-01 19:33:42 +00:00
David Baker e3290c1117 Switch to new auto-update & add linux build 
* Remove squirrel hooks (the installing & uninstalling is now
   done by the, er, installer)
 * Switch to electron-auto-update
 * Shorten initial update delay because we no longer need to wait
   for squirrel to release a lock file
 * Change update URLs because windows is now one installer for
   both 32 & 64 bit.
 * Update electron-builder to 10 where NSIS is now the default
   target for Windows.
 * Add linux to the target list, building a deb.
 * Remove sqirrel-specific installation spinner
 * Remove redundant !**/*  from files
 2016-12-01 11:35:26 +00:00
David Baker 4988f0603f Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks 2016-11-30 18:13:14 +00:00
David Baker 55062c7ec5 Update to electron 1.4.8 
Which uses a new enough build of chromium that it accepts our SSL
certs.
 2016-11-28 16:37:43 +00:00
David Baker c7635a362f Don't copy config, check update url 2016-11-25 20:08:45 +00:00
David Baker a870ea2389 Add electron config 
Which has the update URL in it
 2016-11-24 17:24:11 +00:00
Richard van der Hoff 10650d2cd1 Unpin js-sdk and react-sdk 2016-11-22 22:14:05 +00:00
Matthew Hodgson 5cd4f88b8c v0.9.0 2016-11-19 02:04:32 +02:00
Richard van der Hoff 5d02c72687 Bump to react 15.4 
Add dependencies on react 15.4. Some of the things we pull in from
matrix-react-sdk won't work properly against 15.2 / 15.0.
 2016-11-17 10:34:12 +00:00
David Baker 68a3505091 Fix packaging 
* Package images & config in bundle:dev
 * Don't include two vector- prefixes
 2016-11-11 18:18:51 +00:00
David Baker 5b7f629996 Build to the 'webapp' directory instead 
People may have config files in vector/ so it would be nonideal
if we started overwriting them / blowing them away.
 2016-11-08 15:46:21 +00:00
David Baker d150ee0d05 Missed a -w 2016-11-08 15:30:19 +00:00