c8a6be1454
Update gitignore
2016-11-08 16:14:57 +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
a4c16b896b
Merge remote-tracking branch 'origin/develop' into dbkr/build_vector_dir
2016-11-08 15:44:27 +00:00
d150ee0d05
Missed a -w
2016-11-08 15:30:19 +00:00
7bf69d067a
Another missed file from the windows fixes
...
This time the icon file for the window
2016-11-08 14:35:59 +00:00
ccc43cc0ed
Merge pull request #2555 from vector-im/dbkr/auto_update_config
...
Make auto-update configureable
2016-11-08 14:33:44 +00:00
f7091d2fdd
Merge pull request #2556 from vector-im/dbkr/windows_fixes_missed_files
...
Missed files electron windows fixes
2016-11-08 14:33: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
a2a3d7a0f9
Remove spurious log line
2016-11-08 11:45:11 +00:00
abc306be6c
Merge pull request #2554 from vector-im/luke/feature-show-integration-error-popup
...
Add some CSS for scalar error popup
2016-11-08 11:27:49 +00:00
ccea483f4f
Missed files electron windows fixes
...
Missed from https://github.com/vector-im/vector-web/pull/2551
* squirrel hooks file for handling install / uninstall events
* Install 'spinner' gif for windows (ours does not spin)
2016-11-08 11:20:47 +00:00
84aac88677
Make auto-update configureable
...
Otherwise everyone that builds electron vector will end up with
their apps auto-updatin to our version when we release an update.
Coming next: A way to manage our electron release process to make
sure we never ship a build with auto-update disabled.
2016-11-08 11:07:36 +00:00
b30df2115c
Add some CSS for an error popup that appears next to the `Manage Integrations` button if there was a problem contacting Scalar
2016-11-08 10:54:03 +00:00
0441fcf3df
Merge pull request #2552 from vector-im/dbkr/electron_catch_unhandled_errors
...
Catch unhandled errors in the electron process
2016-11-07 15:22:11 +00:00
b223d3b385
Catch unhandled errors in the electron process
...
Otherwise we pop up stack traces in dialog boxes if it fails to
to poll for updates or something.
2016-11-07 14:37:12 +00:00
e033ce6c43
Merge pull request #2551 from vector-im/dbkr/electron_windows_fixes
...
Slight grab-bag of fixes for electron on Windows
2016-11-07 13:54:38 +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
80bae0563d
Merge pull request #2535 from vector-im/dbkr/electron_3
...
Electron app (take 3)
2016-11-04 10:56:59 +00:00
9a00ec128c
many semicolons
2016-11-04 10:46:51 +00:00
bc092d5c77
Merge branch 'master' into develop
2016-11-04 10:18:30 +00:00
1c9a78a2f1
v0.8.4
2016-11-04 10:13:23 +00:00
11eb0a89eb
Prepare changelog for v0.8.4
2016-11-04 10:13:23 +00:00
d7d6b3b4a2
Released matrix-js-sdk & matrix-react-sdk
2016-11-04 10:12:21 +00:00
f5d95f7314
Use an env var for the package version
...
Because supplying arguments to npm scripts is a bad idea: it just
appends the arguments blindly to whatever the command was. Thanks,
npm.
2016-11-04 09:40:24 +00:00
a6d029c556
Fix copyright
2016-11-03 17:06:41 +00:00
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
David Baker