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

2106 commits

Author SHA1 Message Date
Luke Barnard
897ff05d87 Implement composer completion user/room pill insertion 
This modifies the composer completion such that completing a room or user will insert an IMMUTABLE matrix.to LINK Entity for the range that was replaced. Display names will not have a colon after their name anymore as it seemed strange that we would insert one after a pill.
 2017-07-17 15:53:29 +01:00
Luke Barnard
b1e3dc406c Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill 
Requires https://github.com/vector-im/riot-web/pull/4597 to look OK
 2017-07-17 14:50:45 +01:00
Richard Lewis
6aa0f68ee9 Show beta testing icon and help message for widgets tile. 2017-07-14 23:31:57 +01:00
Luke Barnard
ee5117525c Merge pull request #1225 from matrix-org/luke/feature-rte-pills 
Decorate http://matrix.to links in the composer as pills
 2017-07-14 17:47:16 +01:00
Luke Barnard
434660166c Decorate http://matrix.to links in the composer as pills 
Any links in the composer that are recognised as matrix.to links will be decorated as `<span>`s with CSS classes (one of mx_UserPill or mx_RoomPill). This implementation has the nice bonus that switching to markdown (and back) will Just Work.

This will have some CSS changes coming to better match the design.
 2017-07-14 17:04:28 +01:00
Richard van der Hoff
2a52c902e2 Merge pull request #1223 from matrix-org/rav/roomsettings_promise_usage 
Fix RoomSettings save
 2017-07-14 14:47:14 +01:00
Richard van der Hoff
9df1fb91ff Fix RoomSettings save 
Looks like saving RoomSettings had been broken since 0d7cc59. `isFulfilled`
cannot be used as a static function.
 2017-07-14 14:24:42 +01:00
Kegsay
5274cf59a0 Hook up the edit widget button (#1218) 
* Hook up the edit widget button

* Review comments
 2017-07-14 11:17:59 +01:00
Luke Barnard
219c00bbc3 Add code-block to the list of blocks where hitting return will split-block 
Hitting return in a code-block will now split the block into two code blocks. (Holding shift will still insert a soft newline into the current block).

We still need to make it a bit more obvious that consecutive code-blocks
are not contiguous - https://github.com/vector-im/riot-web/issues/4535
 2017-07-13 18:42:37 +01:00
Luke Barnard
d97de4d576 Implement disabled-by-default setting for auto-replacement of plaintext emojis 
FTR a list of plaintexts and their unicode equivalents can be found here - https://github.com/vector-im/riot-web/issues/4554#issuecomment-314374303

Pressing space after a matching emoji will replace the plaintext emoji with the equivalent unicode emoji.
 2017-07-13 17:37:43 +01:00
Luke Barnard
7fc10789fc Merge pull request #1217 from matrix-org/luke/fix-rte-html-links 
Improve RTE HTML link handling
 2017-07-13 13:57:58 +01:00
Luke Barnard
f1a4209d6b Fix indentation 2017-07-13 13:47:08 +01:00
Luke Barnard
5826b6f22a Instead of sending HTML for any Entity, only send HTML for Links 
Otherwise emoji messages are sent as HTML, needlessly
 2017-07-13 13:41:17 +01:00
Luke Barnard
be045a6dc0 Interpret whitespace after entity as the end of the entity 
The easiest way to stop the user from inserting whitespace onto the end of an entity is to toggle the entity state of the whitespace that was just entered. This allows the user to continue drafting a message without editing the link content.

This is for pasted `<a>` tags that have been copied from a website. We probably also want to be storing entities for substrings of content that are determined to be URLs.
 2017-07-13 13:28:51 +01:00
Luke Barnard
4b96963408 Send HTML if there are any entities present in the composer 
This is so that pasted HTML links that are represented as entities are sent as HTML.
 2017-07-13 13:27:49 +01:00
Luke Barnard
55e1202c09 Decorate pasted links so that they look like links 
By default, draftjs will represent pasted `<a>` tags as `LINK` entities, but it doesn't do any default decoration of these links. Add a decorator to do so.

Most of this was taken from https://github.com/facebook/draft-js/blob/v0.8.1/examples/link/link.html (note the version, v0.8.1).
 2017-07-13 13:26:13 +01:00
David Baker
2a68cce3d5 Merge pull request #1216 from matrix-org/dbkr/history_save_unload_nullcheck 
Prevent exception on page unload
 2017-07-13 12:38:28 +01:00
Richard van der Hoff
086304532e Merge pull request #1213 from matrix-org/rav/bluebird 
Switch matrix-react-sdk to bluebird
 2017-07-13 12:06:11 +01:00
David Baker
917133219f Remove sentHistory save altogether 2017-07-13 11:53:22 +01:00
David Baker
1e80edb43c Prevent exception on page unload 
Null check when saving sent history
 2017-07-13 11:30:25 +01:00
Luke Barnard
04dd98e6e9 Remove references to tabComplete, which are now redundant 
(since the old composer has been removed)
 2017-07-13 10:16:59 +01:00
Luke Barnard
0e12e384cb Remove TabComplete-related files 2017-07-13 10:16:42 +01:00
Richard Lewis
9a1e7ad170 Hide widget panel while it is being deleted. 2017-07-13 00:27:03 +01:00
Richard van der Hoff
33f330d434 Manual fixup for remaining q incantaions 
* don't try to use `finally` as a static method
* work around absence of `allSettled`
 2017-07-12 18:05:40 +01:00
Richard van der Hoff
0d7cc59d99 replace q method calls with bluebird ones 
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
 2017-07-12 18:05:40 +01:00
Richard van der Hoff
0254d2b3a2 q(...) -> Promise.resolve 
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
 2017-07-12 18:05:08 +01:00
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