Michael Telatynski
|
a688e5b8b3
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
Conflicts:
src/components/structures/LoggedInView.tsx
src/stores/SpaceStore.tsx
|
2021-09-06 11:41:09 +01:00 |
|
Germain
|
e7cfa4816e
|
Merge pull request #6582 from SimonBrandner/fix/bubble-highlight/18295
|
2021-09-06 09:56:16 +01:00 |
|
Travis Ralston
|
f0cf00433b
|
Merge pull request #6702 from nordeck/nic/fix/even-tile-preview
Replace fake username in EventTilePreview with a proper loading state
|
2021-09-01 14:28:12 -06:00 |
|
Michael Telatynski
|
34e9443abc
|
Merge pull request #6722 from SimonBrandner/fix/autocomplete-dir
|
2021-09-01 14:45:30 +01:00 |
|
Šimon Brandner
|
4328ee18f5
|
Show autocomplete sections vertically
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-09-01 15:37:59 +02:00 |
|
Germain
|
7621a9a0f3
|
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349
|
2021-09-01 08:47:10 +01:00 |
|
Steffen Kolmer
|
9fdc5659b7
|
Fixed eslint error and copyright header
|
2021-08-28 13:56:08 +02:00 |
|
Steffen Kolmer
|
d76adde1ab
|
Use scss instead of inline styles
|
2021-08-28 13:41:24 +02:00 |
|
Šimon Brandner
|
2d47f453cd
|
Update styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-26 16:19:46 +02:00 |
|
Šimon Brandner
|
e8bf7ac227
|
Merge remote-tracking branch 'upstream/develop' into fix/bubble-highlight/18295
|
2021-08-26 15:40:40 +02:00 |
|
Šimon Brandner
|
6003e12e48
|
Fix color name
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-26 15:12:26 +02:00 |
|
Šimon Brandner
|
408c327943
|
Merge remote-tracking branch 'upstream/develop' into fix/codeblock-border/18367
|
2021-08-26 15:11:46 +02:00 |
|
Germain Souquet
|
bd1aa01b67
|
Update copyright and method accessors
|
2021-08-26 08:19:44 +01:00 |
|
Travis Ralston
|
aa0a753105
|
Merge pull request #6681 from SimonBrandner/fix/codeblock-formatting
Fix codeblock formatting with syntax highlighting on
|
2021-08-25 13:36:47 -06:00 |
|
Šimon Brandner
|
9f791031a8
|
Fix codeblock formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-25 18:54:52 +02:00 |
|
Šimon Brandner
|
ecd45f7a81
|
Use min-height instead of height
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-25 18:38:36 +02:00 |
|
Travis Ralston
|
dc32df1ba5
|
Merge pull request #6639 from SimonBrandner/feature/voice-activity
Add active speaker indicators
|
2021-08-25 09:16:37 -06:00 |
|
Germain Souquet
|
77a463e679
|
Merge branch 'develop' into gsouquet/threaded-messaging-2349
|
2021-08-25 08:53:16 +01:00 |
|
Travis Ralston
|
49453f2d49
|
Merge pull request #6604 from SimonBrandner/task/colors-2
Color de-duplication #2
|
2021-08-24 12:37:18 -06:00 |
|
Germain Souquet
|
54a0a869bf
|
PR feedback
|
2021-08-24 09:09:28 +01:00 |
|
Šimon Brandner
|
751c57ecc2
|
Add some padding to the Add button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-24 10:05:24 +02:00 |
|
Šimon Brandner
|
2920da8b8b
|
Fix a merge regression
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-24 09:33:16 +02:00 |
|
Šimon Brandner
|
3d9a0286dc
|
Revert "$avatar-bg-color -> $background"
This reverts commit a3a6f73049 .
|
2021-08-24 09:04:17 +02:00 |
|
Šimon Brandner
|
bf87413442
|
Revert "$roomlist-header-color -> $tertiary-content"
This reverts commit 25a3a8ddfd .
|
2021-08-24 09:02:17 +02:00 |
|
Šimon Brandner
|
64ed96e09a
|
Remove line of unknown origin
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-24 08:59:12 +02:00 |
|
Šimon Brandner
|
b6ea75b681
|
Merge remote-tracking branch 'upstream/develop' into task/colors-2
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-24 08:57:12 +02:00 |
|
Germain Souquet
|
edd4d42e7f
|
Merge branch 'develop' into gsouquet/threaded-messaging-2349
|
2021-08-23 17:31:37 +01:00 |
|
Germain Souquet
|
9facb0d963
|
Polish UI
|
2021-08-23 14:44:44 +01:00 |
|
David Baker
|
b391ee0bbf
|
Merge pull request #6451 from SimonBrandner/fix/replies-bubble/18184
Fix replies on the bubble layout
|
2021-08-23 11:29:28 +01:00 |
|
Germain
|
1fad454fe0
|
Merge pull request #6655 from SimonBrandner/fix/autocomplete-scroll
|
2021-08-23 11:16:02 +01:00 |
|
Germain Souquet
|
393bd4871f
|
Merge branch 'develop' into gsouquet/threaded-messaging-2349
|
2021-08-23 10:15:35 +01:00 |
|
Šimon Brandner
|
1c93e18c0a
|
Move CallPreview CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-22 15:22:21 +02:00 |
|
Šimon Brandner
|
d29a18b182
|
Fix some sizing issue on video feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-22 10:10:05 +02:00 |
|
Šimon Brandner
|
61188561d2
|
Merge remote-tracking branch 'upstream/develop' into feature/voice-activity
|
2021-08-22 10:01:17 +02:00 |
|
Šimon Brandner
|
cb7e44f4f5
|
Always show a transparent border to avoid icon jumps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-22 09:08:33 +02:00 |
|
Šimon Brandner
|
b58184d61e
|
Make autocomplete smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-21 19:04:26 +02:00 |
|
Šimon Brandner
|
81d64bec58
|
Fix autocomplete scrollbar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-21 18:18:53 +02:00 |
|
Travis Ralston
|
3e19fc1984
|
Merge pull request #6620 from SimonBrandner/feature/vertical-autocomplete/18558
Format autocomplete suggestions vertically
|
2021-08-20 09:10:36 -06:00 |
|
Germain Souquet
|
30a762944a
|
Implement a very low fidelity UI for threads
|
2021-08-20 12:11:04 +01:00 |
|
David Baker
|
ea38990d94
|
Merge pull request #6647 from SimonBrandner/fix/call-tile-bubbles/18648
Fix call tiles on the bubble layout
|
2021-08-20 09:24:42 +01:00 |
|
Šimon Brandner
|
952fdd04c1
|
Fix call tiles on the bubble layout
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-20 10:04:40 +02:00 |
|
Travis Ralston
|
fcf47f6539
|
Merge pull request #6626 from SimonBrandner/fix/correct-colors-call-tiles
Adjust colors in call tiles
|
2021-08-20 00:02:56 -06:00 |
|
Germain Souquet
|
ffc7326b0c
|
Merge branch 'develop' into gsouquet/threaded-messaging-2349
|
2021-08-19 10:44:32 +01:00 |
|
Šimon Brandner
|
abab31c33b
|
Add a speaking indicator
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-19 11:42:43 +02:00 |
|
Dariusz Niemczyk
|
7adfbf6f98
|
Show blurhash only after 150ms
Blurhash on every single room entrance was extremely annoying, to the
point where it wasn't really helpful, but distracting, even after
the animations was added.
This commit makes it so the blurhash is only shown after 150ms, and the
image will be animated as a quick fade-in if there's no blurhash.
Fixes https://github.com/vector-im/element-web/issues/18617
Fixes https://github.com/vector-im/element-web/issues/17879
|
2021-08-19 07:52:23 +02:00 |
|
David Baker
|
5fa0908752
|
Merge pull request #6624 from SimonBrandner/fix/call-tile-button/18565
Fix call tile buttons
|
2021-08-18 12:03:18 +01:00 |
|
David Baker
|
24e3a91f6f
|
Merge pull request #6618 from SimonBrandner/fix/long-names-call-tiles
Fix long display names in call tiles
|
2021-08-18 11:56:09 +01:00 |
|
David Baker
|
3a733d1604
|
Merge pull request #6616 from SimonBrandner/fix/access-token-overflow
Avoid access token overflow
|
2021-08-18 11:54:40 +01:00 |
|
Germain Souquet
|
95f4513bd2
|
Make UI respond to thread events
|
2021-08-17 17:42:47 +01:00 |
|
Germain Souquet
|
458f860a26
|
Merge branch 'develop' into gsouquet/threaded-messaging-2349
|
2021-08-17 11:14:21 +01:00 |
|