Commit Graph

62959 Commits

Author SHA1 Message Date
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
Matthew Hodgson
61cf08ca1b Merge pull request #579 from kyrias/irc-strip-click
Strip (IRC) when clicking on username
2016-12-03 01:17:33 +00:00
Johannes Löthberg
f321c6c346 Strip (IRC) when clicking on username
Fixes vector-im/riot-web#2072.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-03 01:20:50 +01: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
Mark Haines
81e429eb14 Fix e2e attachment download by using iframes. (#562)
* Render attachments inside iframes.

* Fix up the image and video views

* Fix m.audio

* Comments, and only use the cross domain renderer if the attachment is encrypted

* Fix whitespace

* Don't decrypt file attachments immediately

* Use https://usercontent.riot.im/v1.html by default

* typos

* Put the config in the React context.

Use it in MFileBody to configure the cross origin renderer URL.

* Call it appConfig in the context

* Return the promises so they don't get dropped
2016-12-02 14:21:07 +00:00
David Baker
d0c2ab4cf1 Document cross_origin_renderer_url 2016-12-02 13:43:41 +00:00
Richard van der Hoff
0a42a78b13 Merge pull request #577 from matrix-org/luke/fix-scroll-jump-on-image-decryption
Fix scroll jump on image decryption
2016-12-02 11:28:55 +00:00
Luke Barnard
5665a0ef37 Fix scroll jump on image decryption
`onWidgetLoad` is now being called when an image has been decrypted so that the ScrollPanel maintains its scroll position (whether it's stuckAtBottom or not). This attempts to fix https://github.com/vector-im/riot-web/issues/2624
2016-12-02 11:11:35 +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
3aa1e0dd9e Update browser-encrypt-attachment to v0.3.0 (#570) 2016-12-01 13:12:22 +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
868e16c366 Merge pull request #576 from matrix-org/kegan/cutting-doesnt-clear-tab-complete
Make cut operations update the tab complete list
2016-11-30 11:08:18 +00:00
Kegan Dougal
5d03543f85 Make cut operations update the tab complete list 2016-11-30 10:49:40 +00:00
Johannes Löthberg
5f160d2e7f Markdown: Use .call instead of .bind
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-11-30 01:03:05 +01:00
Johannes Löthberg
4d2926485b Replace marked with commonmark
Marked has some annoying bugs, and the author is inactive, so replace it
with commonmark.js, which is the reference JavaScript implementation of
CommonMark.  CommonMark is also preferable since it has a specification,
and a conformance test suite to make sure that parsers are correct.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-11-29 23:14:04 +01:00
David Baker
03bd4b1457 Merge pull request #574 from matrix-org/rav/s_block_blacklist
s/block/blacklist for e2e
2016-11-29 19:09:18 +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
c7fb83ed2d s/block/blacklist for e2e
Fixes https://github.com/vector-im/vector-web/issues/2315
2016-11-29 18:48:43 +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
Richard van der Hoff
1a4163747e Merge pull request #573 from matrix-org/dbkr/electron_fix_download_icon
Fix the download icon on attachments
2016-11-29 11:44:09 +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
21d65d2ad1 Fix the download icon on attachments 2016-11-25 23:19:20 +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
Richard van der Hoff
57d82eb39e Merge pull request #572 from matrix-org/dbkr/fix_tests
Don't default the page_type to room directory
2016-11-24 16:47:36 +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
David Baker
8547d00f32 Don't default the page_type to room directory
As it breaks the behaviour of redirecting to /#/directory
2016-11-24 16:39:48 +00:00