Commit Graph

25212 Commits (54200519f6f22fe9de15f0b6f7a90e32bc92a6b9)

Author SHA1 Message Date
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 7549d7d98a
Merge pull request #4739 from matrix-org/travis/room-list/destroyable
Use IDestroyable instead of IDisposable
2020-06-09 08:12:00 -06:00
Travis Ralston eefc40e0f8 Use IDestroyable instead of IDisposable
For consistency within our project
2020-06-09 08:08:47 -06:00
Travis Ralston bed4766ec4
Merge pull request #4734 from matrix-org/travis/room-list/sublist-badges
Add/improve badge counts in new room list
2020-06-09 08:06:41 -06: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
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
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
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 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 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 ae1d14d29f
Merge pull request #4722 from matrix-org/travis/room-list/user-menu
Add user menu to new room list
2020-06-08 18:10:05 -06:00
Travis Ralston fc93a95974
Merge pull request #4711 from matrix-org/travis/room-list/css-layout
New room list basic styling and layout
2020-06-08 18:09:48 -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
Travis Ralston 1487be5979 Merge branch 'travis/room-list/css-layout' into travis/room-list/sublist-hover 2020-06-08 11:47:48 -06:00
Travis Ralston de4c2fe3d9 Use real buttons in user menu 2020-06-08 11:06:21 -06: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
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
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
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
Jorik Schellekens 349d7a5700
Merge pull request #4725 from matrix-org/joriks/font-scaling-unit-change
Change internal font size from from 15 to 10
2020-06-08 13:46:04 +01: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
J. Ryan Stinnett b35cde4546
Merge pull request #4723 from matrix-org/jryans/upgrade-deps-2020-06-05
Upgrade deps
2020-06-08 10:58:38 +01:00
J. Ryan Stinnett 1315ed503b Upgrade deps 2020-06-08 10:12:11 +01:00
Travis Ralston f05a1e532b Point buttons at the right functions 2020-06-07 22:17:02 -06:00
Travis Ralston 8b6b117fbf Appease the linter 2020-06-07 22:15:54 -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
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