David Baker
90bbc082dc
Copyright
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-11-05 09:25:52 +00:00
Michael Telatynski
af71b0735d
Change icon for the Create Event bubble tile
2020-11-04 17:24:03 +00:00
Michael Telatynski
ff25a9b45d
Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth
2020-11-04 17:06:38 +00:00
Michael Telatynski
5a8525dd93
Merge pull request #5387 from matrix-org/t3chguy/fix/13066
...
Invite / Create DM UX tweaks
2020-11-04 14:01:21 +00:00
Michael Telatynski
3b7b66c856
Change out caption for email invite suggestions and stack vertically
2020-11-03 14:56:06 +00:00
Michael Telatynski
2064cf80f5
Use semi-bold for Modal titles
2020-11-03 13:21:33 +00:00
Michael Telatynski
a2885dcfe8
fix alignment of Modal X icon
2020-11-03 13:18:18 +00:00
Michael Telatynski
66377eb731
Invite UX tweaks:
...
+ re-focus input field after all interactions
+ change textarea to text input
+ fix margins between things
+ improve keyboard usage with enter/space autofilling
2020-11-03 13:14:35 +00:00
Michael Telatynski
4afa610ee1
Add variant of default home page for justRegistered
2020-11-02 17:24:47 +00:00
Michael Telatynski
fa9490b02b
Add skeleton UI for Room List when no rooms
2020-11-02 17:22:45 +00:00
David Baker
7796621e8d
Merge remote-tracking branch 'origin/develop' into dbkr/call_hold
2020-10-30 16:49:42 +00:00
David Baker
90cdc2f341
Add the new css file
2020-10-30 13:47:43 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly
...
Initial Countly work
2020-10-30 13:07:58 +00:00
Aaron Raimist
c636dc0ed3
Fix custom tag layout which regressed in #5309
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-29 16:54:55 -05:00
David Baker
f828c6d494
Implement call hold
...
Currently just by adding /holdcall and /unholdcall slash commands
The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.
Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
2020-10-29 17:56:24 +00:00
Michael Telatynski
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
Michael Telatynski
0004dd4475
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
2020-10-22 21:40:05 +01:00
Michael Telatynski
4e12aeca9e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
...
Conflicts:
src/components/views/elements/AppTile.js
2020-10-21 12:48:51 +01:00
Michael Telatynski
a5468c918e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
src/resizer/distributors/collapse.ts
src/resizer/distributors/fixed.ts
src/resizer/index.ts
src/resizer/item.ts
src/resizer/resizer.ts
src/resizer/sizer.ts
2020-10-21 09:56:22 +01:00
Michael Telatynski
5a9bac68c6
iterate PR based on feedback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 09:48:02 +01:00
Michael Telatynski
334ab12c47
Tidy up widget colouring
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 16:06:35 +01:00
Michael Telatynski
24c4a3876c
Increase Border Radius of Accessible Buttons to 8px
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 15:05:38 +01:00
Michael Telatynski
b6fd2a0691
Iterate the Modal Widget Dialog paddings and phishing warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 15:05:22 +01:00
Michael Telatynski
bec1d718e0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
...
Conflicts:
src/components/views/elements/AppTile.js
src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
Michael Telatynski
00b1a03a3e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
...
Conflicts:
src/@types/global.d.ts
src/FromWidgetPostMessageApi.js
src/WidgetMessaging.js
src/widgets/WidgetApi.ts
2020-10-19 19:46:07 +01:00
Michael Telatynski
06009df05b
Update Widget paddings and background colours
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 18:47:15 +01:00
Michael Telatynski
744a4abd1c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
2020-10-19 13:08:17 +01:00
Michael Telatynski
30adc98a15
Fix excessive hosting link padding
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:34:25 +01:00
Resynth
091143db52
Add border-radius for video
...
Images have a rounded border, so we may as well add it to videos.
Works fine in Chrome, and in other spec-compliant browsers.
Signed-off-by: Resynth <resynth1943@tutanota.com>
2020-10-18 22:40:19 +01:00
Michael Telatynski
84111a2eaf
Merge pull request #5326 from matrix-org/t3chguy/fix/11195
...
Discard all mx_fadable legacy cruft which is totally useless
2020-10-15 18:34:03 +01:00
Michael Telatynski
9234a58bdf
Merge pull request #5318 from matrix-org/t3chguy/fix/9232
...
Fix aspect ratio of avatar before clicking Save
2020-10-15 16:48:07 +01:00
Michael Telatynski
6b01b6ac6c
Discard all mx_fadable legacy cruft which is totally useless
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 16:13:16 +01:00
Michael Telatynski
efbce309d0
improve paddings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 15:42:08 +01:00
Michael Telatynski
f198b95579
Iterate PR; tidy and improve widget context menu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 15:24:42 +01:00
Michael Telatynski
a6c81a903c
Iterate with new buttons and resize locking
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 11:14:48 +01:00
Travis Ralston
43208c01a1
Fix variable naming
2020-10-14 16:30:38 -06:00
Arsh Sharma
a5d01f2f4d
missed a replacement
2020-10-14 17:18:50 +05:30
Arsh Sharma
49d99c6dc7
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10
2020-10-14 16:58:05 +05:30
Michael Telatynski
00e35dafb3
Fix aspect ratio of avatar before clicking Save
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-14 10:57:34 +01:00
Michael Telatynski
bb52bad099
Remove stale props and CSS classes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:23:49 +01:00
Michael Telatynski
447ea9eb23
Relax flexboxes in resizer on window resize
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:11:58 +01:00
Michael Telatynski
ba21c6ed36
Iterate on Widget icons and resizing handles
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 15:56:53 +01:00
Michael Telatynski
7be5ff0fe6
First cut of app drawer tiled resizing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:29:12 +01:00
Michael Telatynski
f72b1e0c7d
Remove stale things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:27:50 +01:00
Michael Telatynski
c1fef5a941
Improve the styling
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:36:09 +01:00
Michael Telatynski
7820f9c28a
Switch to WidgetAvatar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:16:55 +01:00
RinkiyaKeDad
4f8b0afc41
updated TagPanel
2020-10-10 18:00:06 +05:30
Michael Telatynski
ada6d1aa46
Iterate PR
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:42:21 +01:00
Michael Telatynski
b8080a7d2d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
2020-10-08 13:04:59 +01:00
J. Ryan Stinnett
576ea6df08
Use same colour variable as text
2020-10-08 10:01:05 +01:00
J. Ryan Stinnett
73ce2fac8a
Add comment on colour
2020-10-08 09:56:58 +01:00
J. Ryan Stinnett
43ea5de320
Adjust Settings styles
2020-10-07 20:23:34 +01:00
J. Ryan Stinnett
3d0db1b022
Change invite icon
2020-10-07 20:08:59 +01:00
J. Ryan Stinnett
936344b012
Make back button a circle
2020-10-07 17:53:41 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration
...
Convert auth lifecycle to TS, remove dead ILAG code
2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
40292884bf
Regenerate component CSS index
2020-10-07 13:09:03 +01:00
J. Ryan Stinnett
f2b72efe39
Remove various remaining bits of ILAG flows
...
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
2020-10-07 12:53:59 +01:00
Michael Telatynski
29e3881fb3
Iterate design and fix post-merge conflict
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 10:36:45 +01:00
Michael Telatynski
c784039cf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
...
Conflicts:
src/components/views/right_panel/WidgetCard.tsx
src/stores/WidgetStore.ts
2020-10-07 10:04:45 +01:00
Michael Telatynski
ab9b5b0d7b
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width
...
Remove width limit on widgets
2020-10-06 10:23:19 +01:00
Michel Zimmer
80091f7db2
Fix call container avatar initial centering
...
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
2020-10-06 08:59:03 +02:00
Michael Telatynski
fdb8cb78f9
Merge pull request #5277 from matrix-org/t3chguy/fix/9551
...
Use Own Profile Store for the Profile Settings
2020-10-05 14:46:12 +01:00
Michael Telatynski
cf37f0abf2
Fix the AvatarSetting avatar getting crushed by the flexbox
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-05 12:54:01 +01:00
Michel Zimmer
58bbbf31b9
Fix room directory clipping links in the room's topic
...
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
2020-10-02 18:00:58 +02:00
Michael Telatynski
23d95df30b
Rebuild the room summary card's widgets section
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-30 17:08:41 +01:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup
...
Make the hangup button do things for conference calls
2020-09-29 11:06:21 -06:00
Travis Ralston
36882b85d7
Merge pull request #5222 from matrix-org/travis/ft-sep1620/03-jitsi-obvious
...
Render Jitsi widget state events in a more obvious way
2020-09-29 11:05:40 -06:00
Travis Ralston
a5569303d1
Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup
2020-09-29 10:20:02 -06:00
Travis Ralston
c75628844d
Merge pull request #5226 from matrix-org/travis/ft-sep1620/10-pip
...
Make the PIP Jitsi look and feel like the 1:1 PIP
2020-09-29 10:18:30 -06:00
Michael Telatynski
123dada465
Remove width limit on widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:49:02 +01:00
Travis Ralston
9df175212e
Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup
2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5
Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious
2020-09-28 13:41:48 -06:00
Michael Telatynski
13d09df7d7
tidy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 11:59:39 +01:00
Michael Telatynski
fbbba75f81
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
2020-09-25 14:31:44 +01:00
Michael Telatynski
44bc8fc67e
Initial Modal Widget work tweaks MSC2790
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 14:08:27 +01:00
Travis Ralston
2d46ca1d15
Merge pull request #5243 from matrix-org/travis/workflow/design/sep2120
...
Rework profile area for user and room settings to be more clear
2020-09-24 08:39:01 -06:00
Travis Ralston
aa0e19daf0
Make the hover transition a variable
2020-09-24 08:23:06 -06:00
Michael Telatynski
956a3bf69d
Implement Left Panel User Widget
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-24 09:28:49 +01:00
Glandos
0dc5200b0e
Push name to the end, near text, in IRC layout
...
Currently, the name (and aux message) are align to the start, leaving a blank space between the end of the name and the message.
In a lot of IRC themes, names (and actions) are aligned to the end, next to the message, for a better readability.
Signed-off-by: Adrien CLERC <bugs-github@antipoul.fr>
2020-09-23 21:44:30 +02:00
Travis Ralston
e658d9619b
Update styles for new colours
2020-09-23 12:30:01 -06:00
Michael Telatynski
7fd6d4498f
Make bottom sticky room list header dynamic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-23 11:00:19 +01:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files
...
Add a note to use the desktop builds when seshat isn't available
2020-09-22 10:25:34 -06:00
Travis Ralston
3e0cbd7bfe
Appease the linters
2020-09-21 21:09:46 -06:00
Travis Ralston
4f983ad9a1
Rework profile sections of user and room settings
...
Mostly by design request. Some is freehand, to be reviewed.
2020-09-21 21:00:51 -06:00
Travis Ralston
6fee3d8f4f
Spread out the general user settings sections like the other tabs
...
By design request.
2020-09-21 18:37:08 -06:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720
...
Adjust layout and formatting of notifications / files cards
2020-09-18 11:11:35 -06:00
Travis Ralston
870c35be6f
Merge branch 'develop' into travis/ft-sep1620/09-enc-files
2020-09-18 10:56:20 -06:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup
...
Defer encryption setup until first E2EE room
2020-09-18 10:28:33 +01:00
Travis Ralston
849a5e4a39
Round the jitsi pip corners
2020-09-17 14:58:48 -06:00
Travis Ralston
f5f48cbc21
Fix indentation
2020-09-17 10:44:58 -06:00
Travis Ralston
4657a34bbb
Document some of the magic values
2020-09-17 10:44:18 -06:00
Travis Ralston
14a7b83988
Don't show a bottom border ahead of the date separator
2020-09-17 10:40:48 -06:00
Travis Ralston
24d0950b7e
Adjust layout and formatting of notifications / file cards
...
This follows some polish time with a designer.
The placeholder text on the two panels was tracking up/down when the width was changed. This is fixed by adjusting some of the flexbox properties to center it more safely.
We also spent some time making the notifications panel more legible while we wait for the overhaul to land.
2020-09-17 09:23:06 -06:00
Michael Telatynski
ae44a6d1fa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
Michael Telatynski
d340dd58d1
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 11:55:10 +01:00
Travis Ralston
8129333dcc
Make the PIP Jitsi look and feel like the 1:1 PIP
...
* Similar sizing
* Fix pointers so the jitsi widget doesn't feel clickable when it's not
* We might want to introduce click-to-visit-room for the Jitsi widget (like the 1:1 call), however the Jitsi widget has many more controls to worry about
* Remove the menu bar from the widget to avoid accidents
2020-09-16 22:38:12 -06:00
Travis Ralston
bfbbf44dfc
Add a note to use the desktop builds when seshat isn't available
...
Fixes https://github.com/vector-im/element-web/issues/15184
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
2020-09-16 17:23:37 -06:00
Travis Ralston
1ffc6d5bd3
Make the hangup button do things for conference calls
...
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
* If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
* If you're not able to modify widgets in the room, hang up.
For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
2020-09-16 14:35:55 -06:00
Travis Ralston
b4af0140d4
Render Jitsi widget state events in a more obvious way
...
A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred.
2020-09-16 12:38:47 -06:00
Michael Telatynski
c11abb74e0
UI Feature Flag: Share dialog QR code and social icons
2020-09-16 16:06:17 +01:00
J. Ryan Stinnett
7a5b0a964f
Adjust main encryption toast to reference Secure Backup
...
This adjusts the main toast to focus on Secure Backup as suggested in designs.
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
26b465f1fd
Remove room recovery reminder
...
The Secure Backup toast replaces this with better UX.
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
46f37fb969
Create cross-signing keys during authentication
...
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
3259ab1f25
Place cross-signing action buttons on a single row
...
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
Travis Ralston
b177843e45
Remove defunct "always show encryption icons" setting
...
It doesn't do anything in practice.
Fixes https://github.com/vector-im/element-web/issues/8725
2020-09-14 22:03:54 -06:00
Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update
...
Show verification status in the room summary card
2020-09-11 09:12:46 -06:00
J. Ryan Stinnett
d53cbecbb1
Merge pull request #5198 from matrix-org/jryans/userinfo-scroll
...
Fix user info scrolling in new card view
2020-09-11 14:52:06 +01:00
J. Ryan Stinnett
e49a657a90
Fix user info scrolling in new card view
...
Fixes https://github.com/vector-im/element-web/issues/15148
2020-09-11 11:39:58 +01:00
J. Ryan Stinnett
cd3aa81eed
Fix sticker picker height
...
Fixes https://github.com/vector-im/element-web/issues/15152
2020-09-11 11:12:56 +01:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup
...
Split up cross-signing and secure backup settings
2020-09-11 09:41:40 +01:00
Travis Ralston
4cb7381d03
Show verification status in the room summary card
...
Fixes https://github.com/vector-im/element-web/issues/15143
Colours are the same for both light and dark theme.
2020-09-10 13:53:42 -06:00
Michael Telatynski
050319c0cc
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump
2020-09-09 17:37:50 +01:00
J. Ryan Stinnett
0219824d6f
Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup
2020-09-09 14:13:23 +01:00
Michael Telatynski
cef533b83e
Update ellipsis svg
2020-09-09 13:09:21 +01:00
Michael Telatynski
8d66dce68d
Update copy and use svg for ellipsis
2020-09-09 12:50:48 +01:00
Michael Telatynski
c8bc80a3b1
test with delay
2020-09-09 10:07:43 +01:00
Nigel Mansell
421af52e76
Fixed 1px jump upwards on filter room members box
...
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-08 15:29:16 -04:00
J. Ryan Stinnett
bbe2084f66
Add independent set up / reset actions in Settings
...
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
2020-09-08 18:01:56 +01:00
Michael Telatynski
596060c506
fix alignments and iterate PR
2020-09-08 17:57:08 +01:00
Michael Telatynski
6c7cb473dc
finalise colours from Figma
2020-09-08 16:33:26 +01:00
Michael Telatynski
8d14d26e2b
do the todos
2020-09-08 16:27:09 +01:00
Michael Telatynski
4a4a8cd611
styling and fix i
button behaviour
2020-09-08 15:43:40 +01:00
Michael Telatynski
3a99343433
iterate styling
2020-09-08 15:43:40 +01:00
Michael Telatynski
ef0843d4ad
Iterate to match design
2020-09-08 15:43:40 +01:00
Michael Telatynski
0fe6ce1842
Stage svgs
2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217
Consolidate all the work thus far
2020-09-08 15:43:38 +01:00
Michael Telatynski
31cca5e0f2
Create new right panel cards
2020-09-08 15:42:31 +01:00
Michael Telatynski
89a836100d
small css tweaks to closer match the figma
2020-09-08 15:42:31 +01:00
J. Ryan Stinnett
2fbb551035
Put backup details in a table
2020-09-08 15:26:59 +01:00
Michael Telatynski
667c129ebc
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
...
Conflicts:
src/components/structures/ScrollPanel.js
src/components/views/rooms/AppsDrawer.js
2020-09-07 14:33:57 +01:00
Nigel Mansell
590e2b70f9
Merge remote-tracking branch 'upstream/develop' into develop
2020-09-05 16:51:13 -04:00
J. Ryan Stinnett
cc2c179a0f
Set default text colour for Settings tabs
2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
e3f47525e5
Rename backup CSS classes
2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
46bc6b1d14
Rename key backup to secure backup
2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
da6cc5c2e9
Tweak Security settings section headers
...
This brings us slightly closer to the version Design is working from in terms of
section naming.
Prep for https://github.com/vector-im/element-web/issues/13895
2020-09-03 15:41:17 +01:00
Michael Telatynski
243af3c9f2
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
2020-09-02 09:27:06 +01:00
Nigel Mansell
7550a92df9
Fixed 1px jump upwards on filter room members box
...
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-01 13:58:48 -04:00
Travis Ralston
78d5b87fbc
Use a different border variable for compatibility with custom themes
2020-08-31 11:20:28 -06:00
Travis Ralston
fdbaddbace
Add a simple edit dialog for communities
2020-08-31 10:52:08 -06:00
Travis Ralston
02095389e7
Add structure for mixed prototype UserMenu
2020-08-28 17:03:17 -06:00
Travis Ralston
01b0acbe62
Make the UserMenu echo the current community name
2020-08-28 16:14:08 -06:00
Travis Ralston
0ffa548864
Change the menu button to a chevron
...
by design request
2020-08-28 15:37:23 -06:00
Travis Ralston
e58b514803
Add clarifying text to DM dialog about what is about to happen
2020-08-28 13:22:20 -06:00
Travis Ralston
cc2fc911af
Minor copy addition to DM dialog for communities prototype
2020-08-28 10:03:27 -06:00
Travis Ralston
52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change
...
Update create room dialog copy & community prototype home icon
2020-08-28 09:47:53 -06:00
Travis Ralston
3c176f762e
Remove disabled clear button from tag panel + dead code
2020-08-27 14:27:06 -06:00
Travis Ralston
13e9f7b912
Update home icon
2020-08-27 13:18:52 -06:00
Michael Telatynski
bf3c49b8df
Remove redundant CSS rules
2020-08-27 10:46:29 +01:00
Travis Ralston
b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher
...
Communities v2 prototype: Tag panel selection changes
2020-08-26 10:22:50 -06:00