OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
31,108 Commits
215 Branches
561 Tags
437 MiB
Commit Graph

2683 Commits (8669085a5c972e22efd2d0d10bd067e7b6790f0d)

Author SHA1 Message Date
Š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
Travis Ralston f52405de38
Merge pull request #5557 from matrix-org/travis/fix-widget-resizing 
Give a bigger target area to AppsDrawer vertical resizer
 2021-01-21 07:17:29 -07:00
J. Ryan Stinnett 14556de3d5
Merge pull request #5493 from SimonBrandner/fix-left-panel-alignment 
Fix minimized left panel avatar alignment
 2021-01-21 13:37:36 +00: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
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
Šimon Brandner bb7e76f69e
Hopefully fixed copyrights 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:36:54 +01:00
Šimon Brandner 8652c2e653
Fixed class names 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 19:49:09 +01:00
Jason Robinson 5f84371038 Update some copyrights 2021-01-05 14:29:48 +02:00
David Baker 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
Jason Robinson bb53ae8038 Rename Element Pro -> Host Signup 2021-01-04 16:05:49 +02:00
Jason Robinson 6843737a33 Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-12-28 11:22:05 +02:00
Jason Robinson 7a358b1ca3 Rename components to be less EMS specific 2020-12-28 11:21:42 +02:00
Šimon Brandner 95d93d143e
Clean up the SCSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-28 08:38:29 +01:00
Michael Telatynski 8ee65258be Unfloat the MiniAvatarUploader "tooltip" 2020-12-27 21:13:01 +00:00
Šimon Brandner eff26600e8
Linting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 18:33:23 +01:00
Šimon Brandner 675ca58eef
Improve UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 16:56:25 +01:00
Šimon Brandner eae3c1c496
Get screen-sharing working, somehow 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 08:32:51 +01:00
David Baker 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
Šimon Brandner ffe2727cf7 Fixed topic field resizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-22 09:40:39 +01:00
David Baker 0d4b2f48dc Probably better to just remove this 2020-12-21 11:25:04 +00:00
David Baker aee861956c Remove secondary call avatar 
and change 'paused' to 'on hold'
 2020-12-18 19:40:57 +00:00
David Baker 63e99ecf93 Visual fixups for call UI 
* Add bottom margin on PiP view
 * Remove avatar blurring & pause icon for held calls
 * Change background of incoming call box to match PiP view
 * Put drop shadow & border radius on PiP view & incoming call box
   rather than the CallContainer they're in (so they each have their own
   drop shadow / rounded corners).
 * Add margin between incoming call box and PiP view
 2020-12-18 18:08:04 +00:00
Michael Telatynski 37e3c2a23a
Merge pull request #5501 from matrix-org/t3chguy/fix/15936 
Fix padding in confirmation email registration prompt
 2020-12-17 12:05:37 +00:00
Michael Telatynski c498609f79 Fix padding in confirmation email registration prompt 2020-12-17 10:47:03 +00:00
Michael Telatynski f2214c0367 Fix room list help prompt alignment 2020-12-17 10:43:53 +00:00
Jason Robinson 5aa24b97cd Merge remote-tracking branch 'origin/develop' into jaywink/elementPro 2020-12-16 14:45:16 +02:00
Šimon Brandner e55ec43595 Fix minimized left panel alignment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-15 14:45:10 +01:00
Miroslav Šedivý 018743a639
Update _MemberList.scss 2020-12-15 11:45:15 +01:00
Jason Robinson 26d0e7797c Fix ordering 2020-12-15 10:55:24 +02:00
Jason Robinson db370f218e Rename also _HostingSignupDialog.scss 2020-12-15 10:53:59 +02:00
Jason Robinson cd836be809 Rename everything HostingSignup -> EMSElementPro 
This setup flow ended up quite specific due to all the various moving parts.
 2020-12-15 10:50:38 +02:00
Will Hunt 8d203043d4 Remove hide/show behaviour 2020-12-14 12:59:59 +00:00
David Baker 89240b84fb Only want margins on the large view 2020-12-10 15:52:03 +00:00
David Baker 5282c6bbe8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 12:36:11 +00:00
David Baker f987908d04
Merge pull request #5446 from matrix-org/dbkr/hold_ui 
Add UI for hold functionality
 2020-12-10 12:30:59 +00:00
