OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,747 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

2005 Commits (571fada77ed39c7c67a1bf03ceb49b763657f81f)

Author SHA1 Message Date
Richard Lewis ea83d7eee2 Add missing import and fix apps reference. 2017-06-28 15:53:18 +01:00
Luke Barnard d696373bc2 Fix issue where the cursor is put at the start of selected history item 
Leading to strange behaviour when selecting all and deleting it.

Fixes https://github.com/vector-im/riot-web/issues/4450
 2017-06-28 15:29:07 +01:00
Luke Barnard bcb67bb273 Refactor shared code between `onUpArrow` and `onDownArrow` 2017-06-28 15:20:16 +01:00
Richard Lewis 3a10cda2ca Add translations. 2017-06-28 13:55:18 +01:00
Richard Lewis f8c064ec25 REmove redundant call to _getApps 2017-06-28 13:45:29 +01:00
Richard Lewis e70eca0b0c Comment unused code and add TODO to handle scalar errors. 2017-06-28 12:58:09 +01:00
Richard Lewis d06d066050 Move getInitialState to top of file. 2017-06-28 12:54:47 +01:00
Richard Lewis e752cc8557 Use 'this' in preference to local reference. 2017-06-28 12:32:38 +01:00
Richard Lewis 481a66ef3c Fix header. 2017-06-28 12:26:05 +01:00
Richard Lewis 93bdfc99df i18n "Cancel" alt text. 2017-06-28 12:25:36 +01:00
Richard Lewis ddea1f35d2 Fix header. 2017-06-28 12:23:33 +01:00
Luke Barnard f73fa4b49b Move processing into renamed function processHtmlforSending 
And explain why this fix is necessary
 2017-06-28 11:49:50 +01:00
Luke Barnard 1523d304f2 WIP to prevent RTE from deleting current message input when up arrow pressed 2017-06-28 10:30:59 +01:00
Richard Lewis ad2517bd8b Uppercase the first letter of the app tile name. 2017-06-28 10:27:06 +01:00
Luke Barnard 69589c19e7 Work around draft-js-export-html#62 by post-processing <br>\n 
Fixes https://github.com/vector-im/riot-web/issues/4446 by post-processing the output HTML from draft-js-export-html by replacing `<br>\n` with `<br>`. This works for content within or outside of `<pre>`. If we replace with `\n` instead, the newlines only apply in `<pre>` tags so we use `<br>`.
 2017-06-27 18:33:45 +01:00
Richard Lewis 3872f0750c Only show apps button if labs feature enabled. 2017-06-27 17:40:28 +01:00
Richard Lewis 338a4db87f Only show apps drawer if matrix apps labs setting ids enabled 2017-06-27 17:40:09 +01:00
Luke Barnard 5307731dfd Overide default draft-js handling of pasting text/html 
This is surprisingly needed to avoid an issue with draft-js that causes multi-line madness when pasting code and then applying format-as-code to it - https://github.com/vector-im/riot-web/issues/2120#issuecomment-271735729.

The issue sounds like it is https://github.com/facebook/draft-js/issues/170#issuecomment-195026203 and the suggstion is to override the text pasting handler https://github.com/facebook/draft-js/issues/170#issuecomment-215983216. Meanwhile they haven't modified the default pasting behaviour afaics.

I've discovered a separate issue that is apparent even after this suggested fix. (https://github.com/vector-im/riot-web/issues/4446)
 2017-06-27 17:10:28 +01:00
Luke Barnard 4645ba1bba Merge pull request #1150 from matrix-org/luke/fix-rte-dev-tools-toggle 
Allow toggling of dev tools when RTE focussed
 2017-06-27 15:38:19 +01:00
Luke Barnard ba31a32440 Allow toggling of dev tools when RTE focussed 2017-06-27 15:17:57 +01:00
Richard Lewis aab4c097e6 Make query parameters generic. 2017-06-27 12:26:13 +01:00
Richard Lewis ddc0da396d Merge in changes from develop 2017-06-27 11:44:36 +01:00
Richard Lewis 63b1250385 Add comment 2017-06-27 11:39:20 +01:00
Richard Lewis 1f1352786f Temporarily disable Jitsi default 2017-06-27 11:38:14 +01:00
Richard Lewis 18ea76b864 Removed commented code 2017-06-27 11:31:00 +01:00
Richard Lewis e343e99355 Cleaned up unused files and removed commented code 2017-06-27 11:28:38 +01:00
lukebarnard fbaa3de28b Null-guard m.video info 
Fixes https://github.com/vector-im/riot-web/issues/4423
 2017-06-26 22:22:03 +01:00
