PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
32529 commits 1 branch 0 tags 338 MiB
Commit graph

2199 commits

Author SHA1 Message Date
Travis Ralston
711181cc69 Rough style for new upload bar 
This repurposes ProgressBar which was not used anywhere in code.
 2021-03-05 14:14:43 -07:00
David Baker
e5b03488d8 Fix widget resizing 
There was a line of CSS that set pointer-events: none on widget
iframes whilst they were being resized to stop iframes swallowing
the mousemove/up events while dragging the resize handle, but a)
all widgets are now in a persisted element wrapper and therefore
not in the right place in the DOM to get that CSS and b) that only
got set when resizing the whole aps drawer vertically, not dragging
the handle between apps to change the width distribution.

Add a pointer events prop to AppTile to allow the pointer-events
style to be set by the parent, and set it when dragging either
resize handle.

Fixes https://github.com/vector-im/element-web/issues/16473
 2021-03-05 17:52:51 +00:00
Travis Ralston
017c2af663 Merge branch 'develop' into travis/message-states 2021-03-05 09:29:39 -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
Travis Ralston
d7310bc5b3 Remove dead classes 2021-03-04 20:17:29 -07:00
Travis Ralston
5d6e3d5711 UI refresh for uploaded files 
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
 2021-03-04 20:07:48 -07:00
Ayush Kumar
dd792c3d73 Fix Clicking on the avatar for opening member info requires pixel-perfect accuracy 2021-03-04 19:24:35 +05:30
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
Šimon Brandner
0e5297fcb0
Fix local feed size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-03 16:44:43 +01: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
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
Šimon Brandner
2e535d2a99
Fix CSS to make it work with resizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 20:33:34 +01:00
Šimon Brandner
f86e6fe643
Add resize CallViewForRoom CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 20:32:13 +01: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
ca1bd78921 Add space specific variant of the dropdown on "Rooms +" sublist 2021-03-02 14:20:29 +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
ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +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
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
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
Michael Telatynski
c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski
483d56320c Beginning of space creation UX from space panel 2021-03-01 17:47:40 +00:00
Michael Telatynski
d679708058 Fix styling of disabled options in an Iconized menu 2021-03-01 15:40:46 +00:00
Šimon Brandner
9ffef8f072
Fix VoIP PIP frame color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-01 13:44:22 +01:00
Šimon Brandner
188b728f53
Fix read receipts for compact layout 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-28 13:32:17 +01:00
Travis Ralston
678ec52035 Merge branch 'develop' into fix-4963 2021-02-26 14:41:28 -07:00
Travis Ralston
4e27b00cf3 Move call buttons to the room header 
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
 2021-02-26 13:46:39 -07:00
Šimon Brandner
1955fff08c
CSS cleanup 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:50:50 +01:00
Šimon Brandner
dc283241aa
Remove wrapper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 11:28:42 +01:00
Šimon Brandner
273753a42a
Fix hex formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:25:34 +01:00
Šimon Brandner
5a9e1a1482
Fix close icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:10:54 +01:00
Šimon Brandner
d58c17ff3b
Show grabbing cursor 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 07:50:53 +01:00
Šimon Brandner
25873c8759
Remove rounded border 2021-02-24 20:41:20 +01:00
Šimon Brandner
983895289c
Update info 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 20:04:25 +01:00
Šimon Brandner
81698a2714
Fix pointer-events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 19:31:19 +01:00
Travis Ralston
dee7c7b556
Merge pull request #5567 from SimonBrandner/fix-read-receipts 
Fix read receipts?
 2021-02-24 11:21:42 -07:00
