Commit Graph

12882 Commits (3c7bed97ac8c5f2c06ca77d9ce13f29be364ca60)

Author SHA1 Message Date
Bruno Windels 3c7bed97ac size all items to rendered height when starting drag operation
before, we'd only normalize the sublists that had already been
sized manually. As non-sized items still have flex-basis: auto,
they would claim all the space, and mixing sized and unsized items
would be badly broken.

Now, on the first click, all items are sized to their rendered size
which means they won't flex anymore, but at least the resizing works
this way

Another downside is that when resizing while a sublist is
collapsed, it's reverted to 100px and if a size had been set before,
it's forgotten. No way around this with this approach I'm afraid.
2019-01-15 12:56:48 +01:00
Bruno Windels aa90e9591a fix min & max size for empty sublists 2019-01-15 12:56:33 +01:00
Bruno Windels 1bbf1502ec Merge branch 'experimental' into bwindels/smarterresizer 2019-01-15 10:23:50 +01:00
Travis Ralston 177d9f245a
Merge pull request #2441 from matrix-org/develop
Merge develop -> experimental
2019-01-14 14:45:20 -07:00
Bruno Windels 7e395f0fb6 cleanup - part II
reshuffle file structure to make more sense
2019-01-14 20:33:33 +01:00
Bruno Windels 9ecb23ce71 cleanup
- move some methods to ResizeItem subclass
- allow distributor to instanciate sizer and resizeitem it needs
  through static factory methods, instead of passing in another ctor
  a distributor can only function with the right item and sizer anyways.
- use consistent import/export style
- remove obsolete code
2019-01-14 20:24:54 +01:00
Travis Ralston a3240358f1
Merge pull request #2434 from matrix-org/travis/invite-better
Give a route for retrying invites for users which may not exist
2019-01-14 07:52:08 -07:00
Bruno Windels 961e0d24df flex-basis to 0 so sublists shrink/grow not-relative to their content 2019-01-14 14:41:31 +01:00
Travis Ralston a05c0f9214 Rephrase everything to be "invite anyways" rather than "retry"
Also handle profile errors better
2019-01-11 15:46:03 -07:00
David Baker 2a20d9d67e
Merge pull request #2435 from matrix-org/dbkr/dialog_trusted_new_backup
Different dialog for new trusted backup
2019-01-11 18:55:17 +00:00
David Baker c650ace0c0
This shouldn't be required 2019-01-11 18:39:16 +00:00
Bruno Windels 136dd4a556 stop resize operation when cursor leaves viewport
as mouseup can't be detected outside of viewport
2019-01-11 18:20:34 +01:00
Bruno Windels a413f358f7 normalize sizes when starting drag operation 2019-01-11 17:17:58 +01:00
Bruno Windels 9456fc040d fix typo 2019-01-11 16:10:35 +01:00
David Baker 702c881008
Merge pull request #2436 from matrix-org/dbkr/lint_autocompleter
De-lint a few more files
2019-01-11 14:18:41 +00:00
David Baker 77efa0881e Gah, onjects 2019-01-11 14:09:29 +00:00
David Baker fe4778b28b De-lint a few more files
& remove them from the ignored list
2019-01-11 13:54:11 +00:00
David Baker 5c9d41d96b Lint 2019-01-11 13:42:40 +00:00
David Baker d87d00e4ae Different dialog for new trusted backup
Split the 'new recovery method' into two cases: one where the new
recovery method isn't trusted and you need to verify the device, and
another where it is and the client is using it (where it's more of
an FYI).

https://github.com/vector-im/riot-web/issues/8069
2019-01-11 13:15:09 +00:00
David Baker e0bc0494fa
Merge pull request #2433 from matrix-org/travis/rver/7992
Recalculate the visible rooms when rooms are upgraded
2019-01-11 10:37:32 +00:00
David Baker 93cf281ff9
Merge pull request #2432 from matrix-org/travis/rver/7998
Navigate to the upgraded room's create event where possible
2019-01-11 10:35:30 +00:00
David Baker 531822394d
Merge pull request #2429 from matrix-org/travis/rver/8076
Don't show rooms with tombstones in the address picker
2019-01-11 10:33:53 +00:00
David Baker 14fe43f74c
Merge pull request #2427 from jryans/recovery-method-removed
Add separate dialog for recovery method removed
2019-01-11 10:27:17 +00:00
Travis Ralston c351ee3d30 Appease the linter 2019-01-10 21:54:07 -07:00
Travis Ralston 5333114d7b Give a route for retrying invites for users which may not exist
Fixes https://github.com/vector-im/riot-web/issues/7922

This supports the current style of errors (M_NOT_FOUND) as well as the errors presented by MSC1797: https://github.com/matrix-org/matrix-doc/pull/1797
2019-01-10 21:43:21 -07:00
Travis Ralston 33eef6f5ac
Merge pull request #2428 from matrix-org/travis/rver/7991
Set which servers to try and join upgraded rooms through
2019-01-10 16:28:11 -07:00
Travis Ralston a9aede9be7
Merge pull request #2430 from matrix-org/travis/rver/7997
Render a tile for tombstone events
2019-01-10 15:44:51 -07:00
Travis Ralston 7d4b6add2c Recalculate the visible rooms when rooms are upgraded
We also do this when they are created just in case we missed the tombstone event.

Fixes https://github.com/vector-im/riot-web/issues/7992
2019-01-10 15:43:22 -07:00
Travis Ralston a15ff8c0dd
Merge pull request #2431 from matrix-org/travis/regen-en
Regenerate en_EN.json to sort entries
2019-01-10 15:36:28 -07:00
Travis Ralston b09219fe33 Navigate to the upgraded room's create event where possible
Fixes https://github.com/vector-im/riot-web/issues/7998
2019-01-10 15:29:12 -07:00
Travis Ralston a5fceefc63 Regenerate en_EN.json to sort entries 2019-01-10 15:17:20 -07:00
Travis Ralston e24d3cd671 Render a tile for tombstone events
Fixes https://github.com/vector-im/riot-web/issues/7997

This isn't super elegant, but it also provides some amount of utility for people. As users might leave the old room, it might be useful to see when exactly a room was upgraded. We should fix the underlying cause for infinite back pagination though.
2019-01-10 15:15:45 -07:00
Travis Ralston 18ba5f6f19 Don't show rooms with tombstones in the address picker
Fixes https://github.com/vector-im/riot-web/issues/8076
2019-01-10 14:44:19 -07:00
Travis Ralston cec9c908fc Set which servers to try and join upgraded rooms through
Fixes https://github.com/vector-im/riot-web/issues/7991
2019-01-10 14:33:46 -07:00
J. Ryan Stinnett 35af3fc6f7 Add separate dialog for recovery method removed
The "New Recovery Method" dialog would show if either the recovery method had
been changed or removed, but the dialog text didn't make much sense for the
removed case.

This adds a separate dialog customized for the removed case.

Fixes https://github.com/vector-im/riot-web/issues/8046.
2019-01-10 15:18:57 -06:00
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
Bruno Windels 92b9a8cc1f persist cleared size sublists 2019-01-10 18:40:26 +01: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
Bruno Windels a130c44803 try clear next item size when resizing so there is always one unsized item 2019-01-10 14:12:05 +01:00
Bruno Windels 1a2727f0af sized items cannot grow, unsized items start with their content size and shrink from there 2019-01-10 14:03:55 +01:00