nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
63,128 Commits 258 Branches 582 Tags
dc7cefdffe3994940887fca10c0b1ab07913e50c
Commit Graph

63128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
David Baker
56f224e513 Merge pull request #571 from matrix-org/dbkr/fix_login_crash 
Fix crash on logging in
 2016-11-24 15:10:40 +00:00
David Baker
2aba646acd Clear room alias etc. on logout 2016-11-24 14:58:37 +00:00
David Baker
0069393650 Go back to same room after logging in 2016-11-24 13:28:51 +00:00
David Baker
0bc4659fe0 Fix crash on logging in 
If you arrived at the page via a link to a room.

Fixes https://github.com/vector-im/vector-web/issues/2634
 2016-11-24 12:33:31 +00:00
Richard van der Hoff
7650e3de6e Merge pull request #569 from matrix-org/rav/reinstate_devices_list 
Reinstate missing sections from the UserSettings
 2016-11-23 11:27:59 +00:00
Richard van der Hoff
6e6bcf8b78 Reinstate missing sections from the UserSettings 
The 'devices' and 'cryptography' sections got removed from UserSettings by #566.
 2016-11-23 11:08:21 +00:00
Richard van der Hoff
10650d2cd1 Unpin js-sdk and react-sdk 2016-11-22 22:14:05 +00:00
Richard van der Hoff
6842544cd7 Unpin js-sdk 2016-11-22 22:12:50 +00:00
David Baker
815f676cbe Merge pull request #568 from matrix-org/markjh/bump 
Bump browser-encrypt-attachment to v0.2.0
 2016-11-22 19:20:02 +00:00
Mark Haines
b67fcf8109 Bump browser-encrypt-attachment to v0.2.0 2016-11-22 18:18:16 +00:00
Richard van der Hoff
422d5c0c92 Merge pull request #567 from matrix-org/luke/fix-agressive-unpagination 
Make the unpagination process less aggressive
 2016-11-22 17:53:44 +00:00
Luke Barnard
8a6ed1d7e9 Do not assume unpagination will occur during scroll test 2016-11-22 17:43:45 +00:00
Luke Barnard
42fc7b1b66 Use UNFILL_REQUEST_DEBOUNCE_MS constant, reset unfillDebouncer timeout reference. 2016-11-22 17:23:06 +00:00
Luke Barnard
d1a5d94916 Make the unpagination process less aggressive 
This increases `UNPAGINATION_PADDING` (see the ASCII on ScrollPanel.js, `_getExcessHeight`), and also debounces unfilling requests made for 200ms. This forces unfilling requests not to be sent unless the next 200ms has no scrolling, effectively.
 2016-11-22 16:47:56 +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
Richard van der Hoff
06f12b91b8 Merge pull request #566 from matrix-org/rav/remove_dead_labs_settings 
Get rid of always-on labs settings
 2016-11-21 10:38:06 +00:00
Richard van der Hoff
4476b09ce7 Get rid of always-on labs settings 
If the setting is on by default, it's not much use as a Labs setting. The E2e
setting was only confusing everyone anyway.
 2016-11-21 10:25:48 +00:00
David Baker
9c0ee84fb8 Merge pull request #565 from matrix-org/rav/fix_quote_e2e 
Fix 'Quote' for e2e messages
 2016-11-21 10:06:37 +00:00
Richard van der Hoff
03988015aa Fix 'Quote' for e2e messages 
Fixes https://github.com/vector-im/vector-web/issues/2612
 2016-11-21 09:19:40 +00:00
Matthew Hodgson
2e691240ae fix e2e disclaimer 2016-11-19 02:44:36 +02: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
Matthew Hodgson
09105608ab v0.8.0 2016-11-19 02:01:43 +02:00
Matthew Hodgson
617f0e6568 Prepare changelog for v0.8.0 2016-11-19 02:01:42 +02:00
Matthew Hodgson
8a5678efdd boldify the preview bar click 2016-11-19 01:20:09 +02:00
Mark Haines
7cb3c0935b Make the spinner smaller, don't decrypt files as eagerly (#564) 2016-11-18 20:08:26 +00: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