Šimon Brandner
83e1a7a707
Add more button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 18:13:12 +01:00
Šimon Brandner
a6bb203a4b
Redo icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:43:33 +01:00
Šimon Brandner
fafb8d43a3
Fix padding according to the design 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:16:58 +01:00
Šimon Brandner
6aac8f1735
Change padding a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:20:28 +01:00
Šimon Brandner
899ce1f605
Partially fix overflow issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 11:15:59 +01:00
David Baker
bcc567cd86
Merge pull request #5676 from SimonBrandner/fix-portrait 
Fix portrait videocalls
 2021-02-24 09:26:57 +00:00
Šimon Brandner
ab79deb88f
Update the looks a bit more 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 08:11:53 +01:00
Šimon Brandner
768d268189
Fix css 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 07:54:36 +01:00
Šimon Brandner
87d5d73025
Merge branch 'develop' into improve-image-view 2021-02-23 20:42:16 +01:00
Šimon Brandner
3f0e8e4afc
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 19:16:52 +01:00
Šimon Brandner
64945d4ccf
Add a comment and use rems 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 19:14:36 +01:00
Šimon Brandner
2f2c5c9081
Merge branch 'develop' into fix-read-receipts 2021-02-23 18:43:58 +01:00
J. Ryan Stinnett
667c94b387
Merge pull request #5643 from SimonBrandner/move-icons 
Tweak code block icon positions
 2021-02-23 14:53:28 +00:00
J. Ryan Stinnett
3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes" 
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
 2021-02-23 12:03:08 +00:00
Šimon Brandner
effb9666f2
Fix portrait videocalls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 20:10:30 +01:00
Travis Ralston
10b0051c02 Appease the linter 2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Šimon Brandner
5de99c7708
Fix licenses 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 19:40:24 +01:00
Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes 
Improve URL preview formatting and image upload thumbnail size
 2021-02-17 11:37:37 +00:00
Jaiwanth
04d2bf1d6a Check whether user has permission to invite 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 20:55:15 +05:30
Jaiwanth
f420c85985 Added invite option to room's context menu 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 19:21:26 +05:30
Šimon Brandner
7dc6029f19
Move icons 
This tweaks the icon positions to look a bit better. Espacially with a scrollbar on the side

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-13 15:29:38 +01:00
Šimon Brandner
8afb74d0e1
Fix border radius when the panel is collapsed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-13 08:53:25 +01:00
Šimon Brandner
3983c15302
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 17:11:24 +01:00
Šimon Brandner
130e4f7bfd
Added some styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 17:06:02 +01:00
Šimon Brandner
2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
J. Ryan Stinnett
a87e637666
Merge pull request #5630 from SimonBrandner/tweak-codeblock-colors 
Fix codeblock scrollbar colors
 2021-02-11 12:41:12 +00:00
Jason Robinson
538272a827 Tweak the dialog dimensions 
Make height/width max (as per design wish) and
actual based on viewport.
 2021-02-10 15:13:01 +02:00
Jason Robinson
c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson
3ed6f1fe5d Fix maximise and minimise icon references 2021-02-09 12:22:58 +02:00
Jason Robinson
5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
Šimon Brandner
e2bf0c84d7
Move icons to the left 
We do this because they would otherwise collide with the scrollbar

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 08:16:36 +01:00
William Kray
fec2309451 move cancel button to the right 2021-02-08 09:26:10 -08:00
William Kray
e6da146b21 pad url preview close button a bit 2021-02-08 09:26:10 -08:00
William Kray
9260b031e9 oops missed a semicolon 2021-02-08 09:26:10 -08:00
William Kray
03c30b0338 change link previews to vertical flow 2021-02-08 09:26:10 -08:00
William Kray
e72a7567f7 drop video preview max-height to 300px 2021-02-08 09:25:08 -08:00
J. Ryan Stinnett
6d9da1bad2
Merge pull request #5625 from SimonBrandner/fix-notif-jumpy-ui 
Fix jumpy notifications settings UI
 2021-02-08 15:10:27 +00:00