J. Ryan Stinnett 083fecbddb
Merge pull request #5411 from aaronraimist/searchbox-fix-width 
Allow SearchBox to expand to fill width
 2020-12-09 20:14:02 +00:00
Aaron Raimist 918326631f
fix lint 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-08 14:35:05 -06:00
David Baker 8f24656603 Make margins & header font match widgets 2020-12-08 19:26:57 +00:00
David Baker 70964e43f6 Fix font weights in hold text 2020-12-08 19:05:58 +00:00
Michael Telatynski d77c5b46eb Fix width of underline in server picker dialog 2020-12-08 11:56:42 +00:00
David Baker b9d70cb1a3 Fix indentation 2020-12-07 18:40:29 +00:00
David Baker 365d6982ce Add secondary call avatar to main voice content view 2020-12-07 18:28:43 +00:00
David Baker 8a58c9dea0 Update UI for two calls in the PiP view 
and also merge hold_ui changes
 2020-12-07 17:56:36 +00:00
David Baker 747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
David Baker 3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
David Baker c7f1d97b1a Round off the sharp corners 
Before you have someone's eye out
 2020-12-07 15:38:55 +00:00
Aaron Raimist 32f7e3552c
Remove globally defined flex and set just for group queries 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-05 21:56:17 -06:00
Aaron Raimist 3ec9d93cb0 Merge branch 'develop' into searchbox-fix-width 2020-12-05 19:53:08 -06:00
David Baker ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker 6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker 0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker 1ce63f0fa7 Line 1 / 2 Support 
Support one active call plus one call on hold
 2020-12-03 17:45:49 +00:00
Michael Telatynski 3fda7e3f46 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-02 15:08:13 +00:00
David Baker 4a503fb32e Fix VoIP call plinth on dark theme 
Fixes https://github.com/vector-im/element-web/issues/15873
 2020-12-02 12:14:41 +00:00
Michael Telatynski eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 
 Conflicts:
	src/i18n/strings/en_EN.json
 2020-12-01 16:33:29 +00:00
David Baker 31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
David Baker 4ca35fabef Visual tweaks 2020-12-01 13:44:24 +00:00
Travis Ralston ced68a6fbc
Merge pull request #5447 from matrix-org/travis/fix-stickerpicker 
Fix the stickerpicker
 2020-11-27 07:06:35 -07:00
Jason Robinson 5ad9b83870 Fix copyright strings 2020-11-27 15:10:35 +02:00
Jason Robinson c818a719bf Try a slightly larger HostingSignupDialog 
Make HostingSignupBaseDialog larger
 2020-11-27 15:10:35 +02:00
Richard Lewis 116f109a62 Improve setup initiation link 2020-11-27 15:10:35 +02:00
Jason Robinson bdab1faf16 Fix hosting signup dialog height 2020-11-27 15:10:35 +02:00
Jason Robinson b3b3f5ebeb Fix HostingSignupDialog layouting inside dialog 2020-11-27 15:10:35 +02:00
Jason Robinson c7706ac3d5 Add possibility for hosting provider IFrame 
Add config option hosting_signup_iframe that
will render an action in the UserMenu and ProfileSettings
for setting up a host with some hosting provider
that provides an HTML to do that.

Add iframe for hosting provider signup content
 2020-11-27 15:10:35 +02:00
Michael Telatynski edd5bf5842
Merge pull request #5421 from matrix-org/t3chguy/fix/15700 
Simplify UserMenu for Guests as they can't use most of the options
 2020-11-27 10:57:54 +00:00
Travis Ralston f2bc3db8fd Fix visual gap of sticker picker at bottom 
Fixes https://github.com/vector-im/element-web/issues/15690
 2020-11-26 15:09:44 -07:00
David Baker 5b7ad079d2 Add SVGs 2020-11-26 14:55:07 +00:00
David Baker 2a02e57a95 Add UI for hold functionality 2020-11-26 14:35:09 +00:00
Michael Telatynski 1b1c482f9c Iterate tests 2020-11-25 10:22:16 +00:00
Michael Telatynski 758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
Michael Telatynski 2f64160a0e Remove backwards compatibility in ServerConfig for m.require_identity_server 2020-11-25 09:00:31 +00:00
Michael Telatynski f7d7182dc9 Iterate Multi-SSO support 2020-11-24 12:09:11 +00:00