1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Commit Graph

13121 Commits

Author SHA1 Message Date
cbe3afaa1f resubmit query when switching between "This Room" / "All Rooms" 2019-01-16 11:13:35 +01:00
0dd8519491 Translated using Weblate (French)
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/fr/
2019-01-16 10:06:42 +00:00
e2f3ff37b8 Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2019-01-16 06:17:25 +00:00
807d3aba6e Use integer padding / border for avatar
It seems fractional spacing results in different behavior across browsers,
including unbalanced spacing, making the avatar appear uncentered.

Here we avoid this by using integers that seem to closely match the comps.

Fixes https://github.com/vector-im/riot-web/issues/8134.
2019-01-15 16:37:16 -06:00
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
Moo
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
ee65332eb3 Merge pull request #2443 from matrix-org/travis/fix-settings
Fix setting label for unknown invites
2019-01-15 10:24:56 -07: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
6597e977c8 Update context menu styling to match custom status comps 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
7d6b996952 Tweak composer button padding so it won't affect status 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
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
961e0d24df flex-basis to 0 so sublists shrink/grow not-relative to their content 2019-01-14 14:41:31 +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