Šimon Brandner
3b6790fbf1
Merge branch 'develop' into fix-notif-jumpy-ui 2021-02-08 15:42:06 +01:00
Šimon Brandner
c4a3906871
Fix positioning of spinner in a smarter way 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:38:43 +01:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner
257b8819b3
Change icon size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:30 +01:00
Šimon Brandner
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
David Baker
cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing 
Fix desktop Matrix screen sharing and add a screen/window picker
 2021-02-08 13:54:51 +00:00
Šimon Brandner
4a282759c3
Fixed jumpy UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-06 16:38:07 +01:00
Jason Robinson
03fe0f1f17 s not z 2021-02-04 23:17:48 +02:00
Jason Robinson
f5f8050172 Add minimize button to HostSignupDialog.tsx 2021-02-04 23:09:58 +02:00
Jason Robinson
b50ac0c096 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-04 18:32:16 +02:00
J. Ryan Stinnett
a4318299ff
Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump 
Fix jumping timestamp if hovering a message with e2e indicator bar
 2021-02-04 16:02:18 +00:00
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
Šimon Brandner
b73227eaca
Merge branch 'develop' into fix-icon-position 2021-02-03 18:46:45 +01:00
Šimon Brandner
b8ee23cdf4
Make consistent for all events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-03 18:41:09 +01:00
Šimon Brandner
9a131efc1a
Fix avatar alignment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-03 08:16:07 +01:00
Šimon Brandner
eee9cf153b
Fix trash alignment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-03 08:15:59 +01:00
Ayush Kumar
af0b009600 Fix term_policy aligned to the center 2021-02-03 00:05:55 +05:30
J. Ryan Stinnett
388e23b40b Fix flair height after accent changes 
The accent changes in https://github.com/matrix-org/matrix-react-sdk/pull/5569
led to a regression in flair display where the bottom edge was clipped.

Fixes https://github.com/vector-im/element-web/issues/16350
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5569
 2021-02-02 17:57:22 +00:00
Michael Telatynski
0e94d08d9a Update SSO Twitter social branding to match guidelines 2021-02-02 17:29:19 +00:00
Michael Telatynski
1ba0999915 Update SSO Facebook social branding to match guidelines 2021-02-02 17:19:18 +00:00
J. Ryan Stinnett
132057d4a7
Merge pull request #5549 from 2580ayush2580/ayush2580 
Increase language search bar width
 2021-02-01 13:50:42 +00:00
Michael Weimann
9b54aba4c0
fix timestamp width if there is a 2e2 indicator bar 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-01-31 11:11:34 +01:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes 
Improve SSO auth flow
 2021-01-29 13:28:53 +00:00
Michael Telatynski
0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Michael Telatynski
2c2cf4c073 Update google branding 2021-01-29 11:42:34 +00:00
Ayush Kumar
6b56d0b987 change value #2e2f32 to -primary-color 2021-01-29 15:54:40 +05:30
Ayush Kumar
512ac5ef3b fixed invisible text after logging out in the dark theme 2021-01-29 03:58:05 +05:30
Ayush Kumar
d006c521c2 solved style-lint errors 2021-01-28 23:49:13 +05:30
Ayush Kumar
6031e34fbe fix language dropdown to center 2021-01-28 23:07:59 +05:30
J. Ryan Stinnett
5758cd8bcc
Merge pull request #5518 from blattersturm/pr/irc-layout-width 
Don't use name width in reply thread for IRC layout
 2021-01-28 12:44:36 +00:00
Michael Telatynski
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
Šimon Brandner
4e438be433
Fixed Czech capital letters 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-24 17:40:19 +01:00
Šimon Brandner
90ad3360b6
Fixed read receipts? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-24 09:15:11 +01:00
Šimon Brandner
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
Michael Telatynski
bb50cd56ee
Merge pull request #5558 from matrix-org/t3hcguy/socialloginfixup 
Improve styling of SSO Buttons for multiple IdPs
 2021-01-22 10:37:46 +00:00
