Commit graph

20292 commits

Author SHA1 Message Date
Travis Ralston
be366bdd7f Fix various layout concerns with the new room list
It had ~32px of overflow causing a horizontal scrollbar. Turns out the layout engine gets confused when hidden elements are at the end of a flexbox, so we just move them higher in the DOM (where they logically still make sense).

The remaining changes are all alignment and misc changes in that respect, and probably not obvious.
2020-06-10 15:05:17 -06:00
Michael Telatynski
601e8209d8 Prioritize text on the clipboard over file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-10 21:48:39 +01:00
Weblate
12f39c33d5 Merge branch 'origin/develop' into Weblate. 2020-06-10 15:57:35 +00:00
Jorik Schellekens
b63d73e3b6
Merge pull request #4729 from matrix-org/joriks/appearance-tab
Move Settings flag to ts
2020-06-10 16:57:18 +01:00
Jorik Schellekens
737fc46b87 Inline kind classnames 2020-06-10 16:48:34 +01:00
Jorik Schellekens
52c7577972 Clean up interfaces and classname 2020-06-10 15:57:28 +01:00
Weblate
91d37cfc8e Merge branch 'origin/develop' into Weblate. 2020-06-10 13:46:15 +00:00
Travis Ralston
72bb89d4ee
Merge pull request #4743 from matrix-org/travis/room-list/tile-menu
Add a context menu to rooms in the new room list
2020-06-10 07:46:09 -06:00
Weblate
f4fc15e9ac Merge branch 'origin/develop' into Weblate. 2020-06-10 13:43:36 +00:00
Travis Ralston
b1fdfb51cd Fix i18n 2020-06-10 07:43:13 -06:00
Travis Ralston
a3391d9a08 Merge branch 'develop' into travis/room-list/hover-state 2020-06-10 07:42:41 -06:00
Weblate
ec289f33eb Merge branch 'origin/develop' into Weblate. 2020-06-10 13:40:39 +00:00
Travis Ralston
78e1db9d30
Merge pull request #4741 from matrix-org/travis/room-list/resize-handle
Update resize handle for new designs in new room list
2020-06-10 07:40:34 -06:00
Weblate
4ac5b46e3e Merge branch 'origin/develop' into Weblate. 2020-06-10 13:40:13 +00:00
Travis Ralston
a4ea5b5902
Merge pull request #4740 from matrix-org/travis/room-list/stability-1
Improve general stability in the new room list
2020-06-10 07:40:07 -06:00
Weblate
88670fd0e4 Merge branch 'origin/develop' into Weblate. 2020-06-10 13:40:03 +00:00
Travis Ralston
95b4abba3b
Merge pull request #4735 from matrix-org/travis/room-list/breadcrumbs
Reimplement breadcrumbs for new room list
2020-06-10 07:39:55 -06:00
Weblate
4761c838b6 Merge branch 'origin/develop' into Weblate. 2020-06-10 13:27:23 +00:00
Jorik Schellekens
04d91ae0af Fix code review issues
- interfaces go to the top
- fix comma conflation
- value no generic
- optionalised props
- line lints
2020-06-10 14:11:36 +01:00
Jorik Schellekens
9787b4d640
Even more lines 2020-06-10 13:50:09 +01:00
Jorik Schellekens
0ec0bbecda
lint more lines 2020-06-10 13:49:52 +01:00
Jorik Schellekens
0fb6846c9d Radio buttons 2020-06-10 13:03:00 +01:00
Weblate
b02b281b07 Merge branch 'origin/develop' into Weblate. 2020-06-10 11:34:46 +00:00
Imre Kristoffer Eilertsen
05f8a6271f Translated using Weblate (Norwegian Bokmål)
Currently translated at 56.8% (1288 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-06-10 11:34:46 +00:00
random
5e0b30edbc Translated using Weblate (Italian)
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-06-10 11:34:45 +00:00
Michael Albert
c9f0da975d Translated using Weblate (German)
Currently translated at 99.8% (2264 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-06-10 11:34:45 +00:00
jadiof
18d5b4c769 Translated using Weblate (German)
Currently translated at 99.8% (2264 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-06-10 11:34:44 +00:00
Kévin C
0a09b60eeb Translated using Weblate (French)
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-06-10 11:34:43 +00:00
Priit Jõerüüt
288b3ff46c Translated using Weblate (Estonian)
Currently translated at 58.0% (1315 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-06-10 11:34:43 +00:00
Jeff Huang
ac2ca579cf Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-06-10 11:34:42 +00:00
Slavi Pantaleev
2ae5d4d6c6 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (2268 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-06-10 11:34:42 +00:00
Besnik Bleta
1ef5da1e4b Translated using Weblate (Albanian)
Currently translated at 99.9% (2266 of 2268 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-06-10 11:34:34 +00:00
Damir Jelić
54200519f6 Merge branch 'poljar/eventindex-search-verification-state' into develop 2020-06-10 13:33:10 +02:00
Damir Jelić
f70ada4d6d Searching: Delete all the fields that we use to get back event verification. 2020-06-10 12:58:08 +02:00
Travis Ralston
0755b4c148 Add a context menu to rooms in the new room list
The tag options are not implemented out of concern for diff size. 

This splits the context menu classes out to a new "iconized" style which is common across a number of context menus, including the UserMenu.

Some of the badge/sublist styles had to change to better accommodate the menu icon lining up.

This also contains the framework required for https://github.com/vector-im/riot-web/issues/13961
2020-06-09 23:09:15 -06:00
Travis Ralston
2180a56074 Remove irrelevant property 2020-06-09 21:15:38 -06:00
Travis Ralston
111394df6d Add hover states and basic context menu to new room list
The 'sort by' radio buttons are blocked by https://github.com/matrix-org/matrix-react-sdk/pull/4731 as it contains the styles needed.

The 'unread rooms' checkbox is intentionally not hooked up. This is a more complicated refactoring that needs to be done.

The message preview checkbox works, though the previews remain hardcoded in this change. The primary intent of this change is to have a good enough context menu and the hover states.

The hover states are as described in the design.
2020-06-09 21:12:49 -06:00
Travis Ralston
8ec6d4ce76 Appease i18n 2020-06-09 19:53:07 -06:00
Travis Ralston
5f8b7187cf Update resize handle for new designs
The diff should have information on what this does and how it is supposed to work.
2020-06-09 19:48:31 -06:00
Travis Ralston
b84af372b9 Bump animation time for breadcrumbs up to 640ms
This matches the design, unlike the 300ms which was too fast.
2020-06-09 15:35:07 -06:00
Travis Ralston
84174cc440 Remove 1 extra line 2020-06-09 15:30:03 -06:00
Travis Ralston
c360800631 Add token.remove() handling to room list temp proxy
Fixes https://github.com/vector-im/riot-web/issues/13930
2020-06-09 15:26:13 -06:00
Travis Ralston
fed52f274e Fix custom theme use with new room list
Fixes https://github.com/vector-im/riot-web/issues/13968

We were grabbing "custom-" instead of the actual theme name.
2020-06-09 15:23:34 -06:00
Travis Ralston
db23aaad83 Destroy old CommunityFilterConditions when they aren't needed
Fixes https://github.com/vector-im/riot-web/issues/13971
2020-06-09 15:22:37 -06:00
Travis Ralston
1467191a5d Update the CSS transition for breadcrumbs
The actual transition length might need adjusting, but this is fairly close to what was requested.
2020-06-09 15:06:54 -06:00
Travis Ralston
b5f9c4ba8a Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-09 08:12:56 -06:00
Weblate
82debebaef Merge branch 'origin/develop' into Weblate. 2020-06-09 14:12:05 +00:00
Travis Ralston
9377fa513f Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-09 08:11:08 -06:00
Travis Ralston
eefc40e0f8 Use IDestroyable instead of IDisposable
For consistency within our project
2020-06-09 08:08:47 -06:00
Weblate
39f8dc4c20 Merge branch 'origin/develop' into Weblate. 2020-06-09 14:06:46 +00:00
Travis Ralston
724f545b4a Merge remote-tracking branch 'origin/develop' into travis/room-list/sublist-badges 2020-06-09 08:06:10 -06:00
Travis Ralston
8632d56e97 dispose -> destroy 2020-06-09 08:05:35 -06:00
Weblate
b04c8a6a85 Merge branch 'origin/develop' into Weblate. 2020-06-09 14:01:24 +00:00
Travis Ralston
d9bd3cfc38
Merge pull request #4732 from matrix-org/travis/badge-ts
Convert FormattingUtils to TypeScript and add badge utility function
2020-06-09 08:01:19 -06:00
Travis Ralston
8faa0936c9 98 -> 99+ 2020-06-09 08:01:03 -06:00
Weblate
d71478d281 Merge branch 'origin/develop' into Weblate. 2020-06-09 13:59:18 +00:00
Travis Ralston
182dd41947
Merge pull request #4736 from matrix-org/travis/room-list/filter-explore
Add filtering and exploring to the new room list
2020-06-09 07:59:13 -06:00
Travis Ralston
ae8b75214a Balance out the throttle 2020-06-09 07:58:39 -06:00
Weblate
ba0998f5af Merge branch 'origin/develop' into Weblate. 2020-06-09 13:57:10 +00:00
Travis Ralston
82f2551f85
Merge pull request #4737 from matrix-org/travis/room-list/filter-priority
Support prioritized room list filters
2020-06-09 07:57:03 -06:00
Damir Jelić
5c42294336 EventIndex: Store and restore the encryption info for encrypted events. 2020-06-09 15:26:34 +02:00
Jorik Schellekens
9b623f5b44 fix line indents 2020-06-09 13:38:29 +01:00
Weblate
a7ba3f7b99 Merge branch 'origin/develop' into Weblate. 2020-06-09 12:16:23 +00:00
Kévin C
c0b147e76f Translated using Weblate (French)
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-06-09 12:16:23 +00:00
Jeff Huang
ee5b9be34d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-06-09 12:16:23 +00:00
Jorik Schellekens
7a3ed0e496
Merge pull request #4733 from matrix-org/joriks/font-scaling-appearance
Clean up font scaling appearance
2020-06-09 13:16:15 +01:00
Travis Ralston
1f82396ec5 Remove unused type 2020-06-08 21:40:25 -06:00
Travis Ralston
3fcd5505b3 Support prioritized room list filters
This is to fix an issue where when using both the community filter panel and the search box it's an AND rather than further refining the results.

This makes the search box further refine the community filter panel results.
2020-06-08 21:38:56 -06:00
Travis Ralston
6c4c581f8f i18n 2020-06-08 20:51:51 -06:00
Travis Ralston
5114c37b82 Add filtering and exploring to the new room list
This is per the designs. Animation doesn't feel required here.

Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
2020-06-08 20:33:21 -06:00
Travis Ralston
708c65cd96 Disable new breadcrumb store when old room list is in use 2020-06-08 19:08:18 -06:00
Travis Ralston
5083811deb Appease the tests 2020-06-08 18:26:43 -06:00
Travis Ralston
eff97e6c20 Fix the tests 2020-06-08 18:18:34 -06:00
Travis Ralston
33e4ecbe86 Merge branch 'develop' into travis/badge-ts 2020-06-08 18:13:06 -06:00
Travis Ralston
9859891b4d Merge branch 'develop' into travis/room-list/sublist-badges 2020-06-08 18:12:43 -06:00
Travis Ralston
bcc455b248 Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-08 18:11:42 -06:00
Weblate
5df07e10ea Merge branch 'origin/develop' into Weblate. 2020-06-09 00:10:10 +00:00
Weblate
658d37eb69 Merge branch 'origin/develop' into Weblate. 2020-06-09 00:10:00 +00:00
Nils Haugen
87d5988d53 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 58.5% (1322 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-06-09 00:10:00 +00:00
Priit Jõerüüt
0e6e76ad85 Translated using Weblate (Estonian)
Currently translated at 58.1% (1312 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-06-09 00:09:57 +00:00
J. A. Durieux
8292ce56b0 Translated using Weblate (Dutch)
Currently translated at 90.1% (2036 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-06-09 00:09:56 +00:00
Travis Ralston
0354bf9b6d Reimplement breadcrumbs for new room list
This all-new component handles breadcrumbs a bit more smoothly for the app by always listening to changes even if the component isn't present. This allows the breadcrumbs to remain up to date for when the user re-enables breadcrumbs.

The new behaviour is that we turn breadcrumbs on once the user has a room, and we don't turn it back off for them.

This also introduces a new animation which is more stable and not laggy, though instead of sliding the breadcrumbs pop. This might be undesirable - to be reviewed.
2020-06-08 17:11:58 -06:00
Travis Ralston
086b9101fa Add sublist badge counts to new room list
Also add IDLE state to rooms
2020-06-08 13:42:18 -06:00
Travis Ralston
2c8a42927c Merge branch 'travis/badge-ts' into travis/room-list/sublist-hover 2020-06-08 12:15:56 -06:00
Travis Ralston
21c8611300 Convert FormattingUtils to TypeScript and add badge utility function
The new function is to be used in the new room list.
2020-06-08 12:14:32 -06:00
Jorik Schellekens
b4bdb23f5f Clean up font scaling appearance 2020-06-08 19:02:36 +01:00
Jorik Schellekens
24cf3d5f05 add key to react list and let selector container wrap 2020-06-08 18:37:36 +01:00
Jorik Schellekens
a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Travis Ralston
de4c2fe3d9 Use real buttons in user menu 2020-06-08 11:06:21 -06:00
Jorik Schellekens
d6a532040e lint 2020-06-08 16:57:39 +01:00
Jorik Schellekens
26eaef848b Use Element instead of HTMLElement 2020-06-08 16:53:19 +01:00
Jorik Schellekens
35ecaff399 Move Settings flag to ts 2020-06-08 16:48:32 +01:00
Travis Ralston
6002fef269 Merge branch 'travis/room-list/css-layout' into travis/room-list/user-menu 2020-06-08 09:41:38 -06:00
Travis Ralston
000c92a53f Merge branch 'develop' into travis/room-list/css-layout 2020-06-08 09:40:21 -06:00
Travis Ralston
fd8c056200 Fix i18n 2020-06-08 09:40:03 -06:00
Travis Ralston
50673496c3 Add hosting link 2020-06-08 09:32:16 -06:00
Travis Ralston
94ce23aa4b Wire up theme changer 2020-06-08 09:32:05 -06:00
Travis Ralston
acf78ae475 Wire up the remaining dialogs 2020-06-08 09:04:43 -06:00
Travis Ralston
de18af35ff Support minimum to open user settings to a particular tab
Tabs now have IDs, and we use those IDs to open things. This doesn't do any conversion to typescript, and doesn't add the same feature to the room settings out of concern for the size of diff.
2020-06-08 08:20:15 -06:00
Weblate
15212df3ae Merge branch 'origin/develop' into Weblate. 2020-06-08 14:08:40 +00:00
Jorik Schellekens
4b39ccbe26
Merge pull request #4727 from matrix-org/joriks/fix-read-receipt-overlap
Fix read receipt overlap
2020-06-08 15:08:35 +01:00
Weblate
50bd7fa0b4 Merge branch 'origin/develop' into Weblate. 2020-06-08 13:48:29 +00:00
Jorik Schellekens
fe0ae07b84
Merge pull request #4726 from matrix-org/joriks/font-scaling-unit-change
Load correct default font size
2020-06-08 14:48:24 +01:00
Jorik Schellekens
a7bc722b3f Use px where images use px width 2020-06-08 14:45:12 +01:00
Jorik Schellekens
458bea20be Load correct fonstSize default value 2020-06-08 14:31:53 +01:00
Weblate
11d9eea271 Merge branch 'origin/develop' into Weblate. 2020-06-08 13:16:06 +00:00
Michael Telatynski
36e49df025
Merge pull request #4724 from matrix-org/t3chguy/lb
send state of lowBandwidth in rageshakes
2020-06-08 14:16:02 +01:00
Weblate
7e0d028d52 Merge branch 'origin/develop' into Weblate. 2020-06-08 12:46:08 +00:00
Jorik Schellekens
2fe7c37566 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change 2020-06-08 13:37:05 +01:00
Michael Telatynski
6fe5196a19 send state of lowBandwidth in rageshakes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-08 11:43:50 +01:00
yuuki-san
4b920c88dc Translated using Weblate (Slovak)
Currently translated at 68.7% (1552 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-06-08 09:58:46 +00:00
Michael Albert
dbc2f9cbfc Translated using Weblate (German)
Currently translated at 99.7% (2253 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-06-08 09:58:45 +00:00
Travis Ralston
f05a1e532b Point buttons at the right functions 2020-06-07 22:17:02 -06:00
Travis Ralston
8e0247afe5 Add most of the UI for the new room list's menu button
Incomplete implementation: buttons don't work, some text is missing, etc
2020-06-07 22:06:41 -06:00
Travis Ralston
bb3cdd3335 Merge branch 'travis/room-list/css-layout' into travis/room-list/user-menu 2020-06-07 20:24:10 -06:00
Weblate
1e32fa02da Merge branch 'origin/develop' into Weblate. 2020-06-08 02:22:45 +00:00
Travis Ralston
e4aeabe5a6
Merge pull request #4444 from pv/jitsi-popout-immediate-join
Ensure active Jitsi conference is closed on widget pop-out
2020-06-07 20:22:39 -06:00
Weblate
fe1137855e Merge branch 'origin/develop' into Weblate. 2020-06-08 01:05:13 +00:00
Travis Ralston
760333a0ae Move function to a private function 2020-06-07 13:08:25 -06:00
Travis Ralston
a7fe7cb28d Merge remote-tracking branch 'origin/develop' into travis/room-list/sticky 2020-06-07 13:06:30 -06:00
Weblate
397660f3f3 Merge branch 'origin/develop' into Weblate. 2020-06-07 19:06:20 +00:00
Nils Haugen
8dfed9e597 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 56.6% (1278 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-06-07 19:06:20 +00:00
Imre Kristoffer Eilertsen
43be243033 Translated using Weblate (Norwegian Bokmål)
Currently translated at 56.8% (1283 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-06-07 19:06:18 +00:00
notramo
d029696049 Translated using Weblate (Hungarian)
Currently translated at 99.9% (2256 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-06-07 19:06:17 +00:00
XoseM
36597e23ed Translated using Weblate (Galician)
Currently translated at 67.3% (1521 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-07 19:06:17 +00:00
Kévin C
1af375ab0e Translated using Weblate (French)
Currently translated at 100.0% (2259 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-06-07 19:05:58 +00:00
Tirifto
d960d57721 Translated using Weblate (Esperanto)
Currently translated at 99.9% (2258 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-06-07 19:05:58 +00:00
Jeff Huang
e8c614d01e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2259 of 2259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-06-07 19:05:55 +00:00
Travis Ralston
9b928b5a5d Handle remaining cases for room updates in new room list
For https://github.com/vector-im/riot-web/issues/13635

This adds support for:
* Tag changes
* DM changes
* Marking our own rooms as read
* Our own membership changes

The remaining branch we didn't need was the alternate 'new room' branch, so it was removed.

This is not optimized - optimization is deferred.
2020-06-05 20:12:32 -06:00
Travis Ralston
0bb1eefdea Remove view_room listener as it isn't needed
We use the RoomViewStore
2020-06-05 19:47:15 -06:00
Travis Ralston
021d6d626e Merge branch 'develop' into travis/room-list/css-layout 2020-06-05 19:44:09 -06:00
Travis Ralston
6548748d7c Introduce sticky rooms to the new room list
Originally this was intended to be done only in the importance algorithm, however it is clear that all algorithms will need to deal with this. As such, it has been put into the base class to deal with as we may override it in the future. 

This commit should be self-documenting enough to describe what is going on, though the major highlight is that the handling of the sticky room is done by lying to the underlying algorithm.

This has not been optimized for performance yet.

For https://github.com/vector-im/riot-web/issues/13635
2020-06-05 18:44:38 -06:00
Weblate
09ba491afd Merge branch 'origin/develop' into Weblate. 2020-06-05 22:54:27 +00:00
Michael Telatynski
0c32daa162 label ZWJ as such
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 23:34:04 +01:00
Michael Telatynski
69ea635398 Allow searching the emoji picker using other emoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 23:19:00 +01:00
Travis Ralston
2806c8c18b Fix temporary class 2020-06-05 14:13:28 -06:00
Travis Ralston
1d8833e9f8 Selected state, cleanup, and profile display 2020-06-05 14:08:20 -06:00
Travis Ralston
ea6b0a60ab Merge branch 'develop' into travis/room-list/css-layout 2020-06-05 13:19:00 -06:00
Weblate
46c31d190e Merge branch 'origin/develop' into Weblate. 2020-06-05 19:18:05 +00:00
Travis Ralston
ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize
New room list scrolling and resizing
2020-06-05 13:17:59 -06:00
Travis Ralston
e93a41c5fb Minor clarity 2020-06-05 13:14:44 -06:00
Weblate
8b09d7052a Merge branch 'origin/develop' into Weblate. 2020-06-05 17:27:06 +00:00
Travis Ralston
68e59a3655
Merge pull request #4696 from aaronraimist/empty-formatbar
Don't show FormatBar if composer is empty
2020-06-05 11:27:00 -06:00
Travis Ralston
51038b0c02 Replace math hacks with temporary placeholder 2020-06-05 11:03:18 -06:00
Weblate
42215c5ed8 Merge branch 'origin/develop' into Weblate. 2020-06-05 16:07:18 +00:00
David Baker
b82a893a79 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-05 16:00:43 +01:00
Travis Ralston
475ba61671 Give the show more button some real CSS
This is still somewhat placeholder.
2020-06-05 08:48:23 -06:00
Travis Ralston
6752c2832e Add missing var 2020-06-05 08:40:32 -06:00
Travis Ralston
211ad66fea Fix i18n 2020-06-05 08:39:38 -06:00
Travis Ralston
b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-05 08:39:19 -06:00