Commit Graph

2770 Commits (0021fb37f3c26692a7906a6503cc26a0409a1a0b)

Author SHA1 Message Date
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
Richard van der Hoff 81d70a921d Add a 'View decrypted source' button 2016-11-16 23:10:51 +00:00
Richard van der Hoff 363453fd06 Merge pull request #2577 from vector-im/dbkr/fix_update_bar_version_format
Fix changelog dialog to  read new version format
2016-11-14 14:15:14 +00:00
David Baker 70d383fb1b Fix changelog dialog to read new version format
Remove the 'vector' from the start of the version (otherwise the
tarballs are called vector-vector-[...].tar.gz). The jenkins
script already creates these files, so update accordingly.
2016-11-13 23:06:57 +00:00
David Baker b0c1097f86 Don't include two vector prefixes 2016-11-11 18:23:25 +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 6e47d2f1b5 It's '=' in sh, not '==' 2016-11-11 18:07:03 +00:00
David Baker 2bcb27b24f Merge pull request #2558 from vector-im/dbkr/build_vector_dir
Build all of the vector dir in the build process
2016-11-11 17:51:25 +00:00
David Baker 6ac5fe60d9 Empty commit to force jenkins 2016-11-11 17:41:24 +00:00
David Baker 8356ad7bfa Merge pull request #2553 from vector-im/dbkr/get_app_version
Support for get_app_version
2016-11-11 17:33:41 +00:00
Richard van der Hoff 69eee7ca0a Merge pull request #2565 from vector-im/luke/fix-add-css-for-mlist-truncation
Add CSS for mlist truncation
2016-11-11 11:01:31 +00:00
Luke Barnard 4f944cf01c Add CSS for mlist truncation
matrix-org/matrix-react-sdk#544
2016-11-10 17:15:30 +00:00
David Baker 8676481aab dist now, not packages 2016-11-08 17:37:49 +00:00
David Baker e66e8b11cb Merge pull request #2560 from Half-Shot/msg-external-url
Add menu option for `external_url` if present
2016-11-08 17:20:21 +00:00
David Baker 1401de2e7d Move the jenkins / redeploy scripts to scripts
While we're breaking things anyway
2016-11-08 17:09:44 +00:00
Will Hunt 15c730a22a Add rel="noopener" to context menu links. 2016-11-08 17:08:50 +00:00
David Baker 3b06563960 Fix jenkins script / redeployer
and make them re-use the package script rather than doing their
own thing
2016-11-08 17:08:01 +00:00
Will Hunt cf33ed58c1 Add menu option for `external_url` if present 2016-11-08 16:57:56 +00:00
David Baker c8a6be1454 Update gitignore 2016-11-08 16:14:57 +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 a4c16b896b Merge remote-tracking branch 'origin/develop' into dbkr/build_vector_dir 2016-11-08 15:44:27 +00:00
David Baker d150ee0d05 Missed a -w 2016-11-08 15:30:19 +00:00
David Baker 7bf69d067a Another missed file from the windows fixes
This time the icon file for the window
2016-11-08 14:35:59 +00:00
David Baker ccc43cc0ed Merge pull request #2555 from vector-im/dbkr/auto_update_config
Make auto-update configureable
2016-11-08 14:33:44 +00:00
David Baker 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
David Baker 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
David Baker a2a3d7a0f9 Remove spurious log line 2016-11-08 11:45:11 +00:00
Luke Barnard 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
David Baker 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
David Baker 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
Luke Barnard 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
David Baker 8d46077ac2 Support for get_app_version 2016-11-08 10:47:01 +00:00
Richard van der Hoff 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
David Baker 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
David Baker 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
David Baker 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
David Baker 6da1a1077d 0.8.4 has been released 2016-11-04 13:03:11 +00:00
David Baker 80bae0563d Merge pull request #2535 from vector-im/dbkr/electron_3
Electron app (take 3)
2016-11-04 10:56:59 +00:00
David Baker 9a00ec128c many semicolons 2016-11-04 10:46:51 +00:00
David Baker bc092d5c77 Merge branch 'master' into develop 2016-11-04 10:18:30 +00:00
David Baker 1c9a78a2f1 v0.8.4 2016-11-04 10:13:23 +00:00
David Baker 11eb0a89eb Prepare changelog for v0.8.4 2016-11-04 10:13:23 +00:00
David Baker d7d6b3b4a2 Released matrix-js-sdk & matrix-react-sdk 2016-11-04 10:12:21 +00:00
David Baker 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
David Baker a6d029c556 Fix copyright 2016-11-03 17:06:41 +00:00
David Baker ed9c29d365 Use require so we can import conditionally 2016-11-03 15:45:12 +00:00
David Baker 527c390152 Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 15:35:45 +00:00
David Baker 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
Richard van der Hoff 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
David Baker 6869c679ef Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 14:58:12 +00:00