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
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
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
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
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
3e93930dcc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-07-06 11:18:10 +01:00
6b6af3f148
Remove RTE content_state logging
2017-07-06 11:17:54 +01:00
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
4f8d9d869e
mention preserving ordering in comment
2017-07-06 10:47:15 +01:00
42ba3ff410
Linting
2017-07-06 10:44:32 +01:00
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
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
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
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
14ddf4e2aa
Merge pull request #1187 from matrix-org/luke/fix-rte-emoji-filter-supported
...
Filter out unsupported emoji from the emoji meta data
2017-07-05 18:21:50 +01:00
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
89d0ec4de8
Merge pull request #1179 from matrix-org/luke/fix-query-matcher-empty-query
...
Don't try to match with an empty query string
2017-07-05 18:20:25 +01:00
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
2de4dd7b71
Filter out unsupported emoji from the emoji meta data
...
Because apparently emojione provides meta data for more than the emojis it supports itself.
Fixes https://github.com/vector-im/riot-web/issues/4504
2017-07-05 17:09:16 +01:00
a20ed2f632
Add some logging to track down flaky test
...
We had a test failure where apparently the MatrixClient failed to start
... let's try and figure out why.
2017-07-05 16:20:21 +01:00
b3db6344ae
Fix import for Rooms so that DMs can be created
2017-07-05 15:00:50 +01:00
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
df23a6cd85
Use Object.assign to set initial state of MessageComposerStore
...
Otherwise we just modify the initial state when running
2017-07-05 13:38:34 +01:00
3d5b3ed7ad
Use ContentState instead and persist over localStorage
2017-07-05 11:49:34 +01:00
3b06db0725
Pass with, height & resizeMethod through
...
Was spelt wrong anyway
2017-07-05 11:39:22 +01:00
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
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
710ee69418
Don't try to match with an empty query string
...
This was causing UserProvider to give results because every string happens to start with empty string and its regex also acepts the empty string.
2017-07-04 17:32:07 +01:00
0af77e8913
Merge pull request #1177 from matrix-org/luke/fix-rte-prefix-matching
...
Only match users by matchgin displayname or user ID prefixes
2017-07-04 17:09:39 +01:00
2861adc830
Only truncate autocomplete pulls of Emoji, Room and UserProvider
...
Leaving Commands and DuckDuckGo not truncated
2017-07-04 16:50:50 +01:00
6a80875c01
Only match users by matchgin displayname or user ID prefixes
...
Because tab completing "k" probably shouldn't give you "luke"
Fixes https://github.com/vector-im/riot-web/issues/4495
2017-07-04 16:29:06 +01:00
77348e6201
Remove spurious, unused code
2017-07-04 15:20:00 +01:00
e6ec5742be
_t should be used on string literals
...
For scripts to easily find translations
2017-07-04 15:06:24 +01:00
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
e688eca823
Improve the sorting applied to the sorting of autocomplete results
...
QueryMatcher: sort results based on the position of the query within the matching value. The closer to the beginning of the word, the higher the result apears.
UserProvider: perf improvement (slice early) and refactor onUserSpoke
2017-07-04 13:53:06 +01:00
fb86534ba3
Merge pull request #1171 from matrix-org/t3chguy/delintify
...
De-Lint 23 files
2017-07-04 10:40:49 +01:00
c84d707124
Merge pull request #1169 from matrix-org/t3chguy/add-missing-autocomplete-commands
...
add missing commands to the Autocomplete CommandProvider
2017-07-04 10:32:29 +01:00
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
fc379e2a15
fix typos post-luke-review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-03 19:24:18 +01:00
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
827c38d4a5
fix variable clash
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-03 19:13:07 +01:00
b8dacd3bb1
Merge pull request #1165 from turt2live/travis/pad-12h
...
Don't pad 12h timestamps
2017-07-03 16:43:23 +01:00
45559f7cf0
AM/PM strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-07-03 09:25:03 -06:00
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
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
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
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
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
9ef83b8dc0
de-lint views/voip/*
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:58:46 +01:00
661a0f3956
de-lint Resend, RoomListSorter, UserActivity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:50:22 +01:00
8bf13f8f48
de-lint email, extend
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:43:18 +01:00
f514f1ff74
de-lint DateUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:42:12 +01:00
b937957609
de-lint createRoom
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:40:46 +01:00
7da14d7078
de-lint ObjectUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:38:32 +01:00
68fb11d2bf
de-lint LifecycleStore
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:35:40 +01:00
a270c85295
de-lint Entities
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:34:20 +01:00
fdd8df87b0
de-lint PasswordReset
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:31:59 +01:00
b98c105dcc
de-lint Skinner, RoomNotifs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:28:12 +01:00
b8ad0957b2
de-lint AddThreepid
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:21:28 +01:00
09ae6bba07
de-lint BasePlatform
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:15:26 +01:00
e56203f2a1
de-lint RoomHeader, Avatar, SdkConfig, SlashCommands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 14:13:32 +01:00
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
fb61a5d68b
post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 13:08:23 +01:00
09f017fdd2
Merge branches 'develop' and 't3chguy/add-missing-autocomplete-commands' of github.com:matrix-org/matrix-react-sdk into t3chguy/add-missing-autocomplete-commands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/autocomplete/CommandProvider.js
# src/i18n/strings/en_EN.json
2017-07-01 13:07:18 +01:00
9dba628f10
add missing commands to the Autocomplete CommandProvider
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-01 12:55:43 +01:00
b315ed630e
Match by emoji ascii regex first before shorthand
...
Plaintext emojis that start with ":" will also match against the shorthand regex but the match won't include the important part of the plaintext emoji. This means some emoji like ":)" won't be matched.
To fix this, put the ascii emoji regex first so that the match will be plaintext or otherwise it will fall through to the shorthand match (if there is one).
Fixes https://github.com/vector-im/riot-web/issues/4467
2017-06-30 16:31:40 +01:00
e058dd58e5
Fix overzealous code deletion
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-30 09:29:40 -06:00
8468a118b5
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-06-30 16:15:41 +01:00
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
c07057d1d4
Extract props we don't want to pass to BaseAvatar
2017-06-30 16:05:19 +01:00
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
01b7d7bb7c
Don't pad 12h timestamps
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-30 08:44:56 -06:00
11309f34e3
Reference count calls to start/stopListening on ScalarMessaging ( #1164 )
...
Otherwise component mounting/unmounting can race and you end up with nothing
listening.
2017-06-30 15:42:51 +01:00
b8941f76d3
Fix bug which breaks the close button on scalar
2017-06-30 15:42:36 +01:00
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
e5c1aeb14c
Make the Groups page look more like the design
2017-06-30 13:59:49 +01:00
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
3892362386
Make my groups page a bit saner
2017-06-29 18:30:16 +01:00
84e13d5437
Add GroupAvatar to handle fallback images etc.
...
And a few misc tidyups
2017-06-29 17:51:38 +01:00
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
d6ecec1987
Behave better on rooms with no avatar / name
...
Also add translation strings
2017-06-29 17:17:43 +01:00
f99c540b3d
Groups page / Create Group dialog
2017-06-29 17:03:05 +01:00
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
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
982b009b90
Implement ascii emoji tab completion
...
When a fully plaintext, ascii emoji is typed like ";-)", pressing tab will suggest emojione to replace it with based off of the meta data provided by emojione.
e.g. the aliases_ascii for `😃 ` are [":D",":-D","=D"] so typing ":D *tab*" will insert a real 😃
2017-06-29 11:29:55 +01:00
8912400675
Add XXX for https://github.com/vector-im/riot-web/issues/4445
2017-06-28 18:05:39 +01:00
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
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
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
d61525e420
Merge pull request #1152 from matrix-org/rxl881/apps
...
Add support for apps
2017-06-28 16:06:20 +01:00
ea83d7eee2
Add missing import and fix apps reference.
2017-06-28 15:53:18 +01:00
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
bcb67bb273
Refactor shared code between `onUpArrow` and `onDownArrow`
2017-06-28 15:20:16 +01:00
b3eee0c007
Merge pull request #1153 from matrix-org/luke/fix-rte-pre-extra-nls
...
Work around draft-js-export-html#62 by post-processing <br>\n
2017-06-28 15:13:39 +01:00
9b24f70d00
Update comment
2017-06-28 14:29:53 +01:00
eeb1c33868
Do the less invasive fix of replacing `<br>\n` with `\n` but only within `<pre>`
2017-06-28 14:27:24 +01:00
a2ff289ed8
Add 'groups' page
2017-06-28 13:56:18 +01:00
3a10cda2ca
Add translations.
2017-06-28 13:55:18 +01:00
f8c064ec25
REmove redundant call to _getApps
2017-06-28 13:45:29 +01:00
30f80b57f2
Instead of making this part of the build process, let the devs generate stripped-emoji.json
...
With the expectation that when the file needs to be regenerated to include other keys, the developer will run this script.
2017-06-28 13:28:48 +01:00
e70eca0b0c
Comment unused code and add TODO to handle scalar errors.
2017-06-28 12:58:09 +01:00
d06d066050
Move getInitialState to top of file.
2017-06-28 12:54:47 +01:00
e752cc8557
Use 'this' in preference to local reference.
2017-06-28 12:32:38 +01:00
481a66ef3c
Fix header.
2017-06-28 12:26:05 +01:00
93bdfc99df
i18n "Cancel" alt text.
2017-06-28 12:25:36 +01:00
ddea1f35d2
Fix header.
2017-06-28 12:23:33 +01:00
ff1636aaf5
Simplify boolean assignment.
2017-06-28 12:21:05 +01:00
06dafdc099
Remove unused state variable.
2017-06-28 12:20:07 +01:00
bf2a4afce5
Change to allow setting of DEBUG at run-time.
2017-06-28 12:02:07 +01:00
2b1d15717a
Add translation for Matrix Apps labs setting.
2017-06-28 12:00:22 +01:00
f73fa4b49b
Move processing into renamed function processHtmlforSending
...
And explain why this fix is necessary
2017-06-28 11:49:50 +01:00
2b8da85726
Strip the emoji meta-data for the data we need
...
This is done at build time by parsing emojione/emoji.json, stripping it and then writing to ./lib/stripped-emoji.json.
2017-06-28 11:36:19 +01:00
8ca3b382ed
Use emojione/emoji.json because we don't want two sets of emoji meta
2017-06-28 11:19:16 +01:00
f4db765239
Fix indentation
2017-06-28 10:32:46 +01:00
907aaebe2f
Remove redundant emoji data file
2017-06-28 10:31:59 +01:00
1523d304f2
WIP to prevent RTE from deleting current message input when up arrow pressed
2017-06-28 10:30:59 +01:00
ad2517bd8b
Uppercase the first letter of the app tile name.
2017-06-28 10:27:06 +01:00
9d339b96bd
Order emojis by standard ordering, add alternate shortnames
...
Also, increase the maximum number of emoji shown to 20.
2017-06-27 20:13:48 +01:00
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
3872f0750c
Only show apps button if labs feature enabled.
2017-06-27 17:40:28 +01:00
338a4db87f
Only show apps drawer if matrix apps labs setting ids enabled
2017-06-27 17:40:09 +01:00
8dfd047f03
Don't show widgets when editing room settings and lint fixes.
2017-06-27 17:39:29 +01:00
7a7687699b
Add matrix apps to Labs settings
2017-06-27 17:38:33 +01:00
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
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
ba31a32440
Allow toggling of dev tools when RTE focussed
2017-06-27 15:17:57 +01:00
aa7a113324
More PR feedback
2017-06-27 13:41:43 +01:00
87fac367ac
quote consistency
2017-06-27 13:37:59 +01:00
6c9716637e
Fix linting errors
2017-06-27 13:13:00 +01:00
aab4c097e6
Make query parameters generic.
2017-06-27 12:26:13 +01:00
ad9a3d9ddc
Remove unused case statement.
2017-06-27 11:55:32 +01:00
89f051e693
Fix automerge error.
2017-06-27 11:52:49 +01:00
2aeaaf26ca
remove inline css
2017-06-27 11:52:23 +01:00
ddc0da396d
Merge in changes from develop
2017-06-27 11:44:36 +01:00
63b1250385
Add comment
2017-06-27 11:39:20 +01:00
1f1352786f
Temporarily disable Jitsi default
2017-06-27 11:38:14 +01:00
18ea76b864
Removed commented code
2017-06-27 11:31:00 +01:00
e343e99355
Cleaned up unused files and removed commented code
2017-06-27 11:28:38 +01:00
971f7ad045
Fix avatars
2017-06-27 10:32:21 +01:00
867b47f4a2
PR feedback: remove phases
2017-06-27 10:28:46 +01:00
f0aaca0a31
Fix some PR feedback
2017-06-27 10:05:05 +01:00
c033d5defd
Missing React import
2017-06-27 09:58:29 +01:00
fbaa3de28b
Null-guard m.video info
...
Fixes https://github.com/vector-im/riot-web/issues/4423
2017-06-26 22:22:03 +01:00
09b1012388
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-26 17:49:06 +01:00
812b3643de
Add message for HSes that don't support groups
...
Also add an unrelated missed translation
2017-06-26 17:47:17 +01:00
a26498bc6c
Make 'group not found' work
2017-06-26 17:38:10 +01:00
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
661e6a6d01
HtmlUtils: Allow language- classes on code blocks through the sanitizer
...
This is required to be able to specify the highlight language in fenced
blocks like the following:
```python
print("foo")
```
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-06-26 17:45:38 +02:00
f9b37208a3
Merge pull request #1147 from matrix-org/matthew/stuck-unread
...
fix one major cause of stuck unread notifications
2017-06-26 14:57:25 +01:00
edae66fd3a
fix one major cause of stuck unread notifications
2017-06-26 14:28:56 +01:00
bbd85891f4
Merge pull request #1146 from matrix-org/luke/fix-rte-strikeout
...
RTE: Use <del> for strikeout
2017-06-26 11:38:04 +01:00
d4034105a4
Revert support for ~~gh strikeout~~
2017-06-26 10:10:31 +01:00
c1bceb81d2
Merge branch 'develop' into luke/fix-rte-strikeout
2017-06-26 09:41:17 +01:00
f091d209b9
Merge branch 'develop' into luke/fix-rte-tab-complete-after-join
2017-06-26 09:39:49 +01:00
caa0250d30
Merge pull request #1144 from matrix-org/rte-fixes2
...
RTE Fixes
2017-06-26 09:38:14 +01:00
3cdc7c9114
Add copyright headers
2017-06-23 18:30:16 +01:00
f0f4a16e97
Translate autocomplete delay
2017-06-23 18:28:02 +01:00
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
c0e48c72fc
Remove dep on liblevenstein
...
While we don't actually use it
2017-06-23 18:03:32 +01:00
ddb84f034e
Update tab-complete state onRoom received after joining
...
As opposed to doing it when the component mounts.
Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)
2017-06-23 17:52:50 +01:00
89afcfd897
Linting
2017-06-23 17:35:07 +01:00
2efa099de2
Use function from HTMLUtils for sanitizing
...
Encapsulates things a little nicer
2017-06-23 17:02:54 +01:00
738f261d5d
Add missing translations for RTE ops
2017-06-23 16:14:22 +01:00
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
0207f3cc02
Merge pull request #1143 from matrix-org/luke/fix-login-multiple-fields
...
Only submit phone number when phone loginType is selected
2017-06-23 14:48:52 +01:00
ec36a348be
comment why we send the empty string
2017-06-23 14:48:15 +01:00
c51255da40
Submit empty string username when on phone number login
2017-06-23 14:34:19 +01:00
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
8f3eb89f8b
Fix potential race in setting client listeners
2017-06-23 10:48:21 +01:00
75ef80ecd4
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-23 09:51:24 +01:00
ae053e88c7
fix broken vars
2017-06-22 21:59:33 +01:00
4b5deaf17f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
...
Conflicts:
src/i18n/strings/fr.json
2017-06-22 20:39:48 +00:00
cc89d8318e
Translated using Weblate (Ukrainian)
...
Currently translated at 18.3% (168 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-22 20:22:03 +00:00
7bf10760e7
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2017-06-22 20:22:03 +00:00
e5ecd168d7
Translated using Weblate (Thai)
...
Currently translated at 64.6% (592 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
2017-06-22 20:22:03 +00:00
eb76b1ae24
Translated using Weblate (Russian)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-22 20:22:03 +00:00
50a5bc6b4f
Translated using Weblate (Korean)
...
Currently translated at 91.9% (841 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-22 20:22:02 +00:00
f079e238fc
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-22 20:22:02 +00:00
81dadc9e05
Translated using Weblate (German)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-22 20:22:02 +00:00
cc53c6776d
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2017-06-22 19:53:09 +00:00
73471138f8
Merge pull request #1140 from turt2live/travis/more-12h
...
Use 12h timestamps when enabled in RR
2017-06-22 17:44:52 +01:00
ac3e039e2a
Merge pull request #1019 from matrix-org/t3chguy/updating_stuff
...
manual check for updates
2017-06-22 17:36:55 +01:00
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
042152aa66
Merge pull request #1138 from matrix-org/rav/fix_braindead_firefox
...
Fix load failure in firefox when indexedDB is disabled
2017-06-22 15:22:31 +01:00
c101459e63
Merge pull request #1139 from matrix-org/rav/fix_incorrect_log
...
Fix an incorrect console error
2017-06-22 15:21:09 +01:00
fcd945afc2
Fix an incorrect console error
...
... this error is thrown when registering as guest or loading from
localstorage, not when using tokenparams.
2017-06-22 15:08:30 +01:00
b124ac21fd
Fix load failure in firefox when indexedDB is disabled
2017-06-22 15:07:54 +01:00
3da9aaff9a
Merge pull request #1134 from matrix-org/rav/remove_dead_olm_error
...
Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE
2017-06-22 14:24:27 +01:00
5d159c995d
Merge branch 'master' into develop
2017-06-22 11:58:05 +01:00
fcc42c7b60
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (915 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-22 09:57:14 +00:00
efc5cf2889
Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE
...
We used to show a special error message when we got this error; however
https://github.com/matrix-org/matrix-react-sdk/pull/783 made that not work.
You'll only hit it if you're upgrading from some ancient version of Olm, and
I'm quite happy for us to fall back to the generic 'couldn't restore: vape your
storage?' flow in that case. (In any case that's preferable to dumping you at
the login prompt with no warning that we've just vaped your storage).
2017-06-21 21:49:41 +01:00
e9ab667d29
Use the web worker when clearing js-sdk stores
...
It turns out that Firefox doesn't let you use indexeddb from private tabs,
*unless* you are *also* in a webworker. We need to either consistently use it
or not use it - so let's use it.
2017-06-21 17:43:34 +01:00
dcd0103acb
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-21 15:08:03 +01:00
2db24f373c
Fix another race with first-sync
...
Set the first sync variables in onWillStartClient, as they race if
set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124 )
2017-06-21 15:07:43 +01:00
a62f6d1094
Make the indexeddb worker script work again
...
Removed in 939f6d0798
2017-06-21 15:07:25 +01:00
72e73c05ac
Merge pull request #1127 from matrix-org/t3chguy/reset_favicon_on_logout
...
reset page subtitle and favicon on_logged_out
2017-06-21 14:58:26 +01:00
a7ca8ae4fb
Merge pull request #1132 from matrix-org/dbkr/put_indexeddb_worker_back
...
Make the indexeddb worker script work again
2017-06-21 14:42:01 +01:00
e193fa5be5
Make the indexeddb worker script work again
...
Removed in 939f6d0798
2017-06-21 14:04:43 +01:00
0fffd367c0
Added translation using Weblate (Italian)
2017-06-21 12:55:00 +00:00
a0de81a008
Added translation using Weblate (Belarusian)
2017-06-21 12:54:31 +00:00
Michael Telatynski