mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
34230 commits 217 branches 561 tags 411 MiB
Commit graph

291 commits

Author SHA1 Message Date
Michael Telatynski
90d99239bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2 2020-08-14 18:10:59 +01:00
Michael Telatynski
4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski
b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski
df75024a21 Switch out the globe icon and colour it depending on theme 2020-08-13 15:16:31 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
9e429ee669 Remove rebranding toast 
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.

Fixes https://github.com/vector-im/element-web/issues/14931
 2020-08-11 14:27:53 +01:00
Jorik Schellekens
271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
J. Ryan Stinnett
71af4580e8 Convert jump to unread button 2020-07-31 20:39:17 +01:00
J. Ryan Stinnett
7aaa4997c2 Convert jump to bottom button 2020-07-31 20:33:15 +01:00
J. Ryan Stinnett
f28bce36e1 Merge remote-tracking branch 'origin/develop' into jryans/adjust-chevrons 2020-07-31 18:23:57 +01:00
J. Ryan Stinnett
1a33104877 Use thinner chevron for network, adjust placement 2020-07-31 18:15:51 +01:00
Travis Ralston
968fbd5cba Merge branch 'develop' into travis/echo/audit 2020-07-30 10:18:30 -06:00
J. Ryan Stinnett
e917c0d92e Replace all chevrons with a single icon 
This replaces all chevrons with a single icon, affecting components like the
room list, network dropdown, and rebrand modal.

Rather than having files for each direction that can get out of sync, this
change uses one direction and rotates in CSS for the others.

Fixes https://github.com/vector-im/riot-web/issues/14663
 2020-07-30 16:49:46 +01:00
Travis Ralston
c5574219bb Implement dialog for resending local echo transactions 2020-07-29 20:36:04 -06:00
J. Ryan Stinnett
2f20cbd5ad Remove all unreferenced images 
This removes all images we no longer reference in the app. This should be safe,
as Webpack only adds images to the build output if they are referenced.
 2020-07-29 17:52:41 +01:00
Jorik Schellekens
f64ef65f97 Use StyledRadioGroup 2020-07-28 17:13:58 +01:00
Jorik Schellekens
d55699211e Update copy icon on pre block and share dialogues 2020-07-27 15:13:02 +01:00
Michael Telatynski
007f63b5bb Update the SVGs with 24x24 fixed Figma ones 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:30:06 +01:00
Michael Telatynski
b6cd8065f8 Re-export top right header button svg masks to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:39:02 +01:00
Travis Ralston
556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
Bruno Windels
aeadf64ccf change icon on invite button 2020-07-14 19:40:17 +02:00
Nad Chishtie
1b9d918a92 Add new e2e icons 2020-07-13 21:20:55 +01:00
Michael Telatynski
33422f1744 Switch out Labs spinner to be the Flow-generated from Design 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 17:39:57 +01:00
David Baker
503159c1c8 Merge branch 'dbkr/in-app-rebrand-prompt' into 'element' 
Add in-app rebranding toasts & prompts

See merge request new-vector/element/element-web/matrix-react-sdk!1
 2020-07-10 17:09:17 +00:00
David Baker
8701e9293e Add in-app rebranding toasts & prompts 
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
 2020-07-10 15:32:34 +01:00
Bruno Windels
7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Bruno Windels
7da2b5d92f fix muted video icon center 2020-07-08 18:06:11 +02:00
Bruno Windels
571bd30898 update call icons 2020-07-08 18:02:30 +02:00
Jorik Schellekens
b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +01:00
Bruno Windels
df072a12b2 room settings icons 2020-07-07 12:30:02 +02:00
Bruno Windels
1ef73958f3 change hide community icon in context menu 2020-07-07 12:16:31 +02:00
Bruno Windels
af333db6ae change settings icons 2020-07-07 12:16:03 +02:00
Bruno Windels
8fd9dbf1d8 moar icon changes 2020-07-06 18:28:54 +02:00
Bruno Windels
5735c6d8f5 update favorite icon 2020-07-06 16:12:17 +02:00
Bruno Windels
08c44333cf Update develop 2020-07-06 09:29:23 +02:00
Bruno Windels
262b1edaa3 new icons 2020-07-03 18:03:28 +02:00
Michael Telatynski
0cbc506ad6 add missing svg 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 14:26:50 +01:00
Michael Telatynski
fe4cf9f9b4 Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-06-30 21:16:37 +01:00
Michael Telatynski
6b2ba8caed Add svgs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 00:27:32 +01:00
David Baker
f4460ca78f Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2 2020-06-26 13:12:06 +01:00
Andrew Morgan
6ea5dc7b7c Change the look of the spinner 2020-06-26 01:19:38 +01:00
David Baker
6ce8584337 Implement first screen (recovery key / passphrase choice) 2020-06-23 15:04:39 +01:00
Travis Ralston
58671f014b
Merge pull request #4765 from matrix-org/travis/room-list/show-less 
Add a 'show less' button to the new room list
 2020-06-17 10:24:50 -06:00
