mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity
2416 commits 185 branches 531 tags 233 MiB
Commit graph

2416 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
d068499184 Fix other merge conflict 2016-10-27 10:52:17 +01:00
David Baker
62b1282060 Fix merge fail 2016-10-27 10:48:37 +01:00
David Baker
24610f4d18 Merge remote-tracking branch 'origin/develop' into aviraldg-electron 2016-10-27 10:44:08 +01:00
David Baker
02e85fcffb Catch electron exception 2016-10-27 10:16:05 +01:00
Richard van der Hoff
b174d49f9d Merge pull request #2515 from vector-im/rav/cache_busting 
Put a cachebuster in the names of CSS and JS files
 2016-10-26 16:58:27 +01:00
Richard van der Hoff
31ed719df1 webpack: Improve comment on HtmlWebpackPlugin 2016-10-26 16:52:26 +01:00
Richard van der Hoff
c19538d6ce Merge branch 'develop' into rav/cache_busting 2016-10-26 16:50:45 +01:00
Richard van der Hoff
3adf5fe3fd Merge pull request #2517 from vector-im/rav/upgrade_olm 
Bump to olm 2.0.0
 2016-10-26 16:50:22 +01:00
Richard van der Hoff
bd0e121f0e Merge pull request #2516 from vector-im/rav/no_pack_world 
Don't include the world in the published packages
 2016-10-26 16:48:22 +01:00
Richard van der Hoff
de1f7861d6 Bump to olm 2.0.0 2016-10-26 16:20:42 +01:00
Richard van der Hoff
5a58c8bda4 Don't include the world in the published packages 
We ended up including all sorts of stuff in our published packages. Let's take
the opposite approach and include useful stuff rather than exclude unuseful
stuff.
 2016-10-26 15:35:54 +01:00
Richard van der Hoff
6396c60645 Put a cachebuster in the names of CSS and JS files 
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.

We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
 2016-10-26 15:20:59 +01:00
Richard van der Hoff
f700bb4efa Merge pull request #2514 from vector-im/rav/webpack_olm 
Use webpack to copy olm.js
 2016-10-26 15:18:27 +01:00
Richard van der Hoff
53e5894759 Merge branch 'develop' into rav/webpack_olm 2016-10-26 15:13:57 +01:00
David Baker
fac539c102 Add the 'silent' flag to notifications 
Because we play our own sounds
 2016-10-26 15:10:53 +01:00
Richard van der Hoff
8fe05fdff3 Correct path to components.css 
Fix failure to find components.css which was introduced in e1919c5
(https://github.com/vector-im/vector-web/pull/2513)
 2016-10-26 15:02:34 +01:00
David Baker
e002575eae Merge pull request #2513 from vector-im/rav/no_bundle_components_css 
Don't include two copies of the CSS in the tarball
 2016-10-26 14:52:29 +01:00
Richard van der Hoff
e1919c5ea3 Don't include two copies of the CSS in the tarball 
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
 2016-10-26 14:43:42 +01:00
Richard van der Hoff
fcf683c8a7 Use webpack to copy olm.js 
Rather than copying olm.js ourselves in package.json, get webpack to do it for
us by declaring it as a second entry point.
 2016-10-26 14:29:21 +01:00
David Baker
c2b487cc79 Support no config file when loading from files 
file: URIs don't produce 404s.
 2016-10-26 14:05:00 +01:00
Richard van der Hoff
e564d34ca8 Merge pull request #2512 from vector-im/dbkr/firefox_roomdir_align 
Correct text alignment on room directory search
 2016-10-26 10:49:59 +01:00
David Baker
61d7db6eb6 Correct text alignment on room directory search 
Seemed to only be broken on firefox
 2016-10-26 10:35:46 +01:00
David Baker
8edefe9e22 Oops, electron.app not app 2016-10-25 17:32:49 +01:00
David Baker
058d7c0ac7 Also put the poll rate back to something sensible 2016-10-25 16:43:42 +01:00
David Baker
752682220f Not the testing code, though 2016-10-25 16:43:09 +01:00
David Baker
c02f3a2230 Make autoupdate work on electron. 
Changes the update process on web a bit to pull more out to the
platform classes.
 2016-10-25 16:41:20 +01:00
Richard van der Hoff
5768f73bbd Merge pull request #2510 from vector-im/dbkr/ref-is-not-rel 
Correct spelling of 'rel'
 2016-10-25 14:51:30 +01:00
David Baker
df94dd7487 Update ChangelogDialog.js 2016-10-25 14:41:02 +01:00
Richard van der Hoff
4221781d9b Merge pull request #2507 from vector-im/rav/readme 
readme tweaks
 2016-10-25 11:29:51 +01:00
Richard van der Hoff
e0556789d2 readme tweaks 
Note that Chrome requires https for voip (fixes #2506)

Remove lies about where issues are filed.
 2016-10-25 11:20:23 +01:00
David Baker
3c44f8a2cb Higher res icon for windows 2016-10-24 17:25:14 +01:00
David Baker
b6939b8138 Clear notifications on electron 2016-10-24 16:56:00 +01:00
David Baker
7b4694c637 Move platform setting to its own thing 2016-10-24 15:12:16 +01:00
David Baker
f62f2e8f25 More helpful description 2016-10-21 16:00:21 +01:00
David Baker
e2b123b56a Commented auto-update line 2016-10-21 15:16:55 +01:00
David Baker
9310d92605 document integrations config in README 2016-10-21 14:59:13 +01:00
David Baker
fd2a2f25ad OK, we;ll use the standard icon paths 
but with a different 'build' directory
 2016-10-21 14:54:14 +01:00
David Baker
1c7d859b2b Add menu & update author 
(since it's in the about screen)
 2016-10-21 10:03:19 +01:00
David Baker
dc1952a993 Copyright headers 2016-10-21 09:41:05 +01:00
David Baker
11aed8cf07 Icon 2016-10-20 19:52:59 +01:00
David Baker
4e01bd7675 Tiny context menu on links 2016-10-20 18:33:07 +01:00
Richard van der Hoff
8a2f57d234 Merge pull request #2491 from vector-im/rav/riot 
s/vector/riot/ in the readme
 2016-10-20 17:06:14 +01:00
Richard van der Hoff
d72323bfc5 typo 2016-10-20 17:05:44 +01:00
Richard van der Hoff
dfd0356609 s/vector/riot/ in the readme 
Also remove the outdated "E2E" section

Fixes https://github.com/vector-im/vector-web/issues/2457
 2016-10-20 16:54:30 +01:00
David Baker
680f599df5 Oh wait, don't need node-open 
electron has it built in
 2016-10-20 16:50:19 +01:00
David Baker
eef846e490 oops 2016-10-20 16:43:40 +01:00
David Baker
6c16ccce68 Open URLs in a browser 2016-10-20 16:41:33 +01:00
David Baker
27604d2798 Don't turn the favicon animations on 2016-10-20 15:01:07 +01:00
David Baker
5e4f572a46 More s/IntegrationManager/Platform/ 2016-10-20 14:57:21 +01:00
David Baker
1b0c561ac1 s/IntegrationManager/Platform/ 
Because we call bots integrations and I'll get confused
 2016-10-20 14:50:20 +01:00