Commit graph

2683 commits

Author SHA1 Message Date
Matthew Hodgson
acb85b7b72 f1x0r CSS comment 2017-01-18 16:06:02 +00:00
Matthew Hodgson
708fd640f7 unbreak switching after vdh's webpack changes 2017-01-18 14:06:20 +00:00
Matthew Hodgson
14eec6d982 Merge branch 'develop' into matthew/postcss 2017-01-18 12:44:42 +00:00
Matthew Hodgson
69bedf0d37 review feedback 2017-01-18 12:42:48 +00:00
Matthew Hodgson
0cd895b417 kill the moofle 2017-01-17 19:19:30 +00:00
Matthew Hodgson
6c88201e23 use ye olde rel='alternate stylesheets' for theming 2017-01-17 19:14:16 +00:00
Richard van der Hoff
641a5c244c Merge pull request #2969 from vector-im/rav/keep_old_bundles
Update redeploy script to keep old bundles
2017-01-17 14:59:12 +00:00
David Baker
6257019926 Merge pull request #2967 from vector-im/dbkr/include_version_in_update_check
Include current version in update check explicitly
2017-01-17 14:42:03 +00:00
Matthew Hodgson
c9c58ab0ec fix up the contextual menu button 2017-01-17 14:10:09 +00:00
David Baker
cf92e7f64b Clarify comment 2017-01-17 14:04:42 +00:00
Richard van der Hoff
8371006d90 Update redeploy script to keep old bundles
... so that people using old versions of the master chunk can still load other
webpack chunks.
2017-01-17 13:55:33 +00:00
David Baker
3b109f7612 Include current version in update check explicitly
Hopefully fix https://github.com/vector-im/riot-web/issues/2847
2017-01-17 13:16:08 +00:00
David Baker
ebc2ad54d6 Merge pull request #2966 from vector-im/rav/move_bundle_again
Add another layer of directory to webpack chunks
2017-01-17 12:04:28 +00:00
Richard van der Hoff
4a1b04e57b Add another layer of directory to webpack chunks 2017-01-17 12:00:20 +00:00
David Baker
205676a97d Back to develop js-sdk & react-sdk 2017-01-17 11:30:59 +00:00
David Baker
0456cadff6 Merge branch 'master' into develop 2017-01-17 11:30:31 +00:00
Richard van der Hoff
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
Richard van der Hoff
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
David Baker
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
Matthew Hodgson
3bdb330f5b cheeky hack to get the ctxt menu colors right 2017-01-17 09:57:01 +00:00
Matthew Hodgson
4f8d3b0e2b more factoring 2017-01-17 02:00:34 +00:00
Matthew Hodgson
87fd136e21 factor out remaining # colours 2017-01-16 23:13:47 +00:00
Matthew Hodgson
cab5bf8849 fix a lone lost opera vendor prefix 2017-01-16 19:00:44 +00:00
Matthew Hodgson
d74dfc9ee7 strip out unneeded -ms- prefixes 2017-01-16 18:58:37 +00:00
Matthew Hodgson
c305b72b91 strip out unneeded -moz- prefixes 2017-01-16 18:58:02 +00:00
Matthew Hodgson
dc1563d916 strip out unneeded webkit prefixes now we're using autoprefixer 2017-01-16 18:55:29 +00:00
Matthew Hodgson
906d42688e make autoprefixer work by reordering it 2017-01-16 18:40:29 +00:00
Richard van der Hoff
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
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
3f3a31e475 Prepare changelog for v0.9.6 2017-01-16 13:26:21 +00:00
David Baker
231306ea7c Update js-sdk & react-sdk 2017-01-16 13:24:44 +00:00
Matthew Hodgson
002339fb86 factor out some more colours 2017-01-16 02:10:45 +00:00
Matthew Hodgson
8b38a326cb merge package.json 2017-01-16 00:20:18 +00:00
Richard van der Hoff
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
Hubert Chathi
ccf7db7cc2 Fix a couple more references to vector-web in README.md 2017-01-13 15:06:29 -05:00
David Baker
e1c1937855 v0.9.6-rc.1 2017-01-13 11:21:08 +00:00
David Baker
9471c30f89 Prepare changelog for 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
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
David Baker
0d05e607f0 install js-sdk in travis too 2017-01-12 17:24:28 +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
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
David Baker
70f48343ee It's now just build 2017-01-11 19:03:52 +00:00
David Baker
f17f103d12 s/build/compile/ for js sdk 2017-01-11 18:19:44 +00:00
David Baker
27e311f7e8 Address PR comments 2017-01-11 18:15:06 +00:00
David Baker
5258bf9c84 Update README now the js-sdk has a transpile step 2017-01-11 17:25:58 +00:00
David Baker
10f0631487 Build the js-sdk in the CI script
now it's transpiled
2017-01-11 17:20:27 +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