14eec6d982
Merge branch 'develop' into matthew/postcss
2017-01-18 12:44:42 +00:00
69bedf0d37
review feedback
2017-01-18 12:42:48 +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
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
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 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
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
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
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
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
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
b4e362d700
Bump to electron 1.4.11
2016-12-09 19:14:59 +00:00
a9fcf106ab
v0.9.1-rc.2
2016-12-06 16:06:15 +00:00
d4ac5f829f
react-sdk rc.2
2016-12-06 16:04:46 +00:00
df5143c818
v0.9.1-rc.1
2016-12-05 18:02:03 +00:00
6934b7ed56
released js-sdk & react-sdk
2016-12-05 17:53:06 +00:00
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
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
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
7871a3edb5
Just rm dist in the clean step
2016-12-01 19:43:04 +00:00
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
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
4988f0603f
Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks
2016-11-30 18:13:14 +00:00
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
c7635a362f
Don't copy config, check update url
2016-11-25 20:08:45 +00:00
a870ea2389
Add electron config
...
Which has the update URL in it
2016-11-24 17:24:11 +00:00
10650d2cd1
Unpin js-sdk and react-sdk
2016-11-22 22:14:05 +00:00
5cd4f88b8c
v0.9.0
2016-11-19 02:04:32 +02:00
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
68a3505091
Fix packaging
...
* Package images & config in bundle:dev
* Don't include two vector- prefixes
2016-11-11 18:18:51 +00:00
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
d150ee0d05
Missed a -w
2016-11-08 15:30:19 +00:00
1e2cd9c2d1
Build all of the vector dir in the build process
...
So the whole vector/ directory can now be removed during the build
process and we don't ship random files that end up in the vector
directory.
2016-11-08 14:30:12 +00:00
6681205337
Slight grab-bag of fixes for electron on Windows
...
* Implement the squirrel install / uninstall hooks (so we have
a start menu entry / desktop shortcut)
* Wait longer before checking for update
* Set the window icon
* Add a 'file' menu
* Bump electron-builder
* Add the icon url for the control panel entry
2016-11-07 11:41:41 +00:00
6da1a1077d
0.8.4 has been released
2016-11-04 13:03:11 +00:00
527c390152
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 15:35:45 +00:00
ff462580b0
Use webpack-dev-server instead of http-server
...
Advantages:
* blocks while a rebuild is in progress so you're less likely to reload the
old version
* serves from memory rather than disk, so we no longer need to turn off the
cachebuster to avoid filling the disk with bundles. Empirically, seems to
last a plausible amount of time without OOMing; there's no real reason to
believe it would use any more memory than webpack itself.
* That in turn means we no longer need the hack to stop chrome caching old
sourcemaps (because the sourcemap now has a cachebuster in its name).
* one fewer process for parallelshell to (fail to) manage.
* in future, we could consider the fancy hot-reload functionality.
2016-11-03 15:08:55 +00:00
caa3cb7d89
Electron support
...
From https://github.com/vector-im/vector-web/pull/2511 but with
just the actual electron changes
2016-11-02 18:49:28 +00:00
a714edbf2b
Implement Platforms
...
Provide WebPlatform for functionality specific to the web version of vector.
2016-11-02 15:12:51 +00:00
03caaeef07
Back to develop js-sdk & react-sdk
2016-11-02 11:47:30 +00:00
91793a7a8e
v0.8.4-rc.2
2016-11-02 11:40:04 +00:00
4fb273284d
v0.8.4-rc.1
2016-11-02 11:17:36 +00:00
890751951c
Released js-sdk & react-sdk
2016-11-02 11:11:40 +00:00
f17e851435
Rename the package script/output dir to 'dist'
...
To match conventions from other projects and match the release
script which expects releasde artefacts in dist/
2016-11-01 15:22:06 +00:00
b174d49f9d
Merge pull request #2515 from vector-im/rav/cache_busting
...
Put a cachebuster in the names of CSS and JS files
2016-10-26 16:58:27 +01:00
c19538d6ce
Merge branch 'develop' into rav/cache_busting
2016-10-26 16:50:45 +01:00
3adf5fe3fd
Merge pull request #2517 from vector-im/rav/upgrade_olm
...
Bump to olm 2.0.0
2016-10-26 16:50:22 +01:00
de1f7861d6
Bump to olm 2.0.0
2016-10-26 16:20:42 +01:00
5a58c8bda4
Don't include the world in the published packages
...
We ended up including all sorts of stuff in our published packages. Let's take
the opposite approach and include useful stuff rather than exclude unuseful
stuff.
2016-10-26 15:35:54 +01:00
6396c60645
Put a cachebuster in the names of CSS and JS files
...
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.
We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
2016-10-26 15:20:59 +01:00
53e5894759
Merge branch 'develop' into rav/webpack_olm
2016-10-26 15:13:57 +01:00
e1919c5ea3
Don't include two copies of the CSS in the tarball
...
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
2016-10-26 14:43:42 +01:00
fcf683c8a7
Use webpack to copy olm.js
...
Rather than copying olm.js ourselves in package.json, get webpack to do it for
us by declaring it as a second entry point.
2016-10-26 14:29:21 +01:00
e02e0219a7
Add plugin that makes babel 6 not break everything
2016-10-17 16:28:14 +01:00
d04201d069
Replace stage & es2017 with specific plugins
...
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-17 16:28:14 +01:00
82de2ca4ec
Remove transform-runtime
...
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-17 16:28:14 +01:00
f20b2593bc
move babelcheck.js to scripts/
2016-10-17 16:28:14 +01:00
8e0b61ca35
Reminder to restore links + stage2, not stage 0
2016-10-17 16:28:13 +01:00
61a543a694
Add babelcheck.js
...
As per 4bea0c0818
2016-10-17 16:28:13 +01:00
5608e97719
Remove babel-polyfill
...
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-17 16:28:13 +01:00
d6f27add66
Upgrade to babel6 and enable some presets.
2016-10-17 16:28:13 +01:00
ea09a25563
Revert "Switch to babel 6"
2016-10-14 18:50:22 +01:00
40ac80a3e9
Replace stage & es2017 with specific plugins
...
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-14 18:03:22 +01:00
5f747e1a90
Remove transform-runtime
...
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-13 10:57:10 +01:00
e6caf9ece4
move babelcheck.js to scripts/
2016-10-13 09:50:40 +01:00
5ff915476a
Reminder to restore links + stage2, not stage 0
2016-10-12 18:08:52 +01:00
e5d2ebc57c
Add babelcheck.js
...
As per 4bea0c0818
2016-10-12 17:46:11 +01:00
64815b1b0b
Remove babel-polyfill
...
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-12 17:23:01 +01:00
59120d3019
Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc
2016-10-12 17:17:10 +01:00
9245ab01f1
js-sdk & react-sdk develop
2016-10-12 11:52:18 +01:00
59fe9279d1
0.8.3
2016-10-12 11:49:58 +01:00
bca22f26c5
js-sdk & react-sdk release versions
2016-10-12 11:49:21 +01:00
cd7adfed0a
Back to develop react & js sdk
2016-10-05 16:59:25 +01:00
902bf3a0a6
0.8.2
2016-10-05 16:55:45 +01:00
fb2c2ed09a
Use released version of react-sdk & js-sdk
2016-10-05 16:54:24 +01:00
52cae92dd7
Update to linkify 2.1.3
...
To pull in https://github.com/SoapBox/linkifyjs/pull/166
2016-10-04 11:28:28 +01:00
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
f4a6a3c4b2
Update linkify version
...
Fixes https://github.com/vector-im/vector-web/issues/2357
In addition, https://github.com/matrix-org/matrix-react-sdk/pull/500 will make sure failures like this are obvious.
2016-09-27 10:40:02 +01:00
99b0f9eb7c
Back to develop
2016-09-21 17:33:27 +01:00
5248bdd974
0.8.1
2016-09-21 17:30:41 +01:00
2639d10f97
Pin to released js-sdk & react-sdk
2016-09-21 17:29:44 +01:00
cc5c636fa5
Back to develop versions
2016-09-21 12:03:59 +01:00
c4a2df75eb
0.8.0
2016-09-21 12:02:41 +01:00
3eed711b34
Use released versions
2016-09-21 12:01:59 +01:00
f6fb1561d7
Update the version of olm to 1.3.0
2016-09-15 11:33:37 +01:00
d65b791b2b
bump draft-js to 0.8.1 (as with matrix-react-sdk)
2016-09-12 18:31:22 +05:30
31dd49ffd7
Bump to olm 1.2.0
2016-09-06 22:33:21 +01:00
0494dff545
Merge branch 'master' into develop
2016-09-02 17:23:02 +01:00
e63e6e7016
0.7.5-r3
2016-09-02 17:21:30 +01:00
dec62ab92c
bump react-sdk
2016-09-02 17:20:23 +01:00
6c8a492637
Bump to olm 1.1.0
...
Olm 1.0.0 made broken OlmAccounts.
2016-09-02 12:01:27 +01:00
9709a38250
merge master
2016-09-01 22:38:40 +01:00
06ca94c1e6
0.7.5-r2
2016-09-01 22:29:36 +01:00
a20962ac14
bump to react-sdk v0.6.5-r1
2016-09-01 22:28:39 +01:00
a2694113d3
Merge pull request #2009 from vector-im/rav/enable_react_checks
...
Turn react consistency checks back on in develop builds
2016-08-30 14:57:49 +01:00
c7eba0f292
repin deps to dev
2016-08-30 13:52:35 +01:00
5f233d75f2
0.7.5-r1
2016-08-28 18:09:20 +01:00
45c013f2f2
0.7.5
2016-08-28 18:07:33 +01:00
ef8f9ecbf3
pin matrix-js-sdk and matrix-react-sdk deps for release
2016-08-28 17:36:57 +01:00
abca5faf78
pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010
2016-08-25 18:30:35 +01:00
21ffe22375
Turn react consistency checks back on in develop builds
...
The react checks are useful on /develop, to catch programming errors earlier,
and the original reason for turning them off (so that we could meaningfully
compare performance between /develop and /beta) is no longer so
relevant.
This reverts commit b5f029d10e
2016-08-25 17:06:12 +01:00
4c9ade5ecb
Use cpx to copy olm.js, and add watcher
...
We are now using `cpx` to copy the emojione files, so we might as well use it
for olm.js, rather than rolling our own - particularly since that makes it easy
to add a watcher for `npm start`.
We have to add a `-L` to the `cpx` invocation, otherwise, if olm is a
symlink (as is useful for development), cpx ends up watching the symlink, which
obviously never changes.
2016-08-15 12:16:08 +01:00
1d435890af
Unpin react-sdk and js-sdk
2016-08-15 12:15:24 +01:00
8a2b2daad7
Revert "Unpin react-sdk and js-sdk"
...
I messed this up and removed staticfiles.js by accident
This reverts commit 21334cab28
2016-08-15 12:13:58 +01:00
21334cab28
Unpin react-sdk and js-sdk
2016-08-15 12:11:35 +01:00
0afdf5d8e4
Merge pull request #1959 from vector-im/rav/device_display_name
...
Make up a device display name
2016-08-12 11:48:12 +01:00
3a819a29b7
Make up a device display name
...
Pass a default device name into react-sdk
2016-08-12 11:01:39 +01:00
9d77fab18f
0.7.4-r1
2016-08-12 10:11:40 +01:00
5512fd4220
Bump to matrix-react-sdk 0.6.4-r1
2016-08-12 10:09:53 +01:00
25d8a7999f
0.7.4
2016-08-11 17:47:17 +01:00
2b671fcafc
js-sdk & react sdk released
2016-08-11 17:45:10 +01:00
19d5063814
Merge branch 'develop' into fix-emoji
2016-08-11 14:51:17 +05:30
bd9f5d3e06
Various fixes and improvements to emojification.
...
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
51b74251f9
Exclude olm from the webpack
...
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
2016-08-02 12:44:23 +01:00
4b33164ab6
Remove relayoutOnUpdate prop on gemini-scrollbar
...
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:41:27 +01:00
53fe372a0c
Bump to react 15.2.1
...
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:47:09 +01:00
4cb04d1e40
Bump to latest react-gemini-scrollbar
...
I've updated our forks of the gemini-scrollbar project to latest upstream.
2016-07-22 10:46:38 +01:00
3e53879adc
Bump to olm 1.0.0
...
Fixes https://github.com/vector-im/vector-web/issues/1719
2016-07-11 14:53:51 +01:00
4c6fa740f3
package.json: add olm as optionalDependency
...
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
2016-06-20 15:10:19 +01:00
b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
7999a70cab
Switch to dev versions of react-sdk and js-sdk
2016-06-08 21:36:45 +01:00
c6cf5febd5
Merge pull request #1516 from vith/static-config-json
...
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
c672919d1e
0.7.3
2016-06-03 12:20:05 +01:00
e68a2b5e1d
pin to react sdk 0.6.3 for release
2016-06-03 12:19:04 +01:00
ddc4ac187c
dep on react-sdk develop
2016-06-02 23:32:47 +01:00
ded66bbdfc
0.7.2
2016-06-02 19:05:50 +01:00
4ec77eeca7
correctly bump dep on js-sdk and react-sdk
2016-06-02 19:04:22 +01:00
Matthew Hodgson