ed9c29d365
Use require so we can import conditionally
2016-11-03 15:45:12 +00:00
527c390152
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 15:35:45 +00:00
a6c794cb11
Merge pull request #2542 from vector-im/rav/webpack-dev-server
...
Use webpack-dev-server instead of http-server
2016-11-03 15:35:17 +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
6869c679ef
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 14:58:12 +00:00
4dab36d3b2
Merge pull request #2541 from vector-im/dbkr/blank_config_3
...
Better support no-config when loading from file
2016-11-03 14:56:16 +00:00
cfe63fa274
Better support no-config when loading from file
...
We should still error if given a 5xx with an empty body.
2016-11-03 14:43:10 +00:00
c1469f4e39
Merge pull request #2540 from vector-im/dbkr/fix_no_config
...
Fix loading with no config from HTTP
2016-11-03 14:20:30 +00:00
3601b44429
Fix loading with no config from HTTP
2016-11-03 14:17:23 +00:00
b3510d6973
Comment the menu stuff that we only do on mac
2016-11-03 13:37:40 +00:00
d9780239b6
Make indenting consistent with rest of project
2016-11-03 13:33:49 +00:00
fb3ca441ba
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-03 13:32:01 +00:00
efd0dab316
Merge pull request #2532 from vector-im/dbkr/platform_version
...
Move 'new version' support into Platform
2016-11-03 13:30:19 +00:00
f1b72dfa09
Fix copyright
2016-11-03 11:51:41 +00:00
4d0b492ba0
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-03 11:51:23 +00:00
3bcb447e03
Fix copyright
2016-11-03 11:48:49 +00:00
108af83ae8
Just bind the right function to the button
...
rather than deciding in onChangelogClicked
2016-11-03 11:43:50 +00:00
275a55266b
Merge remote-tracking branch 'origin/develop' into dbkr/electron_3
2016-11-02 19:46:02 +00:00
18504ca14e
Merge pull request #2533 from vector-im/dbkr/platform_notification
...
Add Notification support to the Web Platform
2016-11-02 19:43:17 +00:00
6aba9f8eda
Don't always claim we have notif support
...
Only if the browser has the Notification API
2016-11-02 19:26:07 +00:00
e8494c3dc7
Split NewVersionBar release notes / changelog
...
and change the class to use React createClass syntax while I'm at
it, rather than a completely different third style we use nowhere
else in the project.
2016-11-02 19:20:11 +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
67dbd9fba9
Merge pull request #2534 from vector-im/dbkr/config_accept_blank
...
Use the defaults if given a blank config file
2016-11-02 18:42:39 +00:00
19238b9326
Use the defaults if given a blank config file
...
This allows Vector to load from file:// URIs without breaking if
there is no config file (because we explicitly look for 404s, and
file:// URIs don't return 404s).
2016-11-02 17:57:27 +00:00
8c3fed7559
CSS for changelogs
2016-11-02 17:48:47 +00:00
17bb47676e
Make VectorBasePlatform
...
For template methods that are only used from within vector (ie. new version
support)
2016-11-02 17:45:35 +00:00
757604fd60
Add Notification support to the Web Platform
...
Except display notification which was already accidentally included in a
previous PR
2016-11-02 17:36:48 +00:00
c75118caa2
Merge branch 'develop' into dbkr/platform_version
2016-11-02 16:35:31 +00:00
0b5085ecbb
Merge pull request #2531 from vector-im/dbkr/platform
...
Implement Platforms
2016-11-02 16:21:14 +00:00
64fdb290eb
Move 'new version' support into Platform
2016-11-02 16:02:55 +00:00
a714edbf2b
Implement Platforms
...
Provide WebPlatform for functionality specific to the web version of vector.
2016-11-02 15:12:51 +00:00
735c298de3
Merge branch 'release-v0.8.4' into develop
2016-11-02 12:01:30 +00:00
db07ef7899
Update readme to point to github releases
...
not /packages
2016-11-02 12:01:01 +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
7323ae5bf5
Prepare changelog for v0.8.4-rc.2
2016-11-02 11:40:04 +00:00
d04cc03c1c
Take version from first arg, if given
2016-11-02 11:38:11 +00:00
4fb273284d
v0.8.4-rc.1
2016-11-02 11:17:36 +00:00
3bfdbad5ba
Prepare changelog for 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
ba7e02c3b1
Merge pull request #2528 from vector-im/dbkr/package_is_now_dist
...
Rename the package script/output dir to 'dist'
2016-11-01 15:48:06 +00:00
622ab27254
gitignore dist
2016-11-01 15:35:41 +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
5e84a6c39e
Merge pull request #2518 from vector-im/rav/ignore_olm_if_missing
...
Avoid errors if olm is missing
2016-10-27 10:28:27 +01:00
a86f2720bc
Avoid errors if olm is missing
...
If olm isn't installed, webpack prints out scary warnings (though it still
actually succeeds). Let's avoid scaring people by quietly removing it from the
list of things to process.
2016-10-27 10:16:10 +01: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
31ed719df1
webpack: Improve comment on HtmlWebpackPlugin
2016-10-26 16:52:26 +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
bd0e121f0e
Merge pull request #2516 from vector-im/rav/no_pack_world
...
Don't include the world in the published packages
2016-10-26 16:48:22 +01:00
David Baker