551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
637e3afa48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-29 11:31:30 +05:30
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
4d6ad91e52
Add export option to right panel
2021-06-25 22:45:14 +05:30
1d374f6cbb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731
2021-06-25 14:50:24 +01:00
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
086042f078
update message context texts and icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:53 +02:00
6ea79b297f
tweak message context icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:51 +02:00
62efea7e19
add message context menu icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
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
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
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
65c477f45f
Add sidebar icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:17:00 +02:00
90bb7c1482
Switch Space Settings for a tabbed view with a bunch more settings exposed
2021-06-08 16:33:47 +01:00
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
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591
2021-06-04 07:59:28 +02:00
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
3a0b6eb466
Add a warning icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:40:08 +02:00
13427aaf07
Add a pulse animation to the pinned messages indicator and move it
2021-05-25 13:07:39 +01:00
cbc31b43a4
Add icons for silencing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:23:07 +02:00
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
17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-05-19 08:46:33 +02:00
74cc00b319
Merge branch 'develop' into better-spinners
2021-05-16 07:47:34 -04:00
24d49efe33
Merge pull request #6031 from matrix-org/niquewoodhouse-spaces-beta-img
...
Update spaces.png
2021-05-13 16:26:16 +01:00
fa17b3b3cb
Update spaces.png
...
Update spaces.png to be a smaller file size.
2021-05-13 15:24:47 +01:00
3af0138e9d
Update emoji icons to new style
2021-05-13 10:28:35 +01:00
4a6d8ebdf0
Add screensharing icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 20:29:26 +02:00
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
1802adb4d2
Iterate styling and decoration for the beta prompts
2021-04-28 22:47:08 +01:00
6764b8d645
Change symbol names
2021-04-28 09:29:31 -06:00
30e120284d
Add simple play/pause controls
2021-04-27 15:02:15 -06:00
c5f653245a
Show Spaces beta card in Labs & My Communities view
...
the image is temporary
2021-04-27 16:29:42 +01:00
3a62f6cdaa
Merge branch 'develop' into better-spinners
2021-04-26 14:12:44 -04:00
5c7476b5af
Remove spinner.gif
...
All spinners throughout the app have been vectorized, and thus this GIF
is no longer necessary.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-26 14:10:30 -04:00
91b3688feb
Redesign "failed to send messages" status bar
2021-04-21 16:24:17 -06:00
9606297f7c
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:15:51 +02:00
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11
...
Tweak and fix some space features
2021-03-25 09:02:11 +00:00
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp
...
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
a2a1e37fa3
Add prompt to bottom of room list to invite to space
2021-03-24 14:18:06 +00:00
d04c8b3fb4
Improve discovery of rooms in a space
2021-03-19 11:54:10 +00:00
b5d32d92f3
Wire up a simple record button
2021-03-16 22:58:44 -06:00
b27a8e3c3a
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-14 08:30:28 +01:00
4811154f25
Remove now-unused assets and CSS from CompleteSecurity step
2021-03-12 15:24:16 -07:00
52621946de
Merge pull request #5723 from matrix-org/travis/uploads
...
Refresh UI for file uploads
2021-03-08 08:52:51 -07:00
08072aca9a
Add upload icon, fix cancel button, refresh styles
2021-03-05 14:42:15 -07:00
017c2af663
Merge branch 'develop' into travis/message-states
2021-03-05 09:29:39 -07:00
676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui
...
File drop UI fixes and improvements
2021-03-04 20:30:45 -07:00
c74224a1b7
Merge branch 'develop' into travis/message-states
2021-03-02 10:40:49 -07:00
ca1bd78921
Add space specific variant of the dropdown on "Rooms +" sublist
2021-03-02 14:20:29 +00:00
9cec382865
Change sending->sent state to match new designs
...
For https://github.com/vector-im/element-web/issues/16424
2021-03-01 16:25:19 -07:00
c10512fd56
Initial SpaceRoomView work
2021-03-01 18:53:11 +00:00
483d56320c
Beginning of space creation UX from space panel
2021-03-01 17:47:40 +00:00
70f1303544
Fix invite svg viewbox
2021-03-01 16:48:35 +00:00
d248a5fa5d
Merge pull request #5689 from matrix-org/t3chguy/spaces2
...
Space Store and Space Panel for Room List filtering
2021-03-01 09:42:04 +00:00
f21aedc6cf
Add Space Panel with Room List filtering
2021-02-26 10:41:26 +00:00
6a7340e8be
Use new upload icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:46:48 +01:00
984b4372db
Remove trash red icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:25:24 +01:00
7fc3758056
Add newline
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:23:59 +01:00
a4130cb7f3
Revert trash icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:23:27 +01:00
5a9e1a1482
Fix close icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:10:54 +01:00
0a00ffa9d6
Add more icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 18:10:50 +01:00
40b684d7de
Vectorize spinners
...
This replaces most of the GIF spinners used throughout the app with an
SVG that respects the user's theme. However, spinner.gif is still
retained for the room timeline avatar uploader component, since it is
more difficult to replace.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-02-23 20:22:09 -05:00
6cf19e8897
Update icons according to the design
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 21:04:21 +01:00
e5d68142c6
Remove zoom icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-23 20:47:42 +01:00
87d5d73025
Merge branch 'develop' into improve-image-view
2021-02-23 20:42:16 +01:00
2b4859a858
Merge branch 'develop' into fix-4963
2021-02-12 16:30:01 +01:00
23140a84ff
Remove host signup config strings, make translatable instead
...
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
d75e2d19dc
Remove unnecessary host_signup.png
2021-02-09 11:33:16 +02:00
5fe3c83f27
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-09 11:18:51 +02:00
84eba59afa
Merge branch 'develop' into improve-codeblock
2021-02-08 15:26:50 +01:00
9a97b40ce9
Remove old icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:17 +01:00
cdb0d1c12e
Move and use icons from widget dir
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-08 15:22:10 +01:00
6ccce7142c
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-03 22:35:22 +02:00
0e94d08d9a
Update SSO Twitter social branding to match guidelines
2021-02-02 17:29:19 +00:00
1ba0999915
Update SSO Facebook social branding to match guidelines
2021-02-02 17:19:18 +00:00
2c2cf4c073
Update google branding
2021-01-29 11:42:34 +00:00
34ae766893
Wire up MSC2858 brand attribute
...
For better brand adherance.
Also removes old support for https IdP icons.
2021-01-27 16:15:47 +00:00
e2abbf9a7c
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 08:12:32 +01:00
58b2c18cf5
This somehow works
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 21:02:39 +01:00
158036ccf9
Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-01-15 16:12:53 +02:00
e8c716f33e
First stage of host signup flow now sits here
...
Need to make things configurable, image and text for the first step should be configurable.
Also missing privacy related words, though they should be configurable too.
2021-01-11 15:47:21 +02:00
7d120f7183
Simplifie svg
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-09 09:33:11 +01:00
4538274e74
Added send message icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-09 09:25:29 +01:00
4b43929aa3
Add in-call dialpad for DTMF sending
...
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573
2021-01-04 20:01:43 +00:00
452fbb076b
Add a dialpad UI for PSTN lookup
...
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
2020-12-23 19:02:01 +00:00
f771b7ac98
Added zoom button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-20 20:37:31 +01:00
3c306bc54b
Added icons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-19 12:54:55 +01:00
6916b5d7c6
Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui
2020-12-03 17:57:22 +00:00
5b7ad079d2
Add SVGs
2020-11-26 14:55:07 +00:00
758b47c64d
Replace *ServerConfig and SignInToText with ServerPicker
2020-11-25 09:46:56 +00:00
729d59160d
Rename buttons in CSS & remove unused
2020-11-23 15:27:37 +00:00
eca1851f02
Rename voip buttons
2020-11-23 15:21:18 +00:00
49bd66c377
Change fullscreen button to expand button in PIP view
...
and fix call controls which didn't appear in video call
2020-11-19 16:36:23 +00:00
50965e41eb
Remove call bar
...
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
2020-11-19 15:15:31 +00:00
41e885dd67
Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview
2020-11-18 14:28:03 +00:00
a2d58e2f1f
Make new in-call UI work
...
* Buttons on the main view will disappear after 1 second of the user
not moving the mouse over the call view.
* PIP view has no buttons, and not moveable yet
* No call status in room view yet
* Room status bar is still there currently
2020-11-18 14:22:38 +00:00
edb5e10506
Iterate registration to simplify it based on usertesting
2020-11-11 17:04:10 +00:00
af71b0735d
Change icon for the Create Event bubble tile
2020-11-04 17:24:03 +00:00
4afa610ee1
Add variant of default home page for justRegistered
2020-11-02 17:24:47 +00:00
Jaiwanth