Johannes Löthberg 48c32172fd TextualBody: only highlight code block if language was specified 
The highlight.js autodetection is finicky and often wrong, so disable
highlighting unless the language was explicitly specified, or if the
user has explicitly enabled it in the settings.

Fixes vector-im/riot-web#508.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-06-26 17:45:40 +02:00
Luke Barnard c1bceb81d2 Merge branch 'develop' into luke/fix-rte-strikeout 2017-06-26 09:41:17 +01:00
Luke Barnard caa0250d30 Merge pull request #1144 from matrix-org/rte-fixes2 
RTE Fixes
 2017-06-26 09:38:14 +01:00
Luke Barnard 9404dd30c5 Use <del> for strikeout 
We've swapped to commonmark, which uses <del> instead of ~~ for strikeout, so make the RTE insert <del> when we apply strikeout. Also, when ~~ is inserted, transform them into <del> for simplicity. This means giving an input of ~~test~~ is effectively the same as giving an input of <del>test</del>.
 2017-06-23 18:19:06 +01:00
Luke Barnard 89afcfd897 Linting 2017-06-23 17:35:07 +01:00
Luke Barnard 87609582c6 Merge branch 'develop' into rte-fixes2 
Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js
 2017-06-23 15:30:06 +01:00
David Baker ec36a348be comment why we send the empty string 2017-06-23 14:48:15 +01:00
Luke Barnard c51255da40 Submit empty string username when on phone number login 2017-06-23 14:34:19 +01:00
Luke Barnard f5353fcdc5 Only submit phone number when phone loginType is selected 
Otherwise submit a phoneNumber and phoneCountry of `null` (when logging in with email or username).

Fixes https://github.com/vector-im/riot-web/issues/4000
 2017-06-23 13:43:52 +01:00
turt2live a22f14e910 Use 12h timestamps when enabled in RR 
Fixes vector-im/riot-web#4393 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-22 08:54:34 -06:00
Richard Lewis 2cb2c44bd8 Remove unused logging 2017-06-20 17:57:48 +01:00
Richard Lewis 68473e118f Ensure that Scalar Messaging is started and stopped on component mount / unmount 2017-06-20 17:56:45 +01:00
Luke Barnard 2c2091438e Fix ability to invite users with caps in their user IDs 
By lowercasing only when testing against local user IDs/display names. The user_directory shouldn't care. And when we make the placeholder "We didn't get any results, but here's the user with the exact mxid you typed in", use the original query.
 2017-06-20 15:46:54 +01:00
Luke Barnard f15292becf Merge branch 'develop' into luke/fix-email-cancel-button-text 2017-06-20 13:30:34 +01:00
Richard van der Hoff 0c431887b0 Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests 
Pop up a dialog when we get a room key request
 2017-06-20 13:20:58 +01:00
Richard Lewis a449588c1c Replace add app dialog with scalar interface 2017-06-20 10:54:41 +01:00
Richard van der Hoff a0534e7477 Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-20 00:25:14 +01:00
David Baker b1ca83bb9d Internationalise the drop targets 
Unsure how these had got missed (and yet still had the translation
strings in the json)
 2017-06-19 17:49:22 +01:00
daniel tygel 13c12811e7 typo 2017-06-19 13:22:23 -03:00
daniel tygel aebe4fb88f add two strings to translation 2017-06-19 13:21:23 -03:00
daniel tygel c418076c32 add two strings to translation 2017-06-19 13:20:16 -03:00
Luke Barnard 83d5822c85 Show a "Skip" button instead of "Cancel" in SetEmailDialog 
Fixes https://github.com/vector-im/riot-web/issues/4309
 2017-06-19 13:17:12 +01:00
Richard Lewis 80c5a58fc3 Fix custom widget form styling 2017-06-19 12:06:16 +01:00
Matthew Hodgson 032650e095 Merge branch 'develop' into t3chguy/fix_forwarding 2017-06-19 01:53:35 +01:00
Michael Telatynski 7b4cd31124 make forward_message be friendly with the RVS stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:12:52 +01:00
David Baker aa7ddfe86e Remove unused collapse_rhs 
Remove all the places we pass collapse_rhs through to places it's
never used. Remove the commented RHS collapse button from
SimpleRoomHeader.
 2017-06-16 15:47:40 +01:00
David Baker 2a01e638b7 Make sure captcha disappears when container does 
Should fix https://github.com/vector-im/riot-web/issues/4095
 2017-06-16 10:25:51 +01:00
