Commit graph

12869 commits

Author SHA1 Message Date
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
Bruno Windels
7227049c2a add right panel toggle button to room header when in grid 2019-01-08 12:05:39 +01:00
Bruno Windels
c9272c48e0 undo unneeded changes 2019-01-08 12:05:06 +01:00
David Baker
e5f74957cb
Merge pull request #2408 from matrix-org/dbkr/fix_gif_icon_on_stickers
Fix black-on-black GIF icon for stickers
2019-01-08 09:35:06 +00:00
Travis Ralston
58cff9f689
Merge pull request #2413 from matrix-org/travis/room-list-go-faster-please
Don't reset cached room list values when they are falsey
2019-01-07 18:01:37 -07:00
Travis Ralston
66cd8475b5 Don't reset cached room list values when they are falsey
`unread` and `unread-muted` store booleans in the cache, and can easily be `false`. Without this patch, both of those cached types would be cleared from the object where a later call to `getRoomState` would try and re-populate them. `getRoomState` is supposed to use the cache where possible to avoid making the more expensive calls required to calculate those booleans.

On my account in a test environment, this brings the `generateRoomLists` execution time down from ~250ms to just ~30ms. 

This still does not solve the whole issue, but should solve the more common case of performance woes for people.
2019-01-07 17:46:32 -07:00
J. Ryan Stinnett
2ff532621c Remove unbalanced padding in create key backup dialog
This padding only one side made it impossible to center things in the dialog.
Since the dialog also has nice spacing without the padding, this change removes
it.

Fixes https://github.com/vector-im/riot-web/issues/7862.
2019-01-07 17:48:10 -06:00
J. Ryan Stinnett
a1daecc249 Remove empty CSS rule 2019-01-07 14:12:32 -06:00
J. Ryan Stinnett
f60a865727 Restore room name ellipsis on overflow
Fixes vector-im/riot-web#8037.
2019-01-07 14:12:32 -06:00
J. Ryan Stinnett
7a1008f1fe Fix color for @room pills in HTML messages 2019-01-07 09:56:40 -06:00
J. Ryan Stinnett
bf87547f88 Remove unexpected underline from pills
Fixes vector-im/riot-web#8031.
2019-01-07 09:56:40 -06:00
Bruno Windels
c6952ba5b6 fix some more lint warnings, as limit is 16 now 2019-01-07 16:56:35 +01:00
Bruno Windels
aedc220b62 fix (some) lint warnings 2019-01-07 16:33:23 +01:00
Erik Johnston
9a5f17d0b1 Change CSS to match experimental 2019-01-07 15:21:00 +00:00
Bruno Windels
c2f6fc381c add feature flag for grid view 2019-01-07 16:13:35 +01:00
Bruno Windels
8fa7ec0fac fix lint 2019-01-07 16:03:24 +01:00