Travis Ralston
d2831ffb0c
Merge pull request #4758 from matrix-org/travis/room-list/sticky 
Sticky and collapsing headers for new room list
 2020-06-17 08:28:38 -06:00
Travis Ralston
bcebef7e56 Add a globe icon to public rooms 
For https://github.com/vector-im/riot-web/issues/14039
 2020-06-16 12:13:12 -06:00
Travis Ralston
84e60ee439 Add a 'show less' button to the new room list 2020-06-15 20:00:09 -06:00
Travis Ralston
4186070489 Support list collapsing and jumping 
Fixes https://github.com/vector-im/riot-web/issues/14036
 2020-06-15 19:47:43 -06:00
Travis Ralston
0755b4c148 Add a context menu to rooms in the new room list 
The tag options are not implemented out of concern for diff size. 

This splits the context menu classes out to a new "iconized" style which is common across a number of context menus, including the UserMenu.

Some of the badge/sublist styles had to change to better accommodate the menu icon lining up.

This also contains the framework required for https://github.com/vector-im/riot-web/issues/13961
 2020-06-09 23:09:15 -06:00
Travis Ralston
5114c37b82 Add filtering and exploring to the new room list 
This is per the designs. Animation doesn't feel required here.

Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
 2020-06-08 20:33:21 -06:00
Travis Ralston
8e0247afe5 Add most of the UI for the new room list's menu button 
Incomplete implementation: buttons don't work, some text is missing, etc
 2020-06-07 22:06:41 -06:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons 
Center HeaderButtons
 2020-06-04 00:36:23 +01:00
Aaron Raimist
a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00
Aaron Raimist
711ddd42c9 Remove some unused images 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00
Michael Telatynski
d99babfe05 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-02 21:51:05 +01:00
Michael Telatynski
702bbe3bcd Add e2ee-default:false notice to Setting>Security 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:09:14 +01:00
Michael Telatynski
f40cfe4a3b Implement new design with new iconography 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 15:00:27 +01:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Michael Telatynski
d63008f9c5
Merge pull request #4576 from matrix-org/t3chguy/kosovo2.0 
Replace png flags and add Kosovo to country code dropdown
 2020-05-13 09:58:10 +01:00
Michael Telatynski
004f75f289 Rename trash (custom).svg as electron doesn't like serving files with spaces 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-12 16:16:47 +01:00
Michael Telatynski
3bb800bb81 Replace png flags with use of Twemoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 22:04:18 +01:00
Michael Telatynski
f0085a9feb Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-05-07 09:56:21 +01:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Bruno Windels
e8e99c2646 Use color values for default avatar backgrounds 
We still need to convert them to URLs for the notification icon,
so use a canvas (with a cache in front of it) to do that.
 2020-04-27 19:35:38 +02:00
Michael Telatynski
e16f511527 Redesign redactions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:07:39 +01:00
Jorik Schellekens
600a812227 Add brush icon for appearance setting tab 2020-04-23 12:20:10 +01:00
Michael Telatynski
a06401a83e stage new artifacts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 22:57:00 +01:00
Michael Telatynski
cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot 
 Conflicts:
	src/components/views/rooms/RoomBreadcrumbs.js
	src/components/views/rooms/RoomTile.js
 2020-04-17 12:58:54 +01:00
