Commit Graph

31481 Commits

Author SHA1 Message Date
Travis Ralston
017c2af663 Merge branch 'develop' into travis/message-states 2021-03-05 09:29:39 -07:00
J. Ryan Stinnett
06ad9f0fb8
Merge pull request #5721 from matrix-org/jryans/edge
Add Edge to the targets list
2021-03-05 13:31:10 +00:00
J. Ryan Stinnett
1c1d239d5b Add Edge to the targets list
Part of https://github.com/vector-im/element-web/issues/9175
2021-03-05 13:19:06 +00:00
Travis Ralston
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
Travis Ralston
65ac063a09
Merge pull request #5715 from 2580ayush2580/ayush258012
Fix Bottom border of state counters is white on the dark theme
2021-03-04 20:28:52 -07:00
Michael Telatynski
c73ad9e594
Merge pull request #5332 from Transfusion/trim_display_name
Trim spurious whitespace of nicknames
2021-03-04 16:26:09 +00:00
Jason Robinson
2b2fbabbc0
Merge pull request #5716 from matrix-org/jaywink/host-signup-dialog-borders
Ensure HostSignupDialog border colour matches light theme
2021-03-04 13:38:49 +02:00
Jason Robinson
f2d2a048e1 Ensure HostSignupDialog border colour matches light theme
Ensure dialog borders are always white as the HostSignupDialog
does not yet support dark mode or theming in general.
In the future we might want to pass the theme to the called
iframe, should some hosting provider have that need.
2021-03-04 11:07:14 +02:00
Ayush Kumar
1cb19554eb Fix Bottom border of state counters is white on the dark theme 2021-03-04 14:03:02 +05:30
David Baker
2f52412834
Merge pull request #5712 from matrix-org/dbkr/dont_place_multiple_calls
Don't place another call if there's already one ongoing
2021-03-03 20:36:16 +00:00
David Baker
d8483ddf0d Don't place another call if there's already one ongoing
The 'call' button doesn't turn into a hangup button as soon as there's
a call in the room, but we should have been doing this anyway.
2021-03-03 20:23:21 +00:00
Michael Telatynski
77cf4cf7a4
Merge pull request #5706 from matrix-org/t3chguy/spaces4.4
Space room hierarchies
2021-03-03 15:25:00 +00:00
Michael Telatynski
73411fa53d tidy code style 2021-03-03 13:42:44 +00:00
Michael Telatynski
a8ff0fa75f
Merge pull request #5705 from matrix-org/t3chguy/spaces4.3
Iterate Space view and right panel
2021-03-03 13:37:40 +00:00
Michael Telatynski
85985db441 add comment 2021-03-03 11:50:41 +00:00
Travis Ralston
c7d4dfa4f5
Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting
Add a scroll to bottom on message sent setting
2021-03-02 17:41:15 -07:00
Travis Ralston
08d35073de Improve commentary 2021-03-02 11:04:12 -07:00
Travis Ralston
a4a15d3abd Merge branch 'develop' into travis/message-states 2021-03-02 10:52:30 -07:00
Travis Ralston
054330c07b
Merge pull request #5708 from matrix-org/travis/ignore-tmp
Add .tmp files to gitignore
2021-03-02 10:51:20 -07:00
Travis Ralston
867ce322e1 Add .tmp files to gitignore
My git client is convinced that `src/component-index.js.tmp` needs to be checked in, which is nice of it but also wrong.
2021-03-02 10:47:49 -07:00
Travis Ralston
c74224a1b7 Merge branch 'develop' into travis/message-states 2021-03-02 10:40:49 -07:00
Michael Telatynski
49fc053b94
Merge pull request #5704 from matrix-org/t3chguy/spaces4.2
Initial Space Room View and Creation UX
2021-03-02 17:17:39 +00:00
J. Ryan Stinnett
a5ee029c62
Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check
Add multi language spell check
2021-03-02 14:38:21 +00:00
Michael Telatynski
43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski
716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Travis Ralston
303ea16492
Merge pull request #5697 from matrix-org/travis/fix-tetris
Fix tetris effect (holes) in read receipts
2021-03-02 07:35:04 -07:00
Michael Telatynski
ca1bd78921 Add space specific variant of the dropdown on "Rooms +" sublist 2021-03-02 14:20:29 +00:00
Michael Telatynski
faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +00:00
Michael Telatynski
4e93452275 Tweak resizer collapse distributor behaviour to work with the expanding space panel 2021-03-02 14:02:03 +00:00
Michael Telatynski
e479edd47a Add an add existing room to space CTA to Space View 2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c Add a create room in space CTA to Space View 2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +00:00
Šimon Brandner
831cc7eaa0
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 12:14:36 +01:00
Šimon Brandner
4476843264
Remove unused _t
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 12:12:10 +01:00
Šimon Brandner
0a4c0b69b0
Move fileDropTarget to RoomView
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 12:07:33 +01:00
Michael Telatynski
926e226a78 Add Invite CTA to Space View 2021-03-02 10:12:49 +00:00
Michael Telatynski
dfd0aaffe3 Iterate copy for some global warning prompts for spaces 2021-03-02 09:56:43 +00:00
Michael Telatynski
8efe7dcaa1 Decorate Right Panel cards with Space header for when viewing it in that context 2021-03-02 09:54:32 +00:00
Šimon Brandner
ff00683f32
Use ===
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-02 07:42:07 +01:00
Šimon Brandner
ebedd3cbcb
Remove space
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-02 07:41:14 +01:00
Šimon Brandner
6fcb4c7cd2
Fix quote
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-02 07:37:00 +01:00
Travis Ralston
178ae2f7bf
Merge pull request #5703 from jaiwanth-v/fix-edit-markdown-image
Fixed edit for markdown images
2021-03-01 16:57:08 -07:00
Michael Telatynski
7b7c89e854
Merge pull request #5702 from matrix-org/t3chguy/spaces4.1
Iterate Space Panel
2021-03-01 23:56:54 +00:00
Travis Ralston
12161f9da2
Merge pull request #5700 from SimonBrandner/fix-read-receipts-in-compact
Fix read receipts for compact layout
2021-03-01 16:37:59 -07:00
Travis Ralston
db8978580c Improve special read receipt checking
See comments in code
2021-03-01 16:25:25 -07:00
Travis Ralston
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
Travis Ralston
31df8801f1 Merge branch 'travis/fix-tetris' into travis/message-states 2021-03-01 16:25:09 -07:00
Michael Telatynski
1a7a0e619d extend createRoom for creating rooms in a space 2021-03-01 19:05:50 +00:00
Michael Telatynski
c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski
c8fe3f7676 Pass room creation opts for new rooms into RoomView 2021-03-01 17:54:53 +00:00