Germain Souquet
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
Germain Souquet
d1dbfbd014
hide thread events from the timeline
2021-08-17 11:10:02 +01:00
Šimon Brandner
fa204c4104
Add declined call buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:34:11 +02:00
Robin Townsend
5e3b79eeca
Remove seams from pin icon
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 18:42:47 -04:00
Šimon Brandner
152168ef2d
Add mic mute icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 10:20:59 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Šimon Brandner
4aa8d8ff21
Add missed call icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:36:41 +02:00
Šimon Brandner
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
Michael Telatynski
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Šimon Brandner
4546df7246
Update sidebar icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:13:54 +02:00
Šimon Brandner
e5563ac60b
Update the screen-sharing buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:11:55 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02:00
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02:00
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
Travis Ralston
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Šimon Brandner
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
Šimon Brandner
375e279825
Add speaker icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:15:48 +02:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
Travis Ralston
3ae76c84f6
Add a simple TagComposer for the keywords entry
2021-07-12 23:55:08 -06:00
Šimon Brandner
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
Michael Telatynski
1d374f6cbb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731
2021-06-25 14:50:24 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu ( #6237 )
...
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
Michael Weimann
086042f078
update message context texts and icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:53 +02:00
Michael Weimann
6ea79b297f
tweak message context icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:51 +02:00
Michael Weimann
62efea7e19
add message context menu icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
Michael Telatynski
cdb97d5494
Fix trashcan.svg by exporting it with its viewbox
...
then fix sizing and alignment of consumers
2021-06-23 12:30:23 +01:00
Michael Telatynski
1286be1ffb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
Šimon Brandner
65c477f45f
Add sidebar icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:17:00 +02:00
Michael Telatynski
90bb7c1482
Switch Space Settings for a tabbed view with a bunch more settings exposed
2021-06-08 16:33:47 +01:00
Šimon Brandner
1d3bf91e83
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 08:19:29 +02:00
Šimon Brandner
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591
2021-06-04 07:59:28 +02:00
Šimon Brandner
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 07:49:05 +02:00
Šimon Brandner
3a0b6eb466
Add a warning icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:40:08 +02:00
Michael Telatynski
13427aaf07
Add a pulse animation to the pinned messages indicator and move it
2021-05-25 13:07:39 +01:00
Šimon Brandner
cbc31b43a4
Add icons for silencing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:23:07 +02:00
Robin Townsend
332412782e
Remove logo spinner
...
Removed since design wants to avoid associating slowness with the brand.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-20 17:31:10 -04:00
Šimon Brandner
17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-05-19 08:46:33 +02:00
Robin Townsend
74cc00b319
Merge branch 'develop' into better-spinners
2021-05-16 07:47:34 -04:00
J. Ryan Stinnett
24d49efe33
Merge pull request #6031 from matrix-org/niquewoodhouse-spaces-beta-img
...
Update spaces.png
2021-05-13 16:26:16 +01:00
Nique Woodhouse
fa17b3b3cb
Update spaces.png
...
Update spaces.png to be a smaller file size.
2021-05-13 15:24:47 +01:00
Michael Telatynski
3af0138e9d
Update emoji icons to new style
2021-05-13 10:28:35 +01:00
Šimon Brandner
4a6d8ebdf0
Add screensharing icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 20:29:26 +02:00
Michael Telatynski
a4f02937cb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
res/css/structures/_SpaceRoomView.scss
src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
Michael Telatynski
1802adb4d2
Iterate styling and decoration for the beta prompts
2021-04-28 22:47:08 +01:00
Travis Ralston
6764b8d645
Change symbol names
2021-04-28 09:29:31 -06:00
Travis Ralston
30e120284d
Add simple play/pause controls
2021-04-27 15:02:15 -06:00