J. Ryan Stinnett
35bee5c5ea
Merge pull request #5522 from SimonBrandner/room-dialog-fixes 
Fixes for the general tab in the room dialog
 2021-01-22 10:34:37 +00:00
blattersturm
da7f6c7eca Don't use name width in reply thread for IRC layout 
Signed-off-by: Robert Dash <peachypies@protonmail.ch>
 2021-01-21 19:39:19 +01:00
Šimon Brandner
5ca9e8d323
Remove spaces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 18:18:07 +01:00
Šimon Brandner
f1a3240ec3
Merge branch 'develop' into improve-codeblock 2021-01-21 17:36:22 +01:00
Michael Telatynski
928ddeb718 Improve styling of SSO Buttons for multiple IdPs 2021-01-21 13:33:25 +00:00
Šimon Brandner
bd2423a52c
Added line numbering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 10:53:18 +01:00
Travis Ralston
c7c055dd98 Give a bigger target area to AppsDrawer vertical resizer 
The existing target was too hard to hit, which annoyed users. This change makes it the same sort of surface area as the horizontal resizers, as requested by design to fix the problem in the short term.
 2021-01-20 15:05:18 -07:00
Šimon Brandner
14bf169631
Handle small codeblocks 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 15:01:23 +01:00
Šimon Brandner
19be3293e0
Remove commented code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 13:06:08 +01:00
Šimon Brandner
58b2c18cf5
This somehow works 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 21:02:39 +01:00
Šimon Brandner
e6ab47ff76
Fix bug 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 17:30:02 +01:00
Šimon Brandner
61281a855c
Redo expanding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 16:35:32 +01:00
Šimon Brandner
8a4af2f348
Merge branch 'develop' into expand-codeblock 2021-01-18 17:54:06 +01:00
Šimon Brandner
49dce58027
Added expanding based on the option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:49:09 +01:00
Will Hunt
d71b2cf04f Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-18 11:36:46 +00:00
Ayush Kumar
2c8aaa27dd Increase width of language dropdown 2021-01-17 18:50:33 +05:30
Jason Robinson
3901cd9c72 WIP 2021-01-15 17:02:28 +02:00
Jason Robinson
158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-01-15 16:12:53 +02:00
Jason Robinson
90a1c5a267 WIP 2021-01-15 15:57:14 +02:00
Jason Robinson
e80dba9414 WIP 2021-01-15 15:32:30 +02:00
Jason Robinson
d4a58bdb2a WIP minimize 2021-01-14 11:53:20 +02:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01:00
David Baker
d4470d2ed2 Actually this is right colour 2021-01-13 16:55:38 +00:00
David Baker
150e8c9d56 Fix incoming call box on dark theme 2021-01-13 15:31:26 +00:00
David Baker
e2111d9161
Merge pull request #5532 from matrix-org/dbkr/dtmf 
Add in-call dialpad for DTMF sending
 2021-01-13 13:07:27 +00:00
Jason Robinson
3da5049dc7 WIP minimize 2021-01-12 17:08:42 +02:00
Jason Robinson
e6605441aa WIP minimize 2021-01-12 14:08:09 +02:00
Michael Telatynski
1c3adbc545
Merge pull request #5526 from matrix-org/t3chguy/fix/15832 
Fix avatar upload prompt/tooltip floating wrong and permissions
 2021-01-11 16:48:17 +00:00
Jason Robinson
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
Jason Robinson
2b98f14242 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-11 11:16:03 +02:00
Šimon Brandner
263f213650
Remove an empty line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:27:02 +01:00
Šimon Brandner
4538274e74
Added send message icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:25:29 +01:00
Šimon Brandner
d589c61000
Added send message button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:09:14 +01:00
Will Hunt
000a69765c Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-08 18:03:36 +00:00
Šimon Brandner
b1010189be
Tabbed copyright link 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:33 +01:00
Šimon Brandner
640e6d68b3
Merge branch 'develop' into fix-screen-sharing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:06 +01:00