David Baker 9ecf82a1f2 Show correct text in set email password dialog (2) 
Fixes https://github.com/vector-im/riot-web/issues/4311

The cancel button onClick was hooked directly up to onFinished, so
the mouse event ended up as the boolean for whether an email had
been set.
 2017-06-14 16:06:28 +01:00
David Baker 449c65b784 Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set 
Give password confirmation correct title, description
 2017-06-14 15:16:36 +01:00
Luke Barnard 1d4a3ae5a3 Give password confirmation correct title, description 
Fixes https://github.com/vector-im/riot-web/issues/4311

This was due to `BaseDialog` calling `onFinished` with a mouse event instead of `false` (and it was assumed to call with `true/false`, but doesn't)
 2017-06-14 14:58:39 +01:00
David Baker 57ef6f3cf8 Make enter submit change password form 
Fixes https://github.com/vector-im/riot-web/issues/4302
 2017-06-14 14:50:48 +01:00
Robert Swain edb11d805e AppsDrawer: Open add app widget if opening empty drawer 
This felt much better than having to also click the add app widget
button.
 2017-06-14 15:05:29 +02:00
Robert Swain 5f020423bc AddAppDialog: Put the submit button inside the form 2017-06-14 15:05:11 +02:00
Robert Swain 2d3c886646 AppsDrawer: Generate room alias for vrdemo 2017-06-14 13:27:15 +02:00
Robert Swain 9c8ab2691b AppsDrawer: Only append queryParams once 2017-06-14 13:26:43 +02:00
Robert Swain 880e7149f3 ModularWidgets: Add a quick VR demo widget 2017-06-14 13:05:43 +02:00
Luke Barnard 57dfbc4701 Remove unused imports 2017-06-14 10:53:02 +01:00
David Baker 0566e5d992 Merge pull request #1090 from matrix-org/luke/set-email-after-password-2 
Ask for email address after setting password for the first time
 2017-06-14 09:57:07 +01:00
Luke Barnard 4344af58ee Ask for email address after setting password for the first time 
So that the user can reset their password.
 2017-06-14 09:31:16 +01:00
Matthew Hodgson 9dad5d0132 Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings 
remove mx_filterFlipColor from verified e2e icon so its not purple :/
 2017-06-13 17:45:56 +01:00
Michael Telatynski f4aadafed9 remove mx_filterFlipColor from verified e2e icon so its not purple :/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-13 17:42:30 +01:00
Robert Swain d67e7289e8 Merge branch 'develop' into rob/apps 2017-06-13 15:50:43 +02:00
Robert Swain 03ba3bd431 Merge branch 'rxl881/apps' into rob/apps 2017-06-13 15:41:52 +02:00
Robert Swain 91eabbba60 MessageComposer: Trigger Jitsi app from call buttons 2017-06-13 15:35:13 +02:00
Robert Swain 5d898dd098 AuxPanel: Add type checking for userId and showApps properties 2017-06-13 15:34:05 +02:00
Robert Swain b63edcb390 AppTile: Support deletion of apps from room state 2017-06-13 15:33:17 +02:00
Robert Swain bcb2f8408b AppTile: Fix typo in property name 2017-06-13 15:32:40 +02:00
Robert Swain 2aa0aa61e3 AddAppDialog: Support adding apps to room state 2017-06-13 15:31:37 +02:00
Robert Swain a72cb794f2 AppsDrawer: Populate apps from room state 2017-06-13 15:28:37 +02:00
David Baker bd00c1d4b1 Merge pull request #1083 from matrix-org/t3chguy/width_height_int 
width and height must be int otherwise synapse cries
 2017-06-13 13:23:12 +01:00
Michael Telatynski ad7c835471 width and height must be int otherwise synapse cries 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-13 12:19:20 +01:00
Richard Lewis 876899948f Merge in upstream changes 2017-06-13 11:44:23 +01:00
Luke Barnard 10ba5f8c3c Only process user_directory response if it's for the current query 2017-06-13 11:03:22 +01:00
Richard Lewis 2da30137ec Fix import path and add LG widget 2017-06-13 10:31:16 +01:00
Luke Barnard 1ce1984858 Fix regressions with starting a 1-1. 2017-06-13 10:15:29 +01:00
David Baker 7b0565e9d1 Merge branch 'master' into develop 2017-06-12 15:53:04 +01:00
Matthew Hodgson 6133186583 fullstop fails 2017-06-12 15:36:24 +01:00
Richard Lewis b893887707 Fix merge conflict 2017-06-12 14:52:41 +01:00
Richard Lewis f9f924bbd6 Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-12 14:50:25 +01:00
Richard van der Hoff cc74a09abd Remove start_upgrade_registration dispatch handler 
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
 2017-06-12 08:38:29 +01:00
Richard van der Hoff e6d7eedbe6 Remove NeedToRegisterDialog 
- since it's no longer used anywhere
 2017-06-12 08:36:41 +01:00
Will Hunt 3ddbf83c62 Add userid back 2017-06-11 07:13:50 +01:00
Will Hunt f940d2c100 Add reason for ban in room settings 2017-06-10 16:57:09 +01:00
Matthew Hodgson 3b7ce49eab Merge pull request #1070 from matrix-org/t3chguy/dark_theme/e2e_icons 
adds mx_filterFlipColor so that the dark theme will invert this image
 2017-06-10 01:06:31 +01:00
Michael Telatynski 34caf5586f adds mx_filterFlipColor so that the dark theme will invert this image 
making it more suitable for the said theme

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-10 00:08:40 +01:00
Matthew Hodgson a4a0acc28d fullstop fails 2017-06-09 22:19:14 +01:00
David Baker d6b85c9d4d Fix translations on conf call banner 
* You can't substitute react elements into a text string
 * Substituting in undefined gives the string 'undefined', so
   initialise it to the empty string.
 2017-06-09 22:06:43 +01:00
Robert Swain 9e0b476b72 Merge branch 'develop' into rob/apps 2017-06-09 12:06:44 +02:00
Luke Barnard ce0977373e Merge pull request #1058 from matrix-org/luke/fix-event-id-state 
Control currently viewed event via RoomViewStore
 2017-06-08 18:10:29 +01:00
Matthew Hodgson df625b0d31 hit MemberInfo with Gemini to fix vector-im/riot-web#4223 2017-06-08 17:26:40 +01:00
Matthew Hodgson f26aeef2bf Merge pull request #1056 from matrix-org/kegan/translation-tamarin 
Add remaining translations
 2017-06-08 15:06:26 +01:00
Kegan Dougal 9baaf5499f Linting 2017-06-08 14:58:54 +01:00
David Baker 71eb405859 Add comments & remove redundant check 2017-06-08 14:53:21 +01:00
Kegan Dougal f2efdf8a4f Review comments 2017-06-08 14:45:59 +01:00
David Baker b40636a425 Merge pull request #1040 from ollieh/issues/1974 
Added button that copies code to clipboard
 2017-06-08 14:45:58 +01:00
Matthew Hodgson c173861b27 Merge pull request #1021 from Bitim/feature/rtl-languages-support 
Better RTL support
 2017-06-08 14:43:18 +01:00
Kegan Dougal e3ac78bd28 Self-review 2017-06-08 14:36:20 +01:00
Luke Barnard ea97d16aa2 Merge branch 'develop' into luke/fix-event-id-state 
Conflicts:
	src/components/structures/MatrixChat.js
 2017-06-08 14:33:58 +01:00
Matthew Hodgson 29e792b642 make mels emoji capable 2017-06-08 14:21:14 +01:00
Kegan Dougal c57823a31d Merge branch 'develop' into kegan/translation-tamarin 2017-06-08 14:19:56 +01:00
Luke Barnard d3cf78ff5a Control currently viewied event via RoomViewStore 
Fix for https://github.com/vector-im/riot-web/issues/4224

Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously).

