mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 19:41:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
6712 commits 219 branches 562 tags 474 MiB
Commit graph

2330 commits

Author SHA1 Message Date
Richard van der Hoff
a06bd84213 replace imports of q with bluebird 
update `package.json`

```
find src test -name '*.js' |
   xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
   xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-12 18:05:08 +01:00
Luke Barnard
6ff924fc0d Remove MessageComposerInputOld 2017-07-12 18:03:13 +01:00
David Baker
a48c7d2364 Only allow http and https widget URLs 2017-07-12 14:16:47 +01:00
David Baker
918f5abe81 Lint correctly 2017-07-12 10:34:50 +01:00
David Baker
53316a76f4 Sandbox app iframes 2017-07-12 10:22:14 +01:00
Luke Barnard
af3b6484cd Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview 
Add more features to Group View
 2017-07-11 17:03:47 +01:00
David Baker
4e49ebd6ce Change incorrect refs to this.props 2017-07-11 14:31:07 +01:00
Kegsay
cf158530f5 Implement new widget API (#1201) 
* Implement new widget API

This allows clients to see who provisioned which widgets.

* Update to make state_key the wid

* Update to latest API

* Only show widgets which have required fields

* Don't constantly show apps dialog

* Fix example to include data key
 2017-07-11 12:15:27 +01:00
David Baker
ac4be03f7b Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:51:13 +01:00
Luke Barnard
b104228a7b Remove redundant functions, bindings, props 2017-07-10 14:27:41 +01:00
David Baker
696c72be2b Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:03:30 +01:00
Luke Barnard
c9df079464 Merge pull request #1176 from matrix-org/luke/feature-enable-RTE 
Take RTE out of labs! 🎉
 2017-07-10 13:56:00 +01:00
Luke Barnard
9643f0c00b Merge pull request #1167 from matrix-org/dbkr/my_groups 
Implement 'Groups' page
 2017-07-10 09:37:06 +01:00
David Baker
1e713557bb PR feedback 2017-07-07 18:34:40 +01:00
Luke Barnard
7a8f524f4a Remove two possible sources for the "AutoComplete stays visible bug 
which is now https://github.com/vector-im/riot-web/issues/4537 <- there.

This does two things:
 - Track which query was the most recent one requesting completion and only process completions for that one. (In this case the empty string "" doesn't have any completions but we still track it so that previous calls with non-empty queries would not race and cause completions to be shown when we actuall don't want any.)
 - Make the "do we want to show the AutoComplete box?" logic a bit more sane
 2017-07-07 15:30:31 +01:00
David Baker
c1833f9833 Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview 2017-07-07 13:44:35 +01:00
David Baker
c21f90338d Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-07 12:02:15 +01:00
David Baker
bc8c2d442b WithMatrixClient -> withMatrixClient 
because we're using it as a function rather than a React component
 2017-07-07 11:34:20 +01:00
David Baker
fea0a941ce Fix lint 2017-07-07 11:01:54 +01:00
David Baker
183f45bc1f Fix lint errors 2017-07-07 10:41:59 +01:00
David Baker
45986306cc Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:32:37 +01:00
David Baker
fa37d03db6 Improve the Group View page 
Show the rooms in the group in thir various categories, etc
 2017-07-06 19:13:14 +01:00
Richard Lewis
d091550ccb Use app ID for element key and pass screen parameter to scalar. 2017-07-06 15:59:59 +01:00
Luke Barnard
6404f7603c Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u 
Allow underline through MD and in RTE (MD) using <u> which works with CM
 2017-07-06 14:08:01 +01:00
Luke Barnard
d9a67355d2 Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on 
Only insert HTML into the composer in RTE mode
 2017-07-06 13:59:52 +01:00
Michael Telatynski
ff7ae5b995
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u 2017-07-06 13:56:20 +01:00
Michael Telatynski
fcd8321a63
Allow underline through MD and in RTE (MD) using <u> which works with CM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-06 13:49:13 +01:00
Michael Telatynski
6149b37245
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl 2017-07-06 13:30:40 +01:00
Michael Telatynski
c6d9ec42a2
only show unban button in RoomSettings if user has sufficient PL to do so 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-06 12:51:55 +01:00
Luke Barnard
bdefb35c64 Only insert HTML into the composer in RTE mode 
If MD mode is enabled, paste the plaintext equivalent.
 2017-07-06 11:52:02 +01:00
Richard van der Hoff
c29863362f Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key 
Fix a React duplicate key error
 2017-07-06 11:08:03 +01:00
Richard van der Hoff
4f8d9d869e mention preserving ordering in comment 2017-07-06 10:47:15 +01:00
Kegan Dougal
42ba3ff410 Linting 2017-07-06 10:44:32 +01:00
Richard van der Hoff
6a2d6b2e6e Fix a React duplicate key error 
If a single message contains the same link twice, we get an error from React
about the clashing keys. De-dup the links to keep it quiet.
 2017-07-06 10:02:25 +01:00
Kegsay
e0e321783b Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182) 2017-07-06 09:28:48 +01:00
Luke Barnard
0bf1124f1b Merge pull request #1181 from matrix-org/luke/fix-rte-draft-persist 
Implement MessageComposerStore to persist composer state when room switching
 2017-07-05 18:24:27 +01:00
Luke Barnard
7f1d8e3c90 Merge pull request #1188 from matrix-org/luke/feature-rte-visual-bell 
Add visual feedback for when there are no completions available
 2017-07-05 18:23:10 +01:00
Luke Barnard
29e793f591 Merge pull request #1180 from matrix-org/luke/fix-rte-force-immediately 
When hitting "tab" use an autocompleteDelay of 0
 2017-07-05 18:20:48 +01:00
Luke Barnard
d78168d407 Add visual feedback for when there are no completions available 
Attempts to kep parity with old composer by using the same #faa colour but uses an animation instead of a js timeout.

Fixes https://github.com/vector-im/riot-web/issues/4490
 2017-07-05 18:14:22 +01:00
Luke Barnard
5c9d3edec4 Revert #1170, fde7d5eaf4 
There were a few issues with this, namely that links were no longer linkified and an error was logged to the console: `Warning: Stateless function components cannot be given refs (See ref "topic" in EmojiText created by RoomHeader). Attempts to access this ref will fail.`
 2017-07-05 14:46:00 +01:00
Luke Barnard
3d5b3ed7ad Use ContentState instead and persist over localStorage 2017-07-05 11:49:34 +01:00
David Baker
3b06db0725 Pass with, height & resizeMethod through 
Was spelt wrong anyway
 2017-07-05 11:39:22 +01:00
Luke Barnard
084a933dbd Implement MessageComposerStore to persist composer state across room switching 
This behaviour was present in the old composer but implemented using local storage. This is unecessary as we don't really care about our drafts across clients, the important thing is that our draft is kept when switching rooms.

As a bonus, ifnore vertical arrow key presses when a modifier key is pressed so that the room switching keys (alt + up/down arrow) don't also cause history browsing (or autocomplete browsing).
 2017-07-05 10:24:55 +01:00
Luke Barnard
5f6c3e5afc When hitting "tab" use an autocompleteDelay of 0 
So that there's no delay when tab completing. Fixes https://github.com/vector-im/riot-web/issues/4497
 2017-07-04 17:49:50 +01:00
Luke Barnard
77348e6201 Remove spurious, unused code 2017-07-04 15:20:00 +01:00
Luke Barnard
e3f2eb5232 Take RTE out of labs! 🎉 
This stops react-sdk from tracking any state previously stored for the purposes of enabling or disabling the lab feature that enabled the new MessageComposer. It is now enabled permanently.

This is being done with the hope that we can get more feedback for it so that when we release we can be confident that people will be OK with the changes it brings.
 2017-07-04 14:44:55 +01:00
Richard van der Hoff
fb86534ba3 Merge pull request #1171 from matrix-org/t3chguy/delintify 
De-Lint 23 files
 2017-07-04 10:40:49 +01:00
Luke Barnard
664f3acc3c Only move through history if caret at start or end of line 
As suggested by @dbkr (because this is what we do for the old composer), only move through history when the caret is that the beginning of the first line (block) or end of the last.

This has the nice property of being able to move the caret up to a really long message: fixes https://github.com/vector-im/riot-web/issues/4471
 2017-07-04 10:12:06 +01:00
Michael Telatynski
34c9bbfd86
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/rooms/RoomHeader.js
 2017-07-03 19:15:38 +01:00
Michael Telatynski
827c38d4a5
fix variable clash 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-03 19:13:07 +01:00
David Baker
72eed70a84 Merge pull request #1173 from matrix-org/luke/fix-rte-forgets-me 
Strip out "/me" after committing to RTE history
 2017-07-03 15:59:07 +01:00
David Baker
a7bb546b1f Merge pull request #1172 from matrix-org/luke/fix-rte-md-format-without-selection 
When formatting with MD enabled, move selection inside ** or equivalent
 2017-07-03 15:58:02 +01:00
Luke Barnard
775f5a0e5b Strip out "/me" after committing to RTE history 
So that history can include emotes

Fixes https://github.com/vector-im/riot-web/issues/4472
 2017-07-03 15:47:03 +01:00
Luke Barnard
86889b8e8c When formatting with MD enabled, move selection inside ** or equivalent 
Fixes https://github.com/vector-im/riot-web/issues/3225

Also insert `\n` after code-block and blockquote to fix https://github.com/vector-im/riot-web/issues/2746
 2017-07-03 15:23:24 +01:00
David Baker
a89ea39dba Merge pull request #1170 from matrix-org/t3chguy/emojione-room-topic 
make RoomHeader Topic use EmojiText to be emojione-friendly
 2017-07-03 10:27:47 +01:00
Michael Telatynski
9ef83b8dc0
de-lint views/voip/* 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-01 14:58:46 +01:00
Michael Telatynski
e56203f2a1
de-lint RoomHeader, Avatar, SdkConfig, SlashCommands 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-01 14:13:32 +01:00
Michael Telatynski
fde7d5eaf4
make RoomHeader Topic use EmojiText to be emojione-friendly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-01 13:36:28 +01:00
David Baker
8468a118b5 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-06-30 16:15:41 +01:00
Luke Barnard
0b46184a21 Merge pull request #1166 from matrix-org/luke/fix-rte-wrong-history-format 
Always store sent MD messages as MD in history
 2017-06-30 16:05:45 +01:00
David Baker
c07057d1d4 Extract props we don't want to pass to BaseAvatar 2017-06-30 16:05:19 +01:00
Luke Barnard
6bc40a112c Always store sent MD messages as MD in history 
Because converting them to HTML when they got sent as HTML seems a bit pointless when they're just going to get transformed back again when retrieved from history.

Fixes regression https://github.com/vector-im/riot-web/issues/4465
 2017-06-30 15:47:48 +01:00
Kegan Dougal
b8941f76d3 Fix bug which breaks the close button on scalar 2017-06-30 15:42:36 +01:00
Luke Barnard
15cfe5b8e4 Only allow history selection when on the first or last line 
(of a multi-line or otherwise message in the editor)
 2017-06-30 14:27:26 +01:00
Luke Barnard
e7a2c3b975 Only send HTML when using RTE when necessary 
When there are no styled blocks or inline styles applied within blocks, just send text instead of HTML.

Also, don't add <br /> for the last <p> (the last block).

Fixes https://github.com/vector-im/riot-web/issues/3147
 2017-06-30 11:27:00 +01:00
David Baker
84e13d5437 Add GroupAvatar to handle fallback images etc. 
And a few misc tidyups
 2017-06-29 17:51:38 +01:00
Luke Barnard
8b8260c509 Move cursor to end of editor when quoting 
When quoting a message, move the selection to the end of the input box. Fixes https://github.com/vector-im/riot-web/issues/2336
 2017-06-29 17:22:34 +01:00
David Baker
f99c540b3d Groups page / Create Group dialog 2017-06-29 17:03:05 +01:00
Luke Barnard
e5e7dec131 Fix #4422 by persisting the "currently composed" message 
This allows for browsing through history without losing the message currently being composed.
 2017-06-29 17:02:19 +01:00
Luke Barnard
6bd7284161 Be sensible about handling up/down vs tab/tab-shift 
Fixes https://github.com/vector-im/riot-web/issues/4445
 2017-06-29 15:07:06 +01:00
Luke Barnard
8912400675 Add XXX for https://github.com/vector-im/riot-web/issues/4445 2017-06-28 18:05:39 +01:00
Luke Barnard
a3e02f470f Merge pull request #1156 from matrix-org/luke/fix-rte-debounce 
Do debouncing for autocomplete in a sane way
 2017-06-28 18:03:36 +01:00
Luke Barnard
de81188b13 Do debouncing for autocomplete in a sane way 
- Fixes https://github.com/vector-im/riot-web/issues/4419
 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285901871
 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285910503
 - Fixes bug where the setting being used was the `autocompleteDelay` "syncedSetting" when it should have been the "localSetting" (so the setting being used was always the default)
 2017-06-28 17:27:21 +01:00
Luke Barnard
d5585e29b1 Merge pull request #1155 from matrix-org/luke/fix-rte-cursor-at-start-of-history 
Fix issue where the cursor is put at the start of selected history item
 2017-06-28 17:17:56 +01:00
Richard Lewis
d61525e420 Merge pull request #1152 from matrix-org/rxl881/apps 
Add support for apps
 2017-06-28 16:06:20 +01:00
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
Luke Barnard
defecb1b14 Implement /user/@userid:domain?action=chat 
This is a URL that can be used to start a chat with a user.
 - If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in.
 - If the user is registered, they will not see the setMxId dialog.

fixes https://github.com/vector-im/riot-web/issues/4034
 2017-06-02 11:36:18 +01:00
Luke Barnard
be7c2612e8 Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips 
Show People/Rooms emptySubListTip even when total rooms !== 0
 2017-06-02 11:10:48 +01:00
Kegan Dougal
f54c182eb1 Add remaining strings for vector-im/riot-web#4151 2017-06-02 10:47:08 +01:00
Richard van der Hoff
a3a262b150 Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests 2017-06-02 10:31:14 +01:00
Kegan Dougal
d2e766e4f0 First round 2017-06-02 10:18:31 +01:00
Matthew Hodgson
c7285b9053 fix fr layout 2017-06-02 00:21:00 +01:00
Matthew Hodgson
6a225d1ac2 use new sign-in string 2017-06-02 00:16:17 +01:00
Matthew Hodgson
6c56fa3381 Merge pull request #990 from matrix-org/kegan/translation-marmoset 
Translation fixes for everything but src/components
 2017-06-01 21:22:00 +01:00
Matthew Hodgson
8e34b59d32 Revert "Revert "add labels to language picker"" 2017-06-01 19:46:25 +01:00
Richard van der Hoff
d5bc24d9f7 Initial implementation of KeyRequestHandler, KeyShareDialog etc 2017-06-01 18:40:04 +01:00
Richard van der Hoff
b3e9716126 Revert "add labels to language picker" 2017-06-01 17:52:25 +01:00
Kegan Dougal
547f10bcbb Add translations for slash command failures 2017-06-01 15:44:56 +01:00
Matthew Hodgson
ecbc724a3f Merge pull request #988 from matrix-org/matthew/room-avatar-event 
Matthew/room avatar event
 2017-06-01 14:43:29 +01:00
Matthew Hodgson
e6cf93e237 switch to imports 2017-06-01 14:42:44 +01:00
daniel tygel
b8e26ddf3d add labels to language picker 2017-06-01 09:48:36 -03:00
Matthew Hodgson
00750b4686 quick and dirty RoomAvatarEvent 2017-06-01 13:31:24 +01:00
Matthew Hodgson
d689d4e1fa quick and dirty RoomAvatarEvent 2017-06-01 13:31:15 +01:00
Luke Barnard
dd48b3f055 Add comment 2017-06-01 10:08:02 +01:00
Matthew Hodgson
3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
turt2live
165dfeccb9 Fix rare case where presence duration is undefined & i18n 2017-05-31 11:56:04 -06:00
Richard van der Hoff
cbbed3f544 Fixes to i18n code 2017-05-31 18:31:10 +01:00
Luke Barnard
8192374481 Add missing _t import 2017-05-31 16:02:42 +01:00
Richard Lewis
dac154f828 Add full width widgets 2017-05-31 10:08:39 +01:00
daniel tygel
f4e5039e70 add string to translate 2017-05-30 19:01:23 -03:00
daniel tygel
12f923bc81 add new string to translate 2017-05-30 18:56:52 -03:00
Matthew Hodgson
e30e45a82c Merge branch 'develop' into new-guest-access 2017-05-30 21:05:07 +01:00
Matthew Hodgson
48a2ad93da fix {integrationsUrl} thinko 2017-05-30 20:32:12 +01:00
Richard Lewis
ae1753bce6 Add tipping widgets 2017-05-30 18:39:51 +01:00
Luke Barnard
40154df930 Show People/Rooms emptySubListTip even when total rooms !== 0 2017-05-30 16:14:27 +01:00
Luke Barnard
6f8d5b1db3 Remove spurious reference to otherTagNames 2017-05-30 16:10:19 +01:00
Matthew Hodgson
93a35dc07a Merge branch 'develop' into t3chguy/piwik 2017-05-30 15:58:55 +01:00
Richard Lewis
0d7e3a15f7 Add room config 2017-05-30 15:32:53 +01:00
Marcel
70e7d81093 More i18n strings (#963) 
* Add i18n for E2E import and Export Dialogs

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add various previous missing i18n strings

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Translate CreateRoomButton

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ChatInviteDialog and fix missing to.

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ConfitmRedactDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeactivateAccountDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SessionRestoreErrorDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SetDisplayNameDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownDeviceDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AddressTile translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyButtons translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add Dropdown translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UserSelector translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CaptchaForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CasLogin translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CustomServerDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add InteractiveAuthEntryComponents translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add LoginFooter translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add RegistrationForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ServerConfig translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MAudioBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MImageBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MVideoBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add TextualBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UrlPreviewSettings translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AuxPanel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add PresenceLabel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* fix syntax error

* weird space :P

* missing ','

* fix missing value

* fix json fail

* remove acidential added file

* fix another json fail
 2017-05-30 15:09:57 +01:00
Richard Lewis
0e7bb6791f Static widget config per room 2017-05-30 13:47:17 +01:00
Luke Barnard
47bf5401fa Use KeyCode.ENTER instead of 13 2017-05-30 13:14:14 +01:00
Luke Barnard
952651c685 Allow pressing Enter to submit setMxId 2017-05-30 13:02:35 +01:00
Luke Barnard
4e4c670458 Improve ChatInviteDialog perf by ditching fuse, using indexOf and lastActiveTs() 2017-05-30 12:34:19 +01:00
Richard Lewis
143f68ec56 Add locally hosted recepie widget 2017-05-30 11:40:29 +01:00
Richard Lewis
ec03cf4de3 disable iframe sandboxing. Remove BBC news iframe 2017-05-30 10:46:51 +01:00
Michael Telatynski
b65e4960a5 move Dialog analytics to Modal controller 
mark title as required, it sorta is, why isn't this based on BaseDialog?

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 17:39:03 +01:00
Michael Telatynski
42e20c38f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-29 15:23:05 +01:00
Matthew Hodgson
df599890c5 add login link to SetMxIdDialog 2017-05-29 01:32:31 +01:00
Matthew Hodgson
1efc5c2b25 speed up SetMxIdDialog user check to 250ms as it was driving me MAD 
i18nize new bottomleftmenu buttons
 2017-05-28 23:28:40 +01:00
Matthew Hodgson
5c885922d9 Merge branch 'develop' into new-guest-access 2017-05-28 22:58:18 +01:00
Travis Ralston
1b6685c5da Merge branch 'develop' into travis/redact-to-remove 2017-05-28 17:45:32 -04:00
Michael Telatynski
b55503e67f i18n the forwarding aux panel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:27:57 +01:00
Michael Telatynski
fb3187b58e change event wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:26:33 +01:00
Michael Telatynski
0a1b361141 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-28 13:21:33 +01:00
Matthew Hodgson
accc17a39a Merge pull request #812 from t3chguy/forward_message 
Message Forwarding
 2017-05-28 02:37:31 +01:00
Michael Telatynski
45cd80dedb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-27 20:59:35 +01:00
Michael Telatynski
98c2f9201b initial piwik stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 20:47:09 +01:00
Matthew Hodgson
3302fc690f fix all missing translations picked up by check-i18n.pl 2017-05-27 18:20:44 +01:00
Matthew Hodgson
957aa0403d fix https://github.com/vector-im/riot-web/issues/4052 2017-05-27 16:03:07 +01:00
Matthew Hodgson
81704a5b5e s/username/User name/ 2017-05-27 00:13:16 +01:00
David Baker
647c1b6169 Once more, with braces 2017-05-26 18:19:32 +01:00
David Baker
97aeb57a8b Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 18:15:32 +01:00
Luke Barnard
276d3cad9c Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix 
Remove suffix and prefix from login input username
 2017-05-26 18:07:10 +01:00
David Baker
62ffe929e4 Translate Add Threepid labels 2017-05-26 18:03:24 +01:00
David Baker
c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30:02 +01:00
Matthew Hodgson
fde553a809 Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp 
Kierangould/12hourtimestamp
 2017-05-26 16:52:09 +01:00
Luke Barnard
28094a9a66 Show "Something went wrong!" when errcode undefined 2017-05-26 13:13:57 +01:00
David Baker
e44f3cc709 Fix tests 
* Serve translation files from the karma server
 * Port UserSettingsStore to ES6 exports because the test runner
   gets confused by ES6 importing a commonjs module
 * Remove extra spaces in translations strings for MELS
 * Fix 'his/her' back to be 'their'
 * Change test to expect singular 'invitation' for a single person
   (there may be multiple invitations, but IMO this should be
   'rejected n invitations' and we can play with the wording later,
   I don't think the singular is any worse than the plural).
 * set language in the MELS tests (and wait for it to complete)
 * Don't bother setting lang in other tests for now
 2017-05-26 11:58:45 +01:00
David Baker
2d6bf5fa91 Remove messages with HTML formatting 
The translations strings are not HTML and it gets escaped.
 2017-05-25 20:04:28 +01:00
David Baker
6c41be3c14 Missed OKs 2017-05-25 18:23:15 +01:00
David Baker
443ab1add7 Put back default strings on dialogs 
But make them work by calling _t in render rather than
getDefaultProps().

Also sort out some 'Warning!' strings
 2017-05-25 18:20:48 +01:00
Luke Barnard
11799b4c71 Show "Password" instead of "New Password" when the existing password has been cached 2017-05-25 15:27:54 +01:00
Luke Barnard
0707b7440a Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access 2017-05-25 15:20:22 +01:00
Luke Barnard
ce17df0883 Unbreak the roomlist 2017-05-25 15:20:02 +01:00
Luke Barnard
2265b59287 Remove warm-fuzzy after setting mxid 2017-05-25 14:54:28 +01:00
Luke Barnard
7900bf1c7d Don't show "Drop to ..." if total rooms = 0 2017-05-25 13:55:37 +01:00
Luke Barnard
3185d3ed41 Re-add bouncing/callout animation to action buttons 2017-05-25 13:54:59 +01:00
David Baker
548f319816 Remove redundant role elements 2017-05-25 12:09:08 +01:00
David Baker
5e855e6fee Size is a string, import react 
React gets put in by the JSX transpile
 2017-05-25 12:09:01 +01:00
David Baker
9337158a47 Separate classes for the different buttons 
Also rename RoleButton to ActionButton because it's not being
given a Role any more.

Conflicts:
	src/component-index.js

cherry-picking commit 4a5821e.
 2017-05-25 12:08:42 +01:00
David Baker
dc2274df54 Hide empty tips if collapsed 2017-05-25 12:05:06 +01:00
David Baker
3d3d89202e Year 2017-05-25 12:04:36 +01:00
David Baker
a996f52ea3 Make bottom left menu buttons use RoleButton too 2017-05-25 12:04:22 +01:00
David Baker
54af06e8e1 What year is it? Who's the president? 2017-05-25 12:04:14 +01:00
David Baker
9fa6e8b1e2 Add us to copyright 
As I've now added code to this file
 2017-05-25 12:02:05 +01:00
David Baker
bff0577cb6 Add buttons to room sub list headers 
Conflicts:
	src/component-index.js
	src/components/views/rooms/RoomList.js

cherry-picking commit ce119a6.
 2017-05-25 11:49:45 +01:00
David Baker
d6d9a89453 Other empty sections no longer need to be greyed 2017-05-25 11:47:21 +01:00
David Baker
5c359e63ab Bulk change counterpart imports 
to use languageHandler wrapper func
 2017-05-25 11:39:08 +01:00
David Baker
5531f27435 Make the left panel more friendly to new users 
https://github.com/vector-im/riot-web/issues/3609

Conflicts:
	src/components/views/rooms/RoomList.js

cherry-picking commit f5f35e3.
 2017-05-25 11:24:45 +01:00
Luke Barnard
298c5e4df3 Implement a store for RoomView 
This allows for a truely flux-y way of storing the currently viewed room, making some callbacks (like onRoomIdResolved) redundant and making sure that the currently viewed room (ID) is only stored in one place as opposed to the previous many places.

This was required for the `join_room` action which can be dispatched to join the currently viewed room.

Another change was to introduce `LifeCycleStore` which is a start at encorporating state related to the lifecycle of the app into a flux store. Currently it only contains an action which will be dispatched when the sync state has become PREPARED. This was necessary to do a deferred dispatch of `join_room` following the registration of a PWLU (PassWord-Less User).

The following actions are introduced:
 - RoomViewStore:
    - `view_room`: dispatch to change the currently viewed room ID
    - `join_room`: dispatch to join the currently viewed room
 - LifecycleStore:
    - `do_after_sync_prepared`: dispatch to store an action which will be dispatched when `sync_state` is dispatched with `state = 'PREPARED'`
 - MatrixChat:
    - `sync_state`: dispatched when the sync state changes. Ideally there'd be a SyncStateStore that emitted an `update` upon receiving this, but for now the `LifecycleStore` will listen for `sync_state` directly.
 2017-05-24 16:56:13 +01:00
David Baker
c2df23395d Fix up language dropdown 
* Read languages from the available ones rather than the config
 * Make the search work (add searchEnabled=true)
 * Move variables to the class since they were populated there
 2017-05-24 11:25:06 +01:00
David Baker
a95f3252b8 s/tabs/spaces/ 2017-05-24 10:48:10 +01:00
David Baker
f412552c2c Fix imports/exports 2017-05-23 18:32:45 +01:00
David Baker
cc0924f1c7 Fix imports 2017-05-23 18:16:02 +01:00
David Baker
d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
David Baker
6d30bc7182 Merge pull request #911 from matrix-org/t3chguy/autofocus_directorysearchbox 
autoFocus input box
 2017-05-23 09:57:20 +01:00
Richard Lewis
b111579aed App tile events 2017-05-22 18:00:17 +01:00
Luke Barnard
05aaa599cc Merge branch 'develop' into new-guest-access 
Conflicts:
	src/components/structures/MatrixChat.js
 2017-05-22 16:19:10 +01:00
Luke Barnard
a1f10ff46d Add prop to toggle whether new password input is autoFocused 2017-05-22 14:46:49 +01:00
Richard Lewis
e8837d28ef App tile and app dialog styling 2017-05-22 12:34:27 +01:00
Richard van der Hoff
fc08dc33c6 Group e2e keys into blocks of 4 characters 
Hopefully this will make them a bit easier to compare.
 2017-05-22 12:01:09 +01:00
Richard van der Hoff
574b820d11 Factor out DeviceVerifyDialog 2017-05-22 11:12:36 +01:00
Michael Telatynski
02a1c1868c autoFocus input box 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-20 00:08:53 +01:00
Kieran Gould
47e5e8d678 Moved isTwelveHour alllll the way up to TimelinePanel. 2017-05-19 23:04:37 +01:00
Kieran Gould
6b32975e0c Add 12 hour class to mx_EventTile 2017-05-19 22:36:13 +01:00
Maxwell Kepler
008cc95e9c Add 12 hour support 2017-05-19 22:29:49 +01:00
Luke Barnard
2bec44a517 Remove suffix and prefix from login input username 
This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
 2017-05-19 10:03:51 +01:00
Luke Barnard
96c3bf56f8 Implement warm-fuzzy success dialog for SetMxIdDialog 2017-05-19 09:43:56 +01:00
Michael Telatynski
cc7edbf86d allow for sending arbitrary events, also override highlight with 
event currently being forwarded while forwardingEvent is set

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:29:11 +01:00
Michael Telatynski
475646a2a7 Change wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:34:35 +01:00
Michael Telatynski
a2ab36f598 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:33:36 +01:00
Michael Telatynski
bf0fe63759 don't know why I'm even tracking mounted state. Never refd 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:51 +01:00
Michael Telatynski
0e7e4d8595 replace weird sidebar snapping with better ui_opacity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:32 +01:00
David Baker
3e7a31ac75 Revert "fix scroll behaviour on macs with no gemini" 
This reverts commit 1347d9fa65.
 2017-05-18 19:03:51 +01:00
David Baker
726cd60127 Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode 
Prevent an exception getting scroll node
 2017-05-18 17:56:29 +01:00
David Baker
8fe3fa9178 Remove debug logging 2017-05-18 17:35:22 +01:00
David Baker
01955146e9 Prevent an exception getting scroll node 
Don't try to findDOMNode before we're mounted as it makes react
angry.
 2017-05-18 17:33:32 +01:00
Luke Barnard
32818aff4f Simplify expression 2017-05-18 17:08:26 +01:00
Luke Barnard
ee64f4a8dd Add country prefix to country dd options 2017-05-18 17:02:19 +01:00
Luke Barnard
384f50609d Allow searching by partial prefix (/w or /wo '+') 2017-05-18 17:01:40 +01:00
Luke Barnard
a425909b76 Get rid of react key warning when no results 2017-05-18 17:01:01 +01:00
Luke Barnard
f99fa3ac1a Fixed pressing space or clicking dd input closes dd 2017-05-18 16:58:57 +01:00
Luke Barnard
2350277d29 Add left_aligned class to CountryDropdown 
This indiciates that the dd chevron should be on the left
 2017-05-18 14:03:02 +01:00
Luke Barnard
2ebd9b6290 Merge pull request #899 from matrix-org/luke/improve-country-dd-3 
Swap to new flag files (which are stored as GB.png)
 2017-05-18 13:37:28 +01:00
Luke Barnard
c991b52d2c Swap to new flag files (which are stored as GB.png) 
Requires https://github.com/vector-im/riot-web/pull/3953
 2017-05-18 11:45:23 +01:00
Richard Lewis
0e5657333f Add app drawer and app dialog 2017-05-17 23:21:02 +01:00
Richard Lewis
7e1de2ac35 Show/hide apps panel and misc formatting and lint fixes 2017-05-17 21:15:57 +01:00
Luke Barnard
c44d7b6c44 Improve phone number country dropdown for registration and login 
This implements https://github.com/vector-im/riot-web/issues/3895
 2017-05-17 13:09:32 +01:00
Richard Lewis
95988bd5ec Dispatch show hide app drawer events 2017-05-17 12:35:25 +01:00
Richard Lewis
9dd0b9bdd1 Fix lint errrors / warnings 2017-05-17 11:31:01 +01:00
Richard Lewis
e22712514e Add show / hide apps button 2017-05-17 10:58:59 +01:00
David Baker
8ce6da1b16 Merge branch 'new_release_process_stable' into develop 
This reverts all PRs currently marked notready, changing develop into
a branch that should be more stable.
 2017-05-17 10:38:09 +01:00
Richard van der Hoff
8695397abb Support for pasting files into normal composer 
We don't seem to be in any danger of getting a working RTE any time soon, so
implement file pasting in the normal composer too.
 2017-05-17 01:43:13 +01:00
David Baker
ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" 
This reverts commit 0ad1d8caf3, reversing
changes made to 1189368aab.
 2017-05-16 16:11:01 +01:00
David Baker
67c6a8b81d Revert "unbreak stack overflow which fires on tests due to mocked timers" 
This reverts commit e69ea68133.
 2017-05-16 16:02:13 +01:00
David Baker
eddc2af92d Revert "HOW DID THIS EVER WORK?" 
This reverts commit 0d8d3c6710.
 2017-05-16 16:01:54 +01:00
David Baker
7a949b6a45 Revert "oops, actually refresh roomlist when its state changes!" 
This reverts commit 35a16edccc.
 2017-05-16 16:01:32 +01:00
David Baker
b063c605a8 Revert "fix stupid typos in RoomList's shouldComponentUpdate" 
This reverts commit b0288ebd89.
 2017-05-16 16:01:14 +01:00
David Baker
714cd6a10f Revert "recalculate roomlist when your invites change" 
This reverts commit ec6a1c4c75.
 2017-05-16 16:00:34 +01:00
David Baker
ff9c40472a Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus" 
This reverts commit 0ac836919d, reversing
changes made to 7e07ffd55f.
 2017-05-16 14:50:29 +01:00
David Baker
19dcd83aeb Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs" 
This reverts commit 1913a32fbd, reversing
changes made to 0c16298c45.
 2017-05-16 14:50:19 +01:00
David Baker
387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" 
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
 2017-05-16 14:49:55 +01:00
David Baker
d06bd3cf9d Revert "Fix Create Room button" 
This reverts commit 9cae667c06.
 2017-05-16 14:30:02 +01:00
David Baker
f8d1a6d240 Revert "Fix 'start chat' button" 
This reverts commit c841eb641b.
 2017-05-16 14:26:46 +01:00
Luke Barnard
2c5fb01f03 Fix bugs introduced by dodgy merge 2017-05-16 14:13:22 +01:00
David Baker
6bd7af2917 Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1" 
This reverts commit 3549ff2543, reversing
changes made to 1db677141e.
 2017-05-16 14:00:09 +01:00
Luke Barnard
66985e6d08 Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd 2017-05-16 13:59:54 +01:00
Luke Barnard
5a3c32044e disableConfirmation -> confirm 2017-05-16 12:45:14 +01:00
Luke Barnard
c6350379dc Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password 
Remove "Current Password" input if mx_pass exists
 2017-05-16 12:29:23 +01:00
Luke Barnard
eb36e979c2 Reference store token, call .remove on it on unmount 2017-05-16 11:52:51 +01:00
Luke Barnard
f7e6a996c5 Add proptype 2017-05-16 11:51:09 +01:00
Luke Barnard
93ecdc90a9 Make confirmation optional on ChangePassword 
Add option to disable password change confirmation (`disabledConfirmation`). Style fixes, use `<button>` element on ChangePassword submit button.
 2017-05-16 11:45:01 +01:00
Luke Barnard
f199f3599e Replace NeedToRegisterDialog /w SetMxIdDialog 
This uses MatrixChat's `view_set_mxid`
 2017-05-15 17:31:26 +01:00
Luke Barnard
269fd51130 Remove SessionStore listener on unmount 2017-05-15 17:17:32 +01:00
Luke Barnard
da3cb0ee48 SessionStore extends flux.Store 2017-05-15 14:52:19 +01:00
Matthew Hodgson
317e24852d explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531 2017-05-15 03:03:17 +01:00
Matthew Hodgson
486301cffb remove dodgy heuristics for hiding dates on RRs and use DateUtils instead. 
reverts 5d99d68a64
fixes https://github.com/vector-im/riot-web/issues/3523
 2017-05-15 02:55:07 +01:00
Matthew Hodgson
6879f7ee6f add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720 2017-05-15 02:43:23 +01:00
Matthew Hodgson
82092dc2d8 onClick MELS avatars = expand MELS; fixes https://github.com/vector-im/riot-web/issues/3899 2017-05-15 02:15:00 +01:00
Matthew Hodgson
7f78e737eb Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing 
various fixes to RoomHeader
 2017-05-15 01:52:42 +01:00
Matthew Hodgson
24d09d8f5b Merge pull request #885 from matrix-org/t3chguy/rte_emote_weirdness 
remove /me whether or not it has a space after it
 2017-05-15 01:50:53 +01:00
Matthew Hodgson
48864b0880 fix visibility of topbar close on dark theme, fixing https://github.com/vector-im/riot-web/issues/3783 2017-05-15 01:39:57 +01:00
Matthew Hodgson
c5f2b69e48 add alt attributes to e2e icons on msgs; fixes https://github.com/vector-im/riot-web/issues/3786 2017-05-15 01:37:24 +01:00
Michael Telatynski
d7c88a9813 only removed /me , remove anyway to fix vector-im/riot-web#3733 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 15:20:31 +01:00
Michael Telatynski
60b13d76a5 conform to Luke's other comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:20:56 +01:00
Michael Telatynski
822f2f10f2 conform to Luke's comment 
https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:16:55 +01:00
Michael Telatynski
69d860e982 revert name overengineering, undefined onClick should be fine on div 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:06:36 +01:00
Luke Barnard
536724e7c5 ES6 SessionStore 2017-05-12 15:58:44 +01:00
Luke Barnard
1176573f39 Implement SessionStore 
This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)
 2017-05-12 12:02:45 +01:00
Luke Barnard
8725ef3863 Remove "Current Password" input if mx_pass exists 
If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.
 2017-05-11 17:47:45 +01:00
Michael Telatynski
5e4467adce hide settings/search appropriately 
pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE

if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:35:06 +01:00
Michael Telatynski
f55b27f432 looks like it is passed and accessed like a string 
so unless I'm going insane, it should be a string.

fixes
```
rageshake.js:61 Warning: Failed prop type: The prop `onClick` is marked as required in `AccessibleButton`, but its value is `undefined`.
    in AccessibleButton (created by RoomHeader)
    in RoomHeader (created by RoomView)
    in div (created by RoomView)
    in RoomView (created by LoggedInView)
    in main (created by LoggedInView)
    in div (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in MatrixChat
```

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:32:23 +01:00
Luke Barnard
5151264f60 Merge branch 'develop' into new-guest-access 
Conflicts:
	src/component-index.js
 2017-05-11 13:22:30 +01:00
Michael Telatynski
50092a0f1f fixes vector-im/riot-web#3881 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 15:16:49 +01:00
Luke Barnard
6257bfcd87 Add prop type for onDifferentServerClicked 2017-05-10 14:28:48 +01:00
Luke Barnard
ad2ed12980 Redesign mxID chooser, add availability checking 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/432 for availability checking.

Changes:
 - Redesign the dialog to look more like https://github.com/vector-im/riot-web/issues/3604#issuecomment-299226875
 - Attempt to fix wrong password being stored by generating one per SetMxIdDialog (there's no issue tracking this for now, I shall open one if it persists)
 - Backwards compatible with servers that don't support register/availability - a spinner will appear the first time a username is checked because server support can only be determined after a request.
 - Rate-limited by a 2s debounce
 - General style improvements
 2017-05-10 14:22:17 +01:00
Luke Barnard
3549ff2543 Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1 
Fixes 2 issues with Dialog closing
 2017-05-09 11:36:35 +01:00
Michael Telatynski
f02e659fb7 Consume key{up,down,pressed} events 
so they don't trigger other things bubbling up
until Modal is closed
 2017-05-09 11:27:06 +01:00
Luke Barnard
f5a23c14df Remove redundant bind 2017-05-08 17:32:26 +01:00
Luke Barnard
fe121126f5 Merge branch 'develop' into rte-fixes 
Conflicts:
	src/UserSettingsStore.js
	src/autocomplete/EmojiProvider.js
	src/components/views/rooms/MessageComposerInput.js
 2017-05-08 17:08:59 +01:00
David Baker
c01e8e85ac Merge pull request #872 from matrix-org/dbkr/fix_left_panel 
Fix this/self fail in LeftPanel
 2017-05-08 16:40:17 +01:00