28b8ccfdb1
Merge pull request #2445 from matrix-org/develop
...
Develop->Experimental
2019-01-15 14:35:53 -07:00
e547645dc8
Merge remote-tracking branch 'origin/develop' into develop
2019-01-15 19:02:03 +00:00
66a6f9d322
Merge pull request #2438 from Half-Shot/hs/trim-back-lines
...
Limit line length in the room directory
2019-01-15 12:01:58 -07:00
0c33c47764
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1425 of 1425 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-01-15 18:46:00 +00:00
c07470be7b
show a spinner while searching
2019-01-15 18:45:56 +01:00
731e05cc5d
Merge pull request #2444 from matrix-org/develop
...
Develop->Experimental
2019-01-15 10:39:34 -07:00
db5eb87f57
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (1425 of 1425 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-01-15 17:35:43 +00:00
8d63dbc71b
Merge remote-tracking branch 'origin/develop' into develop
2019-01-15 17:25:04 +00:00
9c2bdba9d3
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (1418 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-01-15 17:25:04 +00:00
eebb75ba77
Translated using Weblate (Polish)
...
Currently translated at 92.1% (1307 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-01-15 17:25:03 +00:00
a3d8bfc260
Translated using Weblate (Lithuanian)
...
Currently translated at 64.1% (909 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2019-01-15 17:25:03 +00:00
0b37797d22
Translated using Weblate (Croatian)
...
Currently translated at 0.4% (7 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hr/
2019-01-15 17:25:02 +00:00
d2de542838
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 91.7% (1301 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2019-01-15 17:25:02 +00:00
4b13774585
Revert to avatar only when custom status disabled
...
This returns to the previous behavior of avatar only without a button when the
custom status feature is disabled so that you don't get pointer cursor for
something that does nothing when clicked.
The avatar ring spacing is kept consistent with and without the feature enabled
by using a different class in CSS.
2019-01-15 10:54:29 -06:00
632bbde598
Remove usused setting value from CustomStatusController
2019-01-15 10:54:29 -06:00
d8de607edc
Update RoomTile on status change
2019-01-15 10:54:29 -06:00
77cee8e67e
Update MemberTile on status change
2019-01-15 10:54:29 -06:00
443198c180
Fix lints in MemberTile.js
2019-01-15 10:54:29 -06:00
233288475e
Use status events for avatar ring
...
Similar to changes in `StatusMessageContextMenu`, this changes to using the new
status message event emitted in js-sdk to simplify state handling for the avatar
ring when a status is present.
2019-01-15 10:54:29 -06:00
5b88b64950
Rework custom status context menu
...
This updates the custom status context menu to match the latest comps. A single
button is used for setting / clearing, depending on what is appropriate.
The state logic is also changed to depend on events and storage from js-sdk for
the committed status message. This makes it easy to distinguish the value being
edited from what's currently committed.
2019-01-15 10:54:29 -06:00
fc3055f541
Tweak custom status menu size and placement
2019-01-15 10:54:29 -06:00
eae1e4c9aa
Tweak custom status avatar ring
...
Adjusts the appearance of the avatar ring to match the latest comps.
In addition, we now always render the surrounding button element, which
simplifies styling since the same size is now occupied both with and without the
feature.
This improves alignment between text in the composer and text in the message
history (https://github.com/vector-im/riot-web/issues/8111 ).
2019-01-15 10:54:29 -06:00
c76b273fae
Update RoomTiles on custom status change
2019-01-15 10:54:29 -06:00
e08c70b820
Prune unsupported setting RoomSubList.showEmpty
...
The code reading this setting was previously removed in #2229 .
2019-01-15 10:54:29 -06:00
6f62158f94
Fix setting label for unknown invites
...
Fixes https://github.com/vector-im/riot-web/issues/8126
2019-01-15 09:52:06 -07:00
77a62b9174
style search bar
2019-01-15 16:20:04 +01:00
ef78036a72
fix vector-im/riot-web#8105
2019-01-15 14:40:58 +00:00
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
aa90e9591a
fix min & max size for empty sublists
2019-01-15 12:56:33 +01:00
1bbf1502ec
Merge branch 'experimental' into bwindels/smarterresizer
2019-01-15 10:23:50 +01:00
177d9f245a
Merge pull request #2441 from matrix-org/develop
...
Merge develop -> experimental
2019-01-14 14:45:20 -07:00
7e395f0fb6
cleanup - part II
...
reshuffle file structure to make more sense
2019-01-14 20:33:33 +01:00
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
cb5ad8d6f9
Limit the length of topics and names in the RoomDirectory
2019-01-13 14:47:08 +00:00
2edea5abfa
Translated using Weblate (German)
...
Currently translated at 100.0% (1418 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-01-12 02:46:45 +00:00
a05c0f9214
Rephrase everything to be "invite anyways" rather than "retry"
...
Also handle profile errors better
2019-01-11 15:46:03 -07:00
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
c650ace0c0
This shouldn't be required
2019-01-11 18:39:16 +00:00
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
a413f358f7
normalize sizes when starting drag operation
2019-01-11 17:17:58 +01:00
9456fc040d
fix typo
2019-01-11 16:10:35 +01:00
77efa0881e
Gah, onjects
2019-01-11 14:09:29 +00:00
fe4778b28b
De-lint a few more files
...
& remove them from the ignored list
2019-01-11 13:54:11 +00:00
5c9d41d96b
Lint
2019-01-11 13:42:40 +00:00
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
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
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
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
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
c351ee3d30
Appease the linter
2019-01-10 21:54:07 -07:00
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
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
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
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
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
a5fceefc63
Regenerate en_EN.json to sort entries
2019-01-10 15:17:20 -07:00
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
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
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
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
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
a691c0492a
Merge pull request #2425 from matrix-org/dbkr/createbackup_niggles_2
...
Set backup niggles: 2
2019-01-10 18:34:01 +00:00
fc346b2766
Merge pull request #2423 from matrix-org/dbkr/lint_messagecomposerinput
...
Fix lint errors in MessageComposerInput
2019-01-10 18:33:52 +00:00
b7252a0db9
Rephrase comment to make more sense
2019-01-10 18:13:04 +00:00
2bd4579d0b
Merge pull request #2424 from matrix-org/dbkr/createbackup_niggles_1
...
Set backup niggles: 1
2019-01-10 18:11:08 +00:00
92b9a8cc1f
persist cleared size sublists
2019-01-10 18:40:26 +01:00
cbf9ff6aee
Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters
2019-01-10 16:56:47 +00:00
fa6b33d629
Only update component state when feature is enabled
2019-01-10 16:54:08 +00:00
bd5e0d1821
My favourite typo :(
2019-01-10 15:19:56 +00:00
e50f15ac15
Key backup: Debounce passphrase feedback
...
https://github.com/vector-im/riot-web/issues/8066
2019-01-10 15:17:39 +00:00
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
3752a21fb1
Create set backup niggles: 1
...
* Clear the password score when hitting 'back'
* autoFocus password input
2019-01-10 13:49:40 +00:00
a130c44803
try clear next item size when resizing so there is always one unsized item
2019-01-10 14:12:05 +01:00
68afadd83b
try flex-basis for resizing
2019-01-10 14:03:17 +01:00
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
3555b02f34
Merge remote-tracking branch 'origin/experimental' into dbkr/fix_recovery_reminder_cancel
2019-01-10 09:39:57 +00:00
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
b9719abbc2
Oops, missed some asyncs
2019-01-09 19:36:34 +00:00
f269b5fbbc
Fix spaceless async in ignored files too
2019-01-09 19:14:30 +00:00
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
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
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
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
2bfe6e7500
Fix React nesting error in create key backup
2019-01-09 12:04:17 -06:00
91a7c146e4
Fix lint warning in create key backup
2019-01-09 12:04:17 -06:00
ece5cb1fcc
Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental
...
Tiled room UI
2019-01-09 17:25:08 +00:00
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
51376c5c07
draft room sub list item api
2019-01-09 15:53:04 +01:00
b82e19b1f7
size header explicitly for content size
...
otherwise it just grows with max-height
2019-01-09 15:45:47 +01:00
254427461d
fix PR feedback
2019-01-09 12:48:13 +01:00
d1c3afa513
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1418 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-01-09 11:31:09 +00:00
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
0803ea9158
support collapsed items
2019-01-08 18:17:34 +01:00
8352d8c6bd
not sure we need this, but adding the padding in _offset container
2019-01-08 18:17:00 +01:00
b4197059a0
change min size to exactly one room tile + header
2019-01-08 18:16:09 +01:00
4bd6ce8e2c
WIP2 for making smart resizer work, sort of works now but shows big scrollbar
2019-01-08 16:47:47 +01:00
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
e538f381a5
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (1418 of 1418 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-01-08 15:05:47 +00:00
5eba8210b8
Merge branch 'experimental' into bwindels/smarterresizer
2019-01-08 14:38:46 +01:00
9e67dbf008
change icon
2019-01-08 14:35:26 +01:00
Travis Ralston