Commit Graph

2490 Commits

Author SHA1 Message Date
Richard van der Hoff
496f507684 Merge pull request #2660 from vector-im/dbkr/electron_1.4.8
Update to electron 1.4.8
2016-11-29 12:18:47 +00:00
David Baker
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
David Baker
f9afa79b01 Merge pull request #2644 from vector-im/dbkr/electron_config
Add electron config
2016-11-24 18:19:20 +00:00
David Baker
a870ea2389 Add electron config
Which has the update URL in it
2016-11-24 17:24:11 +00:00
David Baker
ac2911c222 Merge pull request #2643 from vector-im/dbkr/device_name_to_platform
Move getDefaultDeviceName into the Platforms
2016-11-24 16:57:01 +00:00
David Baker
c786980454 Move getDefaultDeviceName into the Platforms
So we can have a sensible device name on Electron
2016-11-24 16:46:15 +00:00
Richard van der Hoff
47534decb3 Merge pull request #2641 from vector-im/dbkr/add_freenode_mozilla_domains
Add Freenode & Mozilla domains
2016-11-24 16:27:56 +00:00
David Baker
0df242e0e9 Add Freenode & Mozilla domains
So the join button works for them
2016-11-24 16:20:58 +00:00
Richard van der Hoff
10650d2cd1 Unpin js-sdk and react-sdk 2016-11-22 22:14:05 +00:00
David Baker
186b4abfd8 Merge pull request #2614 from vector-im/rav/include_sample_config_in_tarball
Include config.sample.json in dist tarball
2016-11-21 11:02:31 +00:00
Richard van der Hoff
9ce2adceef Include config.sample.json in dist tarball
Fixes https://github.com/vector-im/vector-web/issues/2607
2016-11-21 10:40:35 +00:00
Matthew Hodgson
5cd4f88b8c v0.9.0 2016-11-19 02:04:32 +02:00
Matthew Hodgson
683ecb3326 Prepare changelog for v0.9.0 2016-11-19 02:04:31 +02:00
Richard van der Hoff
67c882648f Make sure we only pack one copy of react-dom (#2603)
Fixes https://github.com/vector-im/vector-web/issues/2601
2016-11-18 17:52:44 +00:00
Richard van der Hoff
8b0390f354 Fix a race which took us to the directory on load sometimes (#2602)
Sometimes window.onload would run before loadApp had finished (specifically, if
the browser had to wait for config.json to load). Avoid the race by moving all
of the onload logic into loadApp.
2016-11-18 17:32:01 +00:00
Richard van der Hoff
6d954ad7e0 Merge pull request #2596 from vector-im/rav/cachebust_version
Add a cachebuster to /version
2016-11-17 17:36:26 +00:00
Richard van der Hoff
646608bf8b Add a cachebuster to /version 2016-11-17 17:31:31 +00:00
David Baker
dace762a6c Merge pull request #2587 from vector-im/rav/view_clear_source
Add a 'View decrypted source' button
2016-11-17 11:24:39 +00:00
Richard van der Hoff
7577d2eb05 s/var/const/ 2016-11-17 10:51:09 +00:00
Richard van der Hoff
90019023c7 Merge branch 'develop' into rav/view_clear_source 2016-11-17 10:39:16 +00:00
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