Michael Telatynski
5c8ad71a15 add missing assets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 11:03:49 +01:00
Michael Telatynski
3612073852 Nuke the icon_person.svg DM Indicator as it causes more confusion than it solves. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-02 15:12:19 +01:00
Michael Telatynski
3628fd2ea2 add missing asset 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 00:18:33 +00:00
J. Ryan Stinnett
673fb792e5 Remove unused power level icons 2020-01-30 22:09:57 +00:00
Michael Telatynski
33b5d42c06 Be consistent about our settings svg, free the other one 2020-01-22 15:34:17 +00:00
Zoe
edd08c279c
Merge pull request #3821 from matrix-org/zip/11226-padlock-icons 
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
 2020-01-13 12:20:32 +00:00
Travis Ralston
ad33a2322e
Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids 
Support 3PIDs (email addresses) in the invite dialog
 2020-01-09 14:13:32 -07:00
Travis Ralston
2caebef7a1 Make the SVG smaller 2020-01-09 13:40:35 -07:00
Travis Ralston
94e9c6ac9f Make the SVG smaller 2020-01-09 13:38:47 -07:00
Zoe
e9032a9f61 Move the lock icon within the feather-customised directory 2020-01-09 16:00:36 +00:00
Zoe
5d22561815 Display a padlock icon beside encrypted rooms in the room list 
https://github.com/vector-im/riot-web/issues/11226
 2020-01-09 15:42:31 +00:00
Travis Ralston
79ab69353c Support searching for 3PIDs from the invite dialog 
Part of https://github.com/vector-im/riot-web/issues/11199
 2020-01-08 20:49:29 -07:00
Travis Ralston
ffd40c2c40 Initial editor for user list selection 
For https://github.com/vector-im/riot-web/issues/11199
 2020-01-07 12:13:40 -07:00
Will Hunt
0a8cc416bf
Merge branch 'develop' into hs/bridge-info 2019-12-30 17:09:05 +01:00
Michael Telatynski
b2249d0561 Initial rejig 2019-12-19 20:09:05 +00:00
Michael Telatynski
6f5ac780fa Use new image.svg placeholder for AvatarSetting in Rooms 2019-12-16 16:19:43 +00:00
Half-Shot
626ab17ed3 Styling 2019-12-09 13:22:45 +00:00
Matthew Hodgson
e77cf2b87e
Merge pull request #3653 from matrix-org/bwindels/fixe2eicons 
Fix e2e icons
 2019-11-21 19:01:17 +00:00
Bruno Windels
3cddcad5de use correct icons with borders 2019-11-21 18:12:32 +01:00
Travis Ralston
fd12eb28e7 Move many widget options to a context menu 
Part of https://github.com/vector-im/riot-web/issues/11262
 2019-11-20 19:17:42 -07:00
Bruno Windels
b278531f2f add IconButton as in design 2019-11-15 16:14:18 +01:00
Bruno Windels
e3f7fe51dc use normal shield for verification requests 2019-11-15 16:14:18 +01:00
Bruno Windels
f4988392f9 restyle e2e icons 2019-11-15 16:14:18 +01:00
Tulir Asokan
be829980f6 Split inline SVGs to their own files 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2019-10-20 12:13:32 +03:00
Travis Ralston
4b0596b6b7 Apply lipstick to hidden image design 2019-10-01 17:00:01 -06:00
Bruno Windels
80dd5a1b0a add explore button next to filter field 2019-09-10 10:55:55 +02:00
Bruno Windels
65ddfc0a50 show format bar when text is selected 2019-09-04 16:35:03 +02:00
J. Ryan Stinnett
8926992feb Add react button to action bar 
This adds a (temporarily non-functional) react button to the action bar.

Part of https://github.com/vector-im/riot-web/issues/9753
 2019-06-25 15:12:30 +01:00
Bruno Windels
52c4d7b6b0 fixup edit icon 2019-05-15 15:53:02 +01:00
Bruno Windels
edc100163f
Merge pull request #2952 from matrix-org/bwindels/message-edit-editor 
Initial support for editing messages
 2019-05-15 09:23:01 +00:00