This required a few changes:
 - The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`.
 - The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.
 2017-06-08 14:17:49 +01:00
Kegan Dougal 00df956ca2 Add remaining translations! 
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
 2017-06-08 14:08:51 +01:00
Kegan Dougal 1c58a9cd5e Everything but src/components/views/rooms 2017-06-08 12:33:29 +01:00
Matthew Hodgson bc0eb4294c rename welcome page to home 2017-06-08 10:27:35 +01:00
Kegan Dougal 0f4028da07 Add more translations.. 2017-06-08 09:44:58 +01:00
Matthew Hodgson 8228db88d2 oops, fix more i18n var name typos 2017-06-07 18:28:49 +01:00
Matthew Hodgson ef2fedc3a9 fix missing translations and typos in i18n 2017-06-07 18:24:35 +01:00
David Baker 0370b7c5e8 Merge pull request #1050 from matrix-org/luke/feature-user-directory-invite 
Use user_directory endpoint to populate ChatInviteDialog
 2017-06-07 18:06:35 +01:00
Luke Barnard 29da25529c Make it backwards compatible 
Hit the user_directory API and if M_UNRECOGNIZED, do a local search and continue to search locally therein.
 2017-06-07 17:53:58 +01:00
Luke Barnard 68ddf35db4 Use then, catch, done and display any errors that occur during search 2017-06-07 17:33:15 +01:00
Luke Barnard 49b22fb6c6 Use an arrow function to allow `this` 
This was causing `TypeError: Cannot read property '_getEmptyContent' of undefined` for those with custom tags.
 2017-06-07 16:13:40 +01:00
Luke Barnard 3b6599dcdc Use user_directory endpoint to populate ChatInviteDialog 
Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.
 2017-06-07 16:05:36 +01:00
Richard van der Hoff 27e5098e00 Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests 2017-06-07 15:44:33 +01:00
Richard Lewis a09001933a git status 2017-06-07 15:39:27 +01:00
Richard van der Hoff c1151fd31c Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-07 15:37:38 +01:00
Luke Barnard 53ea41e8a5 Merge branch 'develop' into new-guest-access 2017-06-07 12:08:37 +01:00
Richard Lewis c552f7f336 App icon styling 2017-06-07 10:55:49 +01:00
Richard Lewis f6f660fa9a Initial app icon tiles 2017-06-06 23:45:17 +01:00
Matthew Hodgson 184c2d5e58 Merge pull request #1015 from matrix-org/t3chguy/random_fix_1 
fix copy and paste derp and rip out unused imports
 2017-06-06 18:02:35 +01:00
Richard Lewis e8353edb06 Disable test postmessag 2017-06-06 15:57:40 +01:00
Richard Lewis e9f110a4c5 Don't show add widget if there are more than one existing widgets 2017-06-06 14:50:43 +01:00
Oliver Hunt dd6171a39e Review changes 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-06 12:34:03 +01:00
Oliver Hunt a640e943f7 Added button that copies code to clipboard 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-06 12:33:44 +01:00
David Baker 22df03944c Merge branch 'develop' into new-guest-access 2017-06-06 10:35:28 +01:00
David Baker f8198ba9c9 Merge branch 'develop' into new-guest-access 2017-06-06 10:33:01 +01:00
David Baker e7af9bde23 Merge pull request #1036 from matrix-org/luke/fix-people-section-disappearing-again 
Remove DM-guessing code (again)
 2017-06-06 10:20:44 +01:00
Matthew Hodgson d77a09adba quick and dirty override to disable MD globally 2017-06-05 21:33:01 +01:00
Luke Barnard 4ab6dc9ddd Merge branch 'new-guest-access' into luke/ilag-i18n 2017-06-05 20:28:51 +01:00
Richard Lewis dc4f321707 Pass room and user id to apps draw 2017-06-05 18:21:31 +01:00
Richard van der Hoff 32e3ea0601 Address review comments 2017-06-05 17:58:11 +01:00
David Baker ad87e9bd50 Apply 9cae667c06 to ilag branch 2017-06-05 17:28:36 +01:00
Luke Barnard cc8078837d Remove DM-guessing code (again) 
Seems this got reverted somehow:
>the revert of https://github.com/matrix-org/matrix-react-sdk/pull/807 (ebfafb3639) also included the revert of https://github.com/matrix-org/matrix-react-sdk/pull/829
 2017-06-05 16:57:30 +01:00
Luke Barnard 619830617a Merge branch 'develop' into luke/ilag-i18n 
In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json
 2017-06-05 16:08:03 +01:00
Luke Barnard 6125395675 _t for SetMxIdDialog 2017-06-05 15:36:10 +01:00
Richard Lewis c6991fd33c Periodically pass messages to embedded iframe 2017-06-04 23:00:52 +01:00
saul.kredi@krutt.org 159a920dc8 Better RTL support 2017-06-03 18:52:45 +03:00
Michael Telatynski 1bbdb6c985 actually pass ev through 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:51:20 +01:00
Michael Telatynski 4032a820f0 move KEY_M to KeyCode 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:46:08 +01:00
Michael Telatynski 464863acd6 remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:35:55 +01:00
Michael Telatynski ae91f0ca62 catch ev arg so the disable stuff works 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:34:18 +01:00
Michael Telatynski 5e85723b5a fix typo and missing import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:09:19 +01:00
Luke Barnard 953a573f81 Merge pull request #1006 from matrix-org/luke/new-guest-access-user-action-chat 
Implement /user/@userid:domain?action=chat
 2017-06-02 12:03:11 +01:00
Luke Barnard 6e84b6e996 Display profile errors better 2017-06-02 11:50:58 +01:00