OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,635 Commits
219 Branches
561 Tags
468 MiB
Commit Graph

2635 Commits (002339fb86ffcd128ba90a0508d85e22a94255fa)

Author SHA1 Message Date
Hubert Chathi ad79f67ab6 Add missing brackets to call to toUpperCase 2016-12-06 22:36:42 -05:00
David Baker a9fcf106ab v0.9.1-rc.2 2016-12-06 16:06:15 +00:00
David Baker 0f47c9956c Prepare changelog for v0.9.1-rc.2 2016-12-06 16:06:14 +00:00
David Baker d4ac5f829f react-sdk rc.2 2016-12-06 16:04:46 +00:00
David Baker d31a675ca8 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 2016-12-06 16:02:26 +00:00
Richard van der Hoff 96f620829f Merge pull request #2700 from vector-im/dbkr/fix_notification_click 
Fix clicking on notifications
 2016-12-06 14:47:41 +00:00
David Baker 5fa0f62ccc Fix clicking on notifications 
* Dismiss the notification when it's clicked
 * Accept the room object: we need it to view_room
 * Desktop app: Un-minimise when notification clicked
 * Desktop App: Set App User Model ID so notifications work on
   Windows 8!
 2016-12-06 13:28:59 +00:00
Richard van der Hoff b825862f95 Merge pull request #2697 from vector-im/dbkr/show_when_ready 
Only show window when ready
 2016-12-06 09:59:32 +00:00
David Baker 8d06b54091 Only show window when ready 
Avoids it sitting there for a short period with no spinner while
it parses the js.
 2016-12-06 09:45:31 +00:00
David Baker df5143c818 v0.9.1-rc.1 2016-12-05 18:02:03 +00:00
David Baker ca6a3a2ad9 Prepare changelog for v0.9.1-rc.1 2016-12-05 18:02:03 +00:00
David Baker 6934b7ed56 released js-sdk & react-sdk 2016-12-05 17:53:06 +00:00
David Baker 987822bd5a typo in cp destination 2016-12-05 17:27:30 +00:00
David Baker 189c8aca79 Remove redundant line getting version 
As there is no latest.yml now
 2016-12-05 17:15:48 +00:00
David Baker b6aa7f430c Merge pull request #2653 from vector-im/dbkr/electron_dist_tweaks 
Final bits to prepare electron distribtion:
 2016-12-05 16:22:44 +00:00
David Baker d8e772cfc4 Merge pull request #2692 from vector-im/dbkr/repo-rename-riot 
Update name & repo to reflect renamed repository
 2016-12-05 16:22:33 +00:00
David Baker ec959f0052 Update name & repo to reflect renamed repository 
Unsure whether we want to go through doing a complete
s/vector/riot/ - I'm not sure there's a whole lot of point.
 2016-12-05 14:40:06 +00:00
David Baker 3d813e68e9 gitignore electron/pub 2016-12-05 14:20:26 +00:00
David Baker 37b4734bbe Also re-add installer spinner 2016-12-05 14:19:49 +00:00
David Baker b613a742f5 Forgot to re-add squirrelhooks 2016-12-05 14:17:22 +00:00
David Baker 72de35a2a1 Switch back to Squirrel installer 
which it turns out is by far the lesser of two evils.

 * Auto-update works with a proxy
 * The update process is reasonably atomic & faster, rather than
   running the uninstaller then the installer, leaving you with a
   broken install if you shut down your machine at the wrong time
 * Gets the update URL the same way as on mac, rather than baking
   it into the app at build time from package.json. We don't want
   it in package.json because only our builds want our update URL.
 2016-12-05 14:08:27 +00:00
David Baker 970a029cea Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks 2016-12-02 14:32:31 +00:00
David Baker d5a5abe202 Merge pull request #2680 from vector-im/dbkr/document_cross_origin_renderer_url 
Document cross_origin_renderer_url
 2016-12-02 14:31:45 +00:00
Richard van der Hoff 6ff253d0d8 Empty commit 
to test Jenkins
 2016-12-02 14:27:34 +00:00
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