OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
38,728 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

345 Commits (ffa823e0d4527cf19d33f46fd1aa8a5885543f1e)

Author SHA1 Message Date
Travis Ralston 71c5b02390 Add feature flag for polls and placeholder dialog 
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
 2021-10-12 15:13:56 -06:00
Jaiwanth 208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Germain Souquet 160bf8e21f Fix missing prop 2021-09-28 11:06:06 +01:00
Dariusz Niemczyk 0cfa2a58c7
Add ability to expand and collapse long quoted messages (#6701) 
In case where we had a very long message the experience of going between 
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.

Fixes https://github.com/vector-im/element-web/issues/18884
 2021-09-27 12:20:37 +02:00
Jaiwanth 94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
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 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
Jaiwanth 0e3ad652af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-14 00:04:30 +05:30
Š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
Michael Telatynski be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Jaiwanth 036d8a15c6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:36:43 +05:30
Robin Townsend 5e3b79eeca Remove seams from pin icon 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-08-04 18:42:47 -04:00
Jaiwanth 46e2f67f54 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-03 10:03:16 +05:30
Jaiwanth 17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
Š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
Jaiwanth b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Š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
Jaiwanth 1ed316851a Merge upstream and resolve conflicts 2021-07-21 11:35:27 +05:30
Š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
Jaiwanth fe2cac56f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-19 12:57:27 +05:30
Š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
Jaiwanth 551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Michael Telatynski 26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Jaiwanth 637e3afa48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-29 11:31:30 +05:30
Jaiwanth 398d49245f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-06-26 23:42:42 +05:30
Jaiwanth 4d6ad91e52 Add export option to right panel 2021-06-25 22:45:14 +05:30
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