Bruno Windels
6b932d58e6 remove cruft from edit icon 2019-05-15 10:10:29 +01:00
J. Ryan Stinnett
1421e8e06b Tweak reply arrow and hover color 2019-05-15 09:12:53 +01:00
Bruno Windels
6599d605cd wire up editor component (somewhat hacky) 2019-05-14 15:38:16 +01:00
J. Ryan Stinnett
739c8c0314 Promote reply button up to message action bar 
This moves the reply action out of the existing options menu and up to the
message action bar for easier access.
 2019-04-29 15:53:03 +01:00
J. Ryan Stinnett
8ef9fe951d Update styling of message action bar for multiple buttons 
This applies the new design for multiple buttons in the message action bar,
paving the way for more things to appear here.

In addition, this changes the existing options button to use the three vertical
dots icon. Some theme colors are also tweaked to align with what they were meant
to be from the unified palette.
 2019-04-29 15:20:51 +01:00
J. Ryan Stinnett
37e09b5569 Add check and x icons for validation feedback 
Adds icons from the Feather set with the same color as text. Tweaks validation
item spacing to match the design.
 2019-04-25 14:29:09 +01:00
J. Ryan Stinnett
12f7d1715b Remove BottomLeftMenu and supporting bits 
The `BottomLeftMenu` component is not used in the new design. This removes the
component and also any images and sub-components that were only used by it.
 2019-04-09 17:38:32 +01:00
YaoiFangirl420
9bd1ba60f5 Add option to rotate images 
cf. https://github.com/vector-im/riot-web/issues/9257

Add rotate clockwise/counterclockwise buttons to <ImageView>

Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-04-04 01:48:41 -07:00
David Baker
2055be36f1 Add the image 2019-03-05 16:49:12 +00:00
J. Ryan Stinnett
4b340450b9 Rename Feather icon directory to feather-customised 
These icons are based on Feather as the original source, but they have various
tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name
makes this more obvious in the future.
 2019-02-27 10:42:10 +00:00
J. Ryan Stinnett
1a89a4e87d Move logos out of feather dir 
These clearly aren't from the Feather set.
 2019-02-26 20:41:33 +00:00
J. Ryan Stinnett
3b3f0ea957 Move E2E icons out of feather dir 
They appear to all be created by Nad, according to
https://github.com/matrix-org/matrix-react-sdk/pull/2557.
 2019-02-26 20:31:32 +00:00
J. Ryan Stinnett
567280ae3d Remove unreferenced images 
Now that images flow through a build step, it's easy to spot which ones aren't
actually used. To determine this, I built Riot with the hash in file names
disabled, and then used a directory compare tool to look for all images in the
SDK that did not make it into the Riot build.

Fixes https://github.com/vector-im/riot-web/issues/8158
 2019-02-20 18:33:00 +00:00
J. Ryan Stinnett
5fb990eb5f Convert Markdown button to SVG mask 
This makes it easier to theme via CSS, which helps with the dark theme.
 2019-02-18 18:26:52 +00:00
Nad Chishtie
eec761a921
Merge pull request #2633 from matrix-org/nadonomy/icon-diet 
Skinnified more icons
 2019-02-14 16:53:58 +00:00
David Baker
7845a63506 Remove 'welcome' from top-left menu 
Tjis is quite confusing as the welcome page is designed for when
you're not logged in, ie. has a sign-in button. There's also no way
to get back into the app so it really looks like it's logged you
out.

Reverts 116367fd69
 2019-02-14 15:53:52 +00:00
Nad Chishtie
9aa3640e93 Tweaked more icons. 2019-02-13 19:44:45 +00:00
J. Ryan Stinnett
694a59afb7
Merge pull request #2628 from jryans/adjust-top-left-menu 
Adjust top left menu items
 2019-02-13 17:38:08 +00:00
J. Ryan Stinnett
ed0fc12f98 Tweak stroke width 2019-02-13 16:17:40 +00:00
J. Ryan Stinnett
116367fd69 Add welcome to top left menu for all 2019-02-13 16:13:32 +00:00
Nad Chishtie
4aa0f56b06 Normalised icon strokes to 1px 2019-02-13 16:11:18 +00:00
J. Ryan Stinnett
22789ada94 Add sign in to top left menu for guests 2019-02-13 16:01:13 +00:00
Matthew Hodgson
914b3e70d5 make warning triangle less random 2019-02-12 20:03:37 +00:00
J. Ryan Stinnett
69af0b82c8 Update avatar colors 2019-02-08 17:34:01 +00:00
J. Ryan Stinnett
5ab3c8b823 Add top left home menu item when home page configured 2019-02-08 13:48:51 +00:00
Bruno Windels
e2ce12f5c1 wip 2019-02-01 23:15:14 +01:00
Bruno Windels
ce5e56aaac update icons in member info device section 2019-02-01 17:32:46 +01:00
Bruno Windels
48c0e5a3ac update icons 2019-02-01 16:44:16 +01:00
Bruno Windels
88ad780b6b update message e2e icons 
also remove encrypted icon as header/composer already indicate encryption
 2019-02-01 16:43:12 +01:00
Bruno Windels
f2928c184d create warning/verified icon to use in header/composer/member info 2019-02-01 13:39:56 +01:00
J. Ryan Stinnett
de46e6aa0d Use dropdown-arrow for all toggle arrows 2019-01-30 16:39:07 -06:00
Bruno Windels
6ffc5e093d add icons to top left menu options 2019-01-29 16:56:07 +01:00
J. Ryan Stinnett
20bf683df8
Merge pull request #2517 from jryans/auth-server-type-selector 
Add server type selector and style login flow
 2019-01-28 22:11:14 -06:00
J. Ryan Stinnett
a6003dc638 Restore SVG indentation 2019-01-28 21:56:18 -06:00
Travis Ralston
d34390d230
Merge pull request #2512 from matrix-org/travis/usettings/tab/flair 
Implement flair tab in user settings
 2019-01-28 20:37:22 -07:00
J. Ryan Stinnett
7edd99c48c Change matrix.org logo to avoid fonts 2019-01-28 21:19:49 -06:00
Travis Ralston
3d59cf996f Icon for flair tab 2019-01-28 10:24:18 -07:00
J. Ryan Stinnett
0bee324e48 Add server type selector component 2019-01-28 08:52:20 -06:00
Travis Ralston
535d42684f Initial structure for new room settings 2019-01-25 13:09:44 -07:00
Travis Ralston
f1c1caac62 Implement labs tab in new user settings 2019-01-24 08:52:45 -07:00
Travis Ralston
2a9f6186d7
Merge pull request #2491 from matrix-org/travis/usettings/tab/general 
Implement the "General" tab of new user settings
 2019-01-24 08:51:11 -07:00
Travis Ralston
f643d7a143 Finish the box for displayname/avatar changes 2019-01-23 09:27:04 -07:00
J. Ryan Stinnett
523d910c66 Use new dropdown arrow for language selector 2019-01-23 10:18:06 -06:00
Travis Ralston
94b1d739fb
Merge pull request #2476 from matrix-org/travis/modal-tab-settings 
Basic structure for tabbed user settings
 2019-01-23 07:52:44 -07:00
Bruno Windels
5dd5f4f1dc add JumpToBottomButtom component 2019-01-22 14:49:04 +01:00
Travis Ralston
c3692aa9ae Use the right icons, sizing, and font families for things 2019-01-21 16:51:43 -07:00
Bruno Windels
8c30d05eb8 Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental" 
This reverts commit ece5cb1fcc, reversing
changes made to 64a3d2521c.
 2019-01-17 10:29:37 +01:00
J. Ryan Stinnett
5b88b64950 Rework custom status context menu 
This updates the custom status context menu to match the latest comps.  A single
button is used for setting / clearing, depending on what is appropriate.

The state logic is also changed to depend on events and storage from js-sdk for
the committed status message.  This makes it easy to distinguish the value being
edited from what's currently committed.
 2019-01-15 10:54:29 -06:00
Bruno Windels
9e67dbf008 change icon 2019-01-08 14:35:26 +01:00
Bruno Windels
7227049c2a add right panel toggle button to room header when in grid 2019-01-08 12:05:39 +01:00
Bruno Windels
290dc9d8fb Merge branch 'experimental' into bwindels/roomgridview-experimental 2019-01-07 14:17:57 +01:00
Travis Ralston
8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -07:00
David Baker
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" 
This reverts commit ad47144355.
 2019-01-03 15:37:03 -07:00