gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,020 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

3020 Commits

Author SHA1 Message Date
David Baker 749d26c8f4 Link to the repo which it turns out is a thing 2016-12-02 14:25:20 +00:00
David Baker f1998497f2 Put the riot.im config back in this repo 2016-12-02 14:21:33 +00:00
David Baker d0c2ab4cf1 Document cross_origin_renderer_url 2016-12-02 13:43:41 +00:00
David Baker 7871a3edb5 Just rm dist in the clean step 2016-12-01 19:43:04 +00:00
David Baker 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
David Baker 2930a94c79 Change to update_base_url 2016-12-01 18:01:23 +00:00
Mark Haines 9026cc4977 Merge pull request #2659 from vector-im/markjh/attachment_iframe_css 
Add css for the iframes for e2e attachments
 2016-12-01 13:12:12 +00:00
David Baker 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
Richard van der Hoff bacd467b4c Merge pull request #2670 from vector-im/dbkr/fix_config_location 
Fix config location in some more places
 2016-12-01 10:04:20 +00:00
David Baker 4988f0603f Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks 2016-11-30 18:13:14 +00:00
David Baker 6a944d3e7d Fix config location in some more places 2016-11-30 18:09:51 +00:00
David Baker 0e18a12472 Merge pull request #2662 from vector-im/rav/s_block_blacklist 
CSS updates for s/block/blacklist for e2e
 2016-11-29 19:09:08 +00:00
Richard van der Hoff f202197545 CSS updates for s/block/blacklist for e2e 
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/574
 2016-11-29 18:49:23 +00:00
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
Mark Haines 6c21391ff5 Merge branch 'develop' into markjh/attachment_iframe_css 2016-11-28 15:10:49 +00:00
David Baker a1347e7bf1 Correct vector to webapp & platform update URLs 2016-11-25 20:09:21 +00:00
David Baker c7635a362f Don't copy config, check update url 2016-11-25 20:08:45 +00:00
David Baker 97c0e2dfcd Delete electron config from here 
It just has our update URL in it which only we care about
 2016-11-25 20:08:05 +00:00
David Baker dfa7c3b72e Animated install logo from Ben 2016-11-25 20:07:38 +00:00
David Baker 4073688ba6 Missed an x64 2016-11-25 20:07:12 +00:00
David Baker 693867f074 Final bits to prepare electron distribtion: 
* Remove the config: nobody else wants our update URL so we'll
   keep it separately. Don't copy the config.
 * Script to yell at you if you've build a package with auto
   update turned off.
 * s/vector/webapp/ when looking for config
 * Use different update URLs for the various platforms
 2016-11-25 19:57:08 +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
Mark Haines be90badc8d Add css for the iframes for e2e attachments 2016-11-17 11:36:46 +00:00
Matthew Hodgson 3155d79a7e chatbot summit stuff 2016-11-17 13:35:36 +02: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
Matthew Hodgson 1599f3a666 make logo scale 2016-11-14 01:46:42 +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
Matthew Hodgson f911f0cfca geektime verbiage tweaks 2016-11-13 20:18:19 +00:00
Matthew Hodgson 1fb14d5a40 plug mobile apps 2016-11-13 14:32:00 +00:00
Matthew Hodgson 616c20fc1e fix img path 2016-11-13 14:26:54 +00:00