mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 09:41:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
12834 commits 219 branches 562 tags 474 MiB
Commit graph

12834 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
e9226cdff8
Merge pull request #2426 from matrix-org/dbkr/backup_passphrase_debounce 
Key backup: Debounce passphrase feedback
 2019-01-10 18:34:08 +00:00
David Baker
a691c0492a
Merge pull request #2425 from matrix-org/dbkr/createbackup_niggles_2 
Set backup niggles: 2
 2019-01-10 18:34:01 +00:00
David Baker
fc346b2766
Merge pull request #2423 from matrix-org/dbkr/lint_messagecomposerinput 
Fix lint errors in MessageComposerInput
 2019-01-10 18:33:52 +00:00
David Baker
b7252a0db9 Rephrase comment to make more sense 2019-01-10 18:13:04 +00:00
David Baker
2bd4579d0b
Merge pull request #2424 from matrix-org/dbkr/createbackup_niggles_1 
Set backup niggles: 1
 2019-01-10 18:11:08 +00:00
Erik Johnston
23eecba0b9
Merge pull request #2388 from matrix-org/erikj/state_counters 
PoC: Add simple state counters to room heading
 2019-01-10 17:07:27 +00:00
Erik Johnston
cbf9ff6aee Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters 2019-01-10 16:56:47 +00:00
Erik Johnston
fa6b33d629 Only update component state when feature is enabled 2019-01-10 16:54:08 +00:00
David Baker
bd5e0d1821 My favourite typo :( 2019-01-10 15:19:56 +00:00
David Baker
e50f15ac15 Key backup: Debounce passphrase feedback 
https://github.com/vector-im/riot-web/issues/8066
 2019-01-10 15:17:39 +00:00
David Baker
1d209c5064 Set backup niggles: 2 
Don't tell the user their pasphrase doesn't match if it's correct
so far
 2019-01-10 14:12:43 +00:00
David Baker
3752a21fb1 Create set backup niggles: 1 
* Clear the password score when hitting 'back'
 * autoFocus password input
 2019-01-10 13:49:40 +00:00
David Baker
fea1980581 Only 18 warnings now 2019-01-10 10:23:49 +00:00
David Baker
1c42f4f5a0
Merge pull request #2420 from matrix-org/dbkr/fix_recovery_reminder_cancel 
Fix a few things with cancelling recovery reminder
 2019-01-10 09:58:25 +00:00
David Baker
9903c61a21 Fix lint errors in MessageComposerInput 
and remove from ignored files

Missed a load of the async arrows functions when changing them because
they were in the ignored files, so trying to chip away at this.

A lot of these were unused imports / variables. Probably the only
interesting one was a 'this' in a non-member function which I've moved
to be a member function.
 2019-01-10 09:41:26 +00:00
David Baker
3555b02f34 Merge remote-tracking branch 'origin/experimental' into dbkr/fix_recovery_reminder_cancel 2019-01-10 09:39:57 +00:00
David Baker
c45ffb6733
Merge pull request #2422 from matrix-org/dbkr/eslint_async_space 
Add spaces back to async arrow functions
 2019-01-10 09:35:58 +00:00
David Baker
b9719abbc2 Oops, missed some asyncs 2019-01-09 19:36:34 +00:00
David Baker
f269b5fbbc Fix spaceless async in ignored files too 2019-01-09 19:14:30 +00:00
Matthew Hodgson
d529e2475b
Merge pull request #2421 from matrix-org/bwindels/fixgrid 
fix grid growing wider than viewport on chrome
 2019-01-09 18:24:35 +00:00
David Baker
8e4d8ccca7 Add spaces back to async arrow functions 
As per https://github.com/matrix-org/matrix-js-sdk/pull/821

Requires https://github.com/matrix-org/matrix-js-sdk/pull/821
 2019-01-09 18:10:35 +00:00
Bruno Windels
40e8e48e08 fix grid growing wider than viewport 2019-01-09 19:05:21 +01:00
J. Ryan Stinnett
365a7273d8 Move initial key backup to background 
Since the initial key backup can take several minutes for some users, this moves
the upload step to the background.  The create key backup flow now only marks
all sessions for backup synchronously, with the actual backup happening later.

The key backup panel in Settings gains a new row to show a summary of upload
status.  Users are directed there if they wish to know if the backup is done.

The text in various related dialogs has also been tweaked to fit the new flow.
 2019-01-09 12:04:17 -06:00
J. Ryan Stinnett
731f9ee7df Display key backup upload progress in Settings 
This adds a summary of the keys currently waiting for backup, which may be
useful for following a large upload as it progresses.
 2019-01-09 12:04:17 -06:00
J. Ryan Stinnett
7dbc970347 Mark KeyBackupPanel as a pure component 
KeyBackupPanel depends only on its own state and its children are pure, so it
can be pure as well. This avoids some unnecessary re-renders.
 2019-01-09 12:04:17 -06:00
J. Ryan Stinnett
2bfe6e7500 Fix React nesting error in create key backup 2019-01-09 12:04:17 -06:00
J. Ryan Stinnett
91a7c146e4 Fix lint warning in create key backup 2019-01-09 12:04:17 -06:00
Bruno Windels
ece5cb1fcc
Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental 
Tiled room UI
 2019-01-09 17:25:08 +00:00
David Baker
7381879e3a Fix a few things with cancelling recovery reminder 
* Put a cancel button on the first page of the create key backup
   dialog
 * Move settings logic into the room reminder: I know this is moving
   logic *into* a view but RoomView is quite heavyweight as it is.
 * Give the recovery reminder an explicit 'onDontAskAgainSet' rather
   than onFinished which was getting called with false when the last
   screen of the dialog was closed with the cancel 'x' rather than
   the 'close' button.

https://github.com/vector-im/riot-web/issues/8066
 2019-01-09 16:27:41 +00:00
David Baker
64a3d2521c
Merge pull request #2417 from jryans/fix-nrm-icon 
Fix path to New Recovery Method icon
 2019-01-09 15:31:35 +00:00
Bruno Windels
76d19e55e4
Merge pull request #2419 from matrix-org/bwindels/travis-fixup 
run unit tests on riot-web like before
 2019-01-09 14:37:41 +00:00
Bruno Windels
19190deb3c set x perms 2019-01-09 15:20:55 +01:00
Bruno Windels
45558f5323 run both react-sdk and riot-web tests 2019-01-09 15:16:20 +01:00
Bruno Windels
509ae4cea4 run unit tests on riot-web like before 2019-01-09 15:02:20 +01:00
Erik Johnston
0b4ce3c58e
Merge pull request #2414 from matrix-org/erikj/travis_cleanup 
Refactor travis-ci to use parallel jobs
 2019-01-09 13:52:29 +00:00
Bruno Windels
419726f423 set executable perms 2019-01-09 14:43:05 +01:00
Bruno Windels
481cd292ad make e2e tests job conditional at travis.yml level 2019-01-09 14:36:32 +01:00
Bruno Windels
5ce08523f8 split up script for unit and end-to-end tests so unit tests are not run as part of e2e tests 2019-01-09 14:21:45 +01:00
J. Ryan Stinnett
79df843a6e Fix path to New Recovery Method icon 2019-01-09 06:25:35 -06:00
Bruno Windels
254427461d fix PR feedback 2019-01-09 12:48:13 +01:00
J. Ryan Stinnett
1fcafdab30 Allow New Recovery Dialog to be cancelled 
Fixes part of https://github.com/vector-im/riot-web/issues/8048.
 2019-01-09 04:08:12 -06:00
J. Ryan Stinnett
02a83a7c2b Use per-message string substitutions in key backup panel 
Including unused substitutions triggers console logs, so change the key backup
panel to only substitute what's actually used in each message.

Fixes https://github.com/vector-im/riot-web/issues/8047.
 2019-01-08 09:31:33 -06:00
Bruno Windels
9e67dbf008 change icon 2019-01-08 14:35:26 +01:00
Bruno Windels
52c5610660 update copy 2019-01-08 14:35:06 +01:00
Erik Johnston
ba5e3f86cb Revert "Add npm cache" 
This reverts commit f9ecdcb480.

Travis is unhappy about adding an NPM cache as it can't find
matrix-js-sdk for some reason
 2019-01-08 11:58:21 +00:00
Erik Johnston
f9ecdcb480 Add npm cache 2019-01-08 11:48:11 +00:00
Erik Johnston
025733244f Remove default script that is never called 2019-01-08 11:47:49 +00:00
Erik Johnston
ab468b5346 Refactor travis-ci to use parallel jobs 2019-01-08 11:33:12 +00:00
Erik Johnston
07c2010cce Use state rather than forceUpdate 2019-01-08 11:14:31 +00:00
Bruno Windels
56726ba8e5 fix lint 2019-01-08 12:10:42 +01:00