Michael Telatynski
c4fc70b9be
Post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:28:36 +01:00
Michael Telatynski
70c81cc377
Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
src/i18n/strings/en_EN.json
src/rageshake/submit-rageshake.ts
2020-07-21 22:22:28 +01:00
Travis Ralston
bcc6c96030
Merge pull request #5032 from matrix-org/travis/perf/blur-bg
...
Don't hammer on the layout engine with avatar updates for the background
2020-07-21 15:07:58 -06:00
Travis Ralston
0a846cb1b5
Don't hammer on the layout engine with avatar updates for the background
...
Changing the property on every render of the left panel (which is basically all the time) is super bad on the GPU and for our CPU. We should only do that when something changes.
2020-07-21 15:02:59 -06:00
Travis Ralston
ba73ce16e6
Merge pull request #5031 from matrix-org/travis/room-list/a-z-order
...
Ensure incremental updates to the ImportanceAlgorithm trigger A-Z order
2020-07-21 14:28:46 -06:00
Travis Ralston
6a38833a2b
Ensure incremental updates to the ImportanceAlgorithm trigger A-Z order
...
Fixes https://github.com/vector-im/riot-web/issues/14475
Background: Sticky rooms are actually a pair of lies to the underlying algorithm as a combination of REMOVE_ROOM/NEW_ROOM calls so they don't get considered as needing to be sorted. When a room is added under the importance algorithm, it is expected that the category it is being added to will be re-sorted to account for the change, however we weren't doing that since we optimized the NewRoom path to be a splice operation.
2020-07-21 14:12:58 -06:00
Hubert Chathi
cbe4f04cd7
Merge pull request #5029 from uhoreg/sanitize_language
...
don't syntax highlight languages that begin with "_"
2020-07-21 13:12:51 -04:00
Michael Telatynski
e54eea0c51
Merge pull request #4956 from matrix-org/t3chguy/ts/1
...
Convert Modal to TypeScript
2020-07-21 17:55:20 +01:00
Hubert Chathi
2ce493307e
don't syntax highlight languages that begin with "_"
2020-07-21 12:47:40 -04:00
Jorik Schellekens
8ac2c7219f
Merge pull request #4815 from matrix-org/joriks/eslint-config
...
Use new eslint dependency and remove tslint
2020-07-21 16:29:55 +01:00
Jorik Schellekens
22994bddf4
Update src/indexing/BaseEventIndexManager.ts
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-07-21 16:22:17 +01:00
Jorik Schellekens
a06cc77411
Remove unused imports
2020-07-21 15:34:00 +01:00
Jorik Schellekens
501e0c29ca
Merge remote-tracking branch 'origin' into joriks/eslint-config
2020-07-21 15:32:50 +01:00
Travis Ralston
37aed54d12
Merge pull request #5024 from matrix-org/travis/room-list/custom-tags
...
Support custom tags in the room list again
2020-07-21 06:46:50 -06:00
Michael Telatynski
a1effe04ad
Merge pull request #5028 from matrix-org/t3chguy/fix/14671
...
Fix the tag panel context menu
2020-07-21 13:26:05 +01:00
Michael Telatynski
ae069576f6
Fix the tag panel context menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 10:33:30 +01:00
Jorik Schellekens
be5db851ca
Revert unsafe rename and use boolean coercion
2020-07-21 10:29:05 +01:00
Travis Ralston
de35e0dfcd
Update i18n
2020-07-20 16:56:41 -06:00
Travis Ralston
a0b2859436
Support custom tags in the room list again
...
Fixes https://github.com/vector-im/riot-web/issues/14091
Design needs work, however this is behind labs anyways. This re-implements the behaviour of the old room list.
The implementation ended up being a lot easier due to early confusion with what the TagOrderStore and TagPanel take care of. Turns out they don't deal with tags, but groups. As such, we don't need to do anything with filtering (though we keep some sanity checks in place for safety), and just have to wire up the CustomRoomTagPanel and CustomRoomTagStore.
2020-07-20 16:51:16 -06:00
Travis Ralston
4de1645ac7
Merge pull request #5021 from matrix-org/t3chguy/room-list/14631
...
Tag Watcher don't create new filter if not needed, confuses references
2020-07-20 15:13:09 -06:00
Jorik Schellekens
6219e67a8a
add dep eslint-config-matrix-org
2020-07-20 21:19:49 +01:00
Jorik Schellekens
6433e163f7
Use variable name instead of _
2020-07-20 20:55:35 +01:00
Jorik Schellekens
3cf8dff70d
FIx coment
2020-07-20 20:50:12 +01:00
Jorik Schellekens
d86eb5eb9e
Lint new new code
2020-07-20 20:48:27 +01:00
Jorik Schellekens
c0ce6e8161
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config
2020-07-20 20:44:52 +01:00
Jorik Schellekens
4ba1f91a2b
Fix lint issues in new code
2020-07-20 20:43:55 +01:00
Jorik Schellekens
c3ffbdbdbc
Fix naming format errors
2020-07-20 20:02:21 +01:00
Michael Telatynski
e0ac956442
Merge pull request #4978 from matrix-org/t3chguy/ts/2
...
Convert editor to TypeScript
2020-07-20 17:34:53 +01:00
Michael Telatynski
7a05476c50
add missing types
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 17:10:08 +01:00
Michael Telatynski
9fca422de7
Merge branches 'develop' and 't3chguy/ts/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/2
2020-07-20 17:07:18 +01:00
Michael Telatynski
06cc76f7d8
mark some things as public
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 16:34:52 +01:00
Michael Telatynski
ed0d9973b7
Switch to a discriminated unions
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 16:33:53 +01:00
Jorik Schellekens
b3fa855bd8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config
2020-07-20 16:22:32 +01:00
Michael Telatynski
6ef9a2474c
Merge branches 'develop' and 't3chguy/ts/1' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/1
...
Conflicts:
src/@types/global.d.ts
2020-07-20 15:38:48 +01:00
Michael Telatynski
44043d6dd5
Merge pull request #4977 from matrix-org/t3chguy/query-matcher-unhomoglyph
...
Query Matcher use unhomoglyph for a little bit more leniency
2020-07-20 15:35:47 +01:00
Michael Telatynski
446e8de39e
Merge pull request #5017 from matrix-org/t3chguy/fix/14596
...
Fix Breadcrumbs2 ending up with 2 tabIndexes on Firefox
2020-07-20 15:35:07 +01:00
Michael Telatynski
0de6cada57
Merge pull request #5023 from matrix-org/t3chguy/room-list/14644
...
Add min-width to floating Jitsi
2020-07-20 15:24:26 +01:00
Michael Telatynski
ee8d885e70
Merge pull request #5020 from matrix-org/t3chguy/fix/14649
...
Update crypto event icon to match rest of app styling
2020-07-20 15:21:03 +01:00
Michael Telatynski
ce398c0b34
Merge pull request #5019 from matrix-org/t3chguy/fix/14650
...
Fix Reactions Row Button vertical misalignment due to forced height
2020-07-20 15:20:14 +01:00
Michael Telatynski
f02115f2a9
Merge branches 'develop' and 't3chguy/fix/14596' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/14596
2020-07-20 15:20:08 +01:00
Michael Telatynski
9e6532e46e
Merge pull request #5016 from matrix-org/t3chguy/tooltips2
...
Use mouseleave instead of mouseout for hover events. Fix tooltip flicker
2020-07-20 15:19:32 +01:00
Michael Telatynski
dba54115ac
Merge pull request #5015 from matrix-org/t3chguy/fix/14595
...
Fix slash commands null guard
2020-07-20 15:19:19 +01:00
Michael Telatynski
476c3eb7c8
Merge pull request #5014 from matrix-org/t3chguy/tooltips
...
Fix field tooltips
2020-07-20 15:18:53 +01:00
Michael Telatynski
b78fa9fb92
Merge pull request #5022 from matrix-org/t3chguy/fix/14653
...
Fix community right panel button regression
2020-07-20 15:18:42 +01:00
Michael Telatynski
828cfb7138
Add min-width to floating Jitsi
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 15:15:21 +01:00
Michael Telatynski
8063263665
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 14:56:47 +01:00
Michael Telatynski
8aceb11992
Fix community right panel button regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 14:47:06 +01:00
Michael Telatynski
29defa3e57
Tag Watcher don't create new filter if not needed, confuses references
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 14:36:12 +01:00
Michael Telatynski
dfed3342b6
Fix white infill and verified/warning icons too
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 14:09:16 +01:00
Michael Telatynski
519ebdb67a
Update crypto event icon to match rest of app styling
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 14:05:07 +01:00