Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 14:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,179 Commits 206 Branches 552 Tags 519 MiB
338dc602f0
Commit Graph

15179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
ee19ecad82 Merge remote-tracking branch 'origin/develop' into dbkr/fix_style_linting 2019-04-09 15:19:24 +01:00
David Baker
5542e305fd
Merge pull request #2900 from matrix-org/dbkr/stylelint 
Add stylelint
 2019-04-09 15:18:52 +01:00
David Baker
3727d85487 Add stylelint to CIs 2019-04-09 15:08:04 +01:00
David Baker
04b69116ee Fix tedious CSS stuff with stylelint --fix 2019-04-09 15:05:39 +01:00
David Baker
eb6f3f6008 Fix up some CSS things stylelint was complaining about 
And also disable a load of rules that feel like they're probably
causing more headaches than they fix.
 2019-04-09 15:03:13 +01:00
David Baker
564a9838b0 It's null, not "off" 2019-04-09 14:30:51 +01:00
David Baker
232521b30d Use js for the config file 
Lest we spend an eternity being scalded about dangling commas
 2019-04-09 14:20:17 +01:00
Bruno Windels
5802a1d9eb also show test logs 2019-04-09 15:11:33 +02:00
David Baker
7b87229e29 Add stylelint 
Not added to the CI / default linting phases yet as, predictably
enough, it's very unhappy with our CSS. Just added one rule which is
that our CSS is indented with 4 spaces (the default being 2).
 2019-04-09 14:05:53 +01:00
David Baker
e2da80c92c
Merge pull request #2899 from matrix-org/dbkr/sometimes_your_own_signature_is_invalid 
Key backup: Handle case where your onw sig is invalid
 2019-04-09 14:00:18 +01:00
David Baker
0f1ebf8095 Factor out this device check & reorder conditionals 2019-04-09 13:47:25 +01:00
Bruno Windels
309d2ead8f dump server log after running tests 2019-04-09 14:39:31 +02:00
David Baker
7c1943ef4e Key backup: Handle case where your onw sig is invalid 
Sometimes life is just like that
 2019-04-09 13:22:35 +01:00
Bruno Windels
774314badd prevent png chunk parsing and image loading racing with each other 2019-04-09 12:32:44 +02:00
Bruno Windels
ea71970299 name fn to camel case 2019-04-09 12:18:06 +02:00
Bruno Windels
15ba24f7fb Merge branch 'develop' into matthew/retina 2019-04-09 10:55:05 +02:00
David Baker
babed3e5ee
Merge pull request #2891 from matrix-org/dbkr/simplify_settings_dialog_css 
Simplify settings dialog CSS
 2019-04-09 09:21:21 +01:00
David Baker
c2571ceda3
Merge pull request #2893 from matrix-org/dbkr/fix_cancel_e2e_upload 
Fix upload cancel in e2e rooms
 2019-04-09 09:21:00 +01:00
Travis Ralston
c49afe4d72 Use dedicated permalink creators in search results with multiple rooms 
Fixes https://github.com/vector-im/riot-web/issues/9376

This also would have happened in "All Rooms" searches.
 2019-04-08 16:23:00 -06:00
Travis Ralston
4beecb50c9 Fix room upgrade warnings popping up in upgraded rooms 
Rooms which are already upgraded shouldn't be asked to upgrade. Additionally, this fixes a bug where the room upgrade dialog would stay open even after upgrading the room.
 2019-04-08 15:39:36 -06:00
Travis Ralston
7407950c75 Always return a client from onRegistered 
Fixes https://github.com/vector-im/riot-web/issues/9406

The return value of onRegistered eventually ends up in the pusher setup, which means we were passing undefined through the stack.
 2019-04-08 12:49:14 -06:00
David Baker
d7509dd4c4 comment consistency 2019-04-08 19:12:04 +01:00
David Baker
acdcf6639e Put width / height first in css 2019-04-08 19:11:04 +01:00
David Baker
a04c15d131 consistent comments 2019-04-08 19:10:20 +01:00
David Baker
3ad54df454 Consistent spelling of canceled 2019-04-08 19:07:17 +01:00
Travis Ralston
bf0605cf84 Send breadcrumb updates only when they change 
Fixes an issue where hovering over the breadcrumbs could cause hundreds of web requests due to updates. This also fixes https://github.com/vector-im/riot-web/issues/9390 as the update is more reliable.
 2019-04-08 11:17:27 -06:00
Travis Ralston
aa96fd27cc Add some tolerances to breadcrumb scrolling 
See https://github.com/vector-im/riot-web/issues/9400
See https://github.com/vector-im/riot-web/issues/9394

Tolerances are defined as a device-only setting to give advanced users an option to override the values. No UI is exposed for this. 

The default values are picked for assumptions on comfort, however as people change the tolerances themselves the defaults may need to change.
 2019-04-08 10:56:44 -06:00
David Baker
59210564b7 Fix upload cancel in e2e rooms 
This is a bit of a mess of passing promises around - we weren't
taking the right promise to pass to cancelUpload.

Also e2e uploads take time to read into memory & encrypt, so allow
cancelling them during those phases too, even though we can't abort
those phases before they're done - we do mark the upload as cancelled
though so filter the current uploads for cancelled ones.

Fixes https://github.com/vector-im/riot-web/issues/4891
 2019-04-08 17:53:39 +01:00
J. Ryan Stinnett
054011f5f8
Merge pull request #2890 from jryans/guard-missing-crypto 
Set E2E room status to warning when crypto is disabled
 2019-04-08 16:56:19 +01:00
David Baker
670f6e4f99 Simplify settings dialog CSS 
Stop the settings dialogs from requiring special styles on the
mx_Dialog which required passing in a classname from anywhere the
settings dialogs were opened (although this still requires
static=true). Some of the things have now been adopted for all dialogs
(border-radius), others have been moved to within the dialog content.
 2019-04-08 16:48:42 +01:00
J. Ryan Stinnett
20c31082b5 Set E2E room status to warning when crypto is disabled 
When crypto is disabled for the current device, we can't tell whether there are
unverified devices since we aren't tracking devices at all.

Let's be safe and default to the warning state.

See also https://github.com/matrix-org/matrix-js-sdk/pull/889
 2019-04-08 16:28:19 +01:00
Bruno Windels
381c2f613d Merge branch 'master' into develop 2019-04-08 16:13:48 +02:00
Bruno Windels
21de0235b0 v1.0.7 2019-04-08 16:13:03 +02:00
Bruno Windels
192951c7e2 Prepare changelog for v1.0.7 2019-04-08 16:13:03 +02:00
Bruno Windels
ab02c80ede bump js-sdk to 1.0.4 2019-04-08 16:08:46 +02:00
Andrew Morgan
77515f0b58 Remove duplicate space in credits 2019-04-08 14:40:08 +01:00
Bruno Windels
d400ebde65 add new dependencies to lock file 2019-04-08 15:34:51 +02:00
David Baker
de4788a3d5
Merge pull request #2888 from matrix-org/dbkr/dbkr/settings_dialog_width_2 
Move SettingsDialog width override to fixedWidth
 2019-04-08 14:28:29 +01:00
Bruno Windels
20aedce62f more lint 2019-04-08 15:26:11 +02:00
David Baker
7b5658e3b1 Fix CSS silliness 
Meant to replace the existing block rather than add another one
with the same name! Also meant vw rather than width.
 2019-04-08 14:21:12 +01:00
David Baker
833b46d040 Move SettingsDialog width override to fixedWidth 
Move the width overrides to the container so it's the same thing
dictating its size as the rest of the dialogs
 2019-04-08 14:17:18 +01:00
Bruno Windels
45f3282b1b cleanup and linting 2019-04-08 14:57:39 +02:00
Travis Ralston
a53d9f59fe
Merge pull request #2882 from matrix-org/travis/permalink-explosion 
Prevent the permalink creator from causing cascading failure
 2019-04-08 06:56:13 -06:00
Travis Ralston
4ec2035f09
Merge pull request #2881 from matrix-org/travis/split-as-directory 
Don't include all networks by default in the room directory
 2019-04-08 06:55:39 -06:00
David Baker
c245eae390
Merge pull request #2886 from matrix-org/dbkr/fix_fixedwidth_dialog 
Fix fixed width dialogs
 2019-04-08 13:53:58 +01:00
David Baker
3fdf822d46 Fix fixed width dialogs 
Move the max-width to the fixedWidth div rather than the dialog,
otherwise the fixedWidth keeps getting bigger with bigger windows
but the dialog doesn't so it scrolls.
 2019-04-08 13:37:29 +01:00
David Baker
af83bdb317
Merge pull request #2885 from matrix-org/dbkr/fix_settings_dialog_layout 
Fix settings dialog layout
 2019-04-08 12:11:26 +01:00
David Baker
c87c4ef5a4 Fix settings dialog layout 
The close 'x' was ending up off the right hand side which made
everything else overlap with the left panel, depending on how wide
your window was.

This isn't the end of the dialog problems but it will at least stop
settings from being mangled on develop.
 2019-04-08 11:56:08 +01:00
David Baker
b63cbe20ce
Merge pull request #2884 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-04-08 09:57:39 +01:00
Weblate
6af2c00002 Merge branch 'origin/develop' into Weblate. 2019-04-08 08:35:19 +00:00