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

3667 commits

Author SHA1 Message Date
Luke Barnard
32a01b54b8 Merge branch 'develop' into erikj/group_server 2017-07-07 10:08:49 +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
David Baker
e5c1aeb14c Make the Groups page look more like the design 2017-06-30 13:59:49 +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
3892362386 Make my groups page a bit saner 2017-06-29 18:30:16 +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
d6ecec1987 Behave better on rooms with no avatar / name 
Also add translation strings
 2017-06-29 17:17:43 +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
David Baker
a2ff289ed8 Add 'groups' page 2017-06-28 13:56:18 +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
Richard Lewis
ff1636aaf5 Simplify boolean assignment. 2017-06-28 12:21:05 +01:00
Richard Lewis
06dafdc099 Remove unused state variable. 2017-06-28 12:20:07 +01:00
Richard Lewis
bf2a4afce5 Change to allow setting of DEBUG at run-time. 2017-06-28 12:02:07 +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
Richard Lewis
8dfd047f03 Don't show widgets when editing room settings and lint fixes. 2017-06-27 17:39:29 +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
David Baker
aa7a113324 More PR feedback 2017-06-27 13:41:43 +01:00
David Baker
6c9716637e Fix linting errors 2017-06-27 13:13:00 +01:00
Richard Lewis
aab4c097e6 Make query parameters generic. 2017-06-27 12:26:13 +01:00
Richard Lewis
ad9a3d9ddc Remove unused case statement. 2017-06-27 11:55:32 +01:00
Richard Lewis
89f051e693 Fix automerge error. 2017-06-27 11:52:49 +01:00
David Baker
2aeaaf26ca remove inline css 2017-06-27 11:52:23 +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
David Baker
971f7ad045 Fix avatars 2017-06-27 10:32:21 +01:00
David Baker
867b47f4a2 PR feedback: remove phases 2017-06-27 10:28:46 +01:00
David Baker
f0aaca0a31 Fix some PR feedback 2017-06-27 10:05:05 +01:00
David Baker
c033d5defd Missing React import 2017-06-27 09:58:29 +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
David Baker
09b1012388 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-26 17:49:06 +01:00
David Baker
812b3643de Add message for HSes that don't support groups 
Also add an unrelated missed translation
 2017-06-26 17:47:17 +01:00
David Baker
a26498bc6c Make 'group not found' work 2017-06-26 17:38:10 +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
David Baker
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
Luke Barnard
c1bceb81d2 Merge branch 'develop' into luke/fix-rte-strikeout 2017-06-26 09:41:17 +01:00
Luke Barnard
f091d209b9 Merge branch 'develop' into luke/fix-rte-tab-complete-after-join 2017-06-26 09:39:49 +01:00
Luke Barnard
caa0250d30 Merge pull request #1144 from matrix-org/rte-fixes2 
RTE Fixes
 2017-06-26 09:38:14 +01:00
David Baker
f0f4a16e97 Translate autocomplete delay 2017-06-23 18:28:02 +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
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
Luke Barnard
89afcfd897 Linting 2017-06-23 17:35:07 +01:00
David Baker
2efa099de2 Use function from HTMLUtils for sanitizing 
Encapsulates things a little nicer
 2017-06-23 17:02:54 +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
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
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
David Baker
8f3eb89f8b Fix potential race in setting client listeners 2017-06-23 10:48:21 +01:00
David Baker
75ef80ecd4 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-23 09:51:24 +01:00
David Baker
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
David Baker
ac3e039e2a Merge pull request #1019 from matrix-org/t3chguy/updating_stuff 
manual check for updates
 2017-06-22 17:36:55 +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 van der Hoff
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
David Baker
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
David Baker
9ef9d09d44 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 11:27:18 +01:00
Michael Telatynski
a2a26a9ac9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 2017-06-20 18:43:50 +01:00
Matthew Hodgson
d441ba1fd0 Merge pull request #1129 from matrix-org/luke/fix-logout 
Don't allow UserSettings to render if !MatrixClientPeg.get()
 2017-06-20 18:43:33 +01:00
Michael Telatynski
7f6a252bcb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 2017-06-20 18:39:59 +01: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
Richard van der Hoff
1cd152e5f7 Merge pull request #1130 from matrix-org/rav/log_fixes 
Various logging cleanups
 2017-06-20 17:55:07 +01:00
Richard van der Hoff
cd73139af5 Various logging cleanups 
* don't just log errors without any context as to where they came from or what
   they mean
 * avoid the use of '%s' and multi-argument console.log because it looks awful
   under karma.
 2017-06-20 17:38:02 +01:00
Luke Barnard
3320df4cdd Don't allow UserSettings to render if !MatrixClientPeg.get() 
Now that it has state that updates following the nulling of the MCP (userHasGeneratedPassword) we need to stop it from rendering if the MCP is null.

Fixes https://github.com/vector-im/riot-web/issues/4319
 2017-06-20 17:13:06 +01:00
Michael Telatynski
b712a15a14 move in case it is racey ---- somehow? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-20 16:15:42 +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
Michael Telatynski
04aed416d2 Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/MatrixChat.js
 2017-06-20 15:37:05 +01:00
Michael Telatynski
5460b0f5b2 reset page subtitle on_logged_out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-20 15:31:12 +01:00
Luke Barnard
c337485d90 Redesign the warning to be red text, move below "Sign out" 2017-06-20 15:01:53 +01:00
David Baker
a2dc17256a Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff 2017-06-20 13:44:27 +01:00
Luke Barnard
4f9c1fe199 Merge branch 'develop' into luke/feature-user-settings-password-warning 2017-06-20 13:40:34 +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
David Baker
e15aedfeb2 Fix another infinite spin on register 
Don't set ready on logging_in, set it before we start the client,
as commented
 2017-06-20 12:03:37 +01:00
Luke Barnard
e16d1b3cfb Implement password nag warning in user settings account section 
"To return to your account in future you need to set a password" in the account section when a user has not yet set a password (is a PWLU).
 2017-06-20 11:22:07 +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
Richard van der Hoff
3a6dabdc08 Merge pull request #1116 from matrix-org/rav/no_more_guestcreds 
Get rid of guestCreds
 2017-06-19 14:34:12 +01:00
Luke Barnard
57f01b83be Revert "Save scroll state immediately before updating" 
This reverts commit 4124a8dcff from PR https://github.com/matrix-org/matrix-react-sdk/pull/1076
 2017-06-19 13:19:17 +01: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
Richard Lewis
f676b58c00 Add google ardboard logo 2017-06-19 11:47:03 +01:00
Richard Lewis
9d89bfe264 Fix jitsi logo references 2017-06-19 11:36:15 +01:00
Luke Barnard
513a585a3e Merge pull request #1076 from ollieh/issues/reduce-save-restore-window 
Reduce save-restore window in ScrollPanel to reduce scrolling jumps
 2017-06-19 11:23:10 +01:00
Richard van der Hoff
a5d65ee391 Get rid of guestCreds 
-- we just keep the MatrixClient running in the background, so it is easy to
resume.
 2017-06-19 10:36:25 +01:00
Richard van der Hoff
3b518f2c59 Fix race in registration for pusher config 
we no longer immediately create the MatrixClient, so don't assume we do.
 2017-06-19 10:22:18 +01:00
Richard van der Hoff
115a3deed9 Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states 
Refactor the state machine in MatrixChat
 2017-06-19 08:53:50 +01:00
Richard van der Hoff
cb29d92912 Merge pull request #1110 from matrix-org/rav/fix_token_redirect 
Avoid transitioning to loggedIn state during token login
 2017-06-19 08:52:22 +01:00
Matthew Hodgson
032650e095 Merge branch 'develop' into t3chguy/fix_forwarding 2017-06-19 01:53:35 +01:00
Luke Barnard
ba95d7a16c Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create 
Don't peek when creating a room
 2017-06-16 18:35:20 +01:00
Luke Barnard
be58e1095e Don't peek when creating a room 
This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196
 2017-06-16 18:24:07 +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
8e8af5eb5c Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server 2017-06-16 15:59:18 +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
Richard van der Hoff
db3d9c0573 Make Lifecycle.loadSession return an explicit result 
- rather than inferring it from the fact it didn't call logging_in.
 2017-06-16 15:23:09 +01:00
Richard van der Hoff
5f689b7929 Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp 2017-06-16 15:20:47 +01:00
Richard van der Hoff
eb1fc9ae2d Avoid transitioning to loggedIn state during token login 
Fixes riot-web#4334

When we do a token login, don't carry on with the normal app startup
(transitioning to the loggedIn state etc) - instead tell the app about the
successful login and wait for it to redirect.

Replace onLoadCompleted with onTokenLoginCompleted so that the app can see what
it's supposed to be doing.
 2017-06-16 15:05:53 +01:00
Michael Telatynski
8c333dc3f7 remove debug and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 14:39:31 +01:00
David Baker
236cf1efb2 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-16 14:19:54 +01:00
Richard van der Hoff
3884c5ccf0 Log an error on unknown state instead of throwing 2017-06-16 11:51:12 +01:00
Richard van der Hoff
5e5639b730 Fix half-written comment 2017-06-16 11:50:53 +01:00
Luke Barnard
82b2da7833 Correctly inspect state when rejecting invite 
So that we view_next_room if we're looking at the room we're rejecting
 2017-06-16 11:27:47 +01:00
David Baker
64b555dfe3 Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview 
Make sure to pass the roomAlias to the preview header if we have it
 2017-06-16 11:21:03 +01:00
Luke Barnard
807f01b57e Make sure to pass the roomAlias to the preview header if we have it 2017-06-16 11:10:55 +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
af6392d7ca Fix URL previews 
and also things like the unsent message error and encryption
warning.

Stuff that we need to do at room view mount time had got moved into
a clause of the if statement in onHaveRoom and so wasn't being
executed.

Fixes https://github.com/vector-im/riot-web/issues/4327
 2017-06-15 22:57:41 +01:00
Michael Telatynski
f0f721aa32 make hiding redactions use new pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:22:38 +01:00
Michael Telatynski
cebb7182f0 try to make hiding events work with read markers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:17:59 +01:00
Michael Telatynski
a097357baf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part 2017-06-15 20:10:32 +01:00
Michael Telatynski
c53fb08453 pass user settings from above 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:02:17 +01:00
Michael Telatynski
4b34a2b169 modernize imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 19:57:48 +01:00
Michael Telatynski
a0a4fe62d5 make hide joins/parts work for MELS and highlighted/permalink event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 19:53:34 +01:00
Richard van der Hoff
7b526308fd Rearrange MatrixChat.render for sanity 
no-op to make it into a nice simple switch-like arrangement
 2017-06-15 17:57:24 +01:00
Richard van der Hoff
90213ce72e MatrixChat: Replace state.{loading,loggedIn,loggingIn} with views 
MatrixChat is essentially a glorified state machine, with its states partially
determined by the loading, loggedIn and loggingIn state flags. If we actually
make each of the states implied by those flags an explicit 'view', then
everything gets much clearer.
 2017-06-15 17:57:24 +01:00
Richard van der Hoff
ce42a9a06f Replace MatrixChat.state.screen with 'view' 
'screen' is overloaded, as it us used for the parameter of `showScreen` (and,
by implication, `state.screenAfterLogin`). Attempt to clear up the confusion by
replacing 'screen' with 'view' and using some constants for the potential
values.

This should be a no-op!
 2017-06-15 16:41:17 +01:00
Richard van der Hoff
1f48b4caa6 Merge pull request #1098 from matrix-org/rav/test_rts_login 
Groundwork for tests including a teamserver login
 2017-06-15 16:12:28 +01:00
Luke Barnard
9d74001f4f Show a spinner when accepting an invite and waitingForRoom 2017-06-15 15:32:01 +01:00
Luke Barnard
cc46fd34d7 Only stop peeking if at some point we were joined 2017-06-15 14:21:23 +01:00
David Baker
8f9bf5f093 Merge branch 'develop' into erikj/group_server 2017-06-15 14:19:46 +01:00
Luke Barnard
5c37d591b0 Unbreak auto joining 2017-06-15 13:35:19 +01:00
Luke Barnard
fc7da536d6 Add forceUpdate for memberships !== join 2017-06-15 13:32:56 +01:00
Luke Barnard
30566beb43 Fix if-statement thinko 2017-06-15 13:28:52 +01:00
Luke Barnard
d55d61e456 Remove redundant isUserJoined 2017-06-15 12:37:01 +01:00
Luke Barnard
b90ceaa111 Display a spinner until new room object after join success 
If we successfully join, display a spinner until the js-sdk indicates (via room membership event or room event) that we can start using the room normally. A room event indicates we have never seen that room which means we need to use the new room object to clobber state.room. This is to make sure we replace the room that is set up for peeking with the room that can be used normally. For historical rooms, this isn't a problem.

This is a workaround for the fact that when peeking, the js-sdk calls onRoom, which is difficult to handle from the clients perspective because onRoom should only be called for rooms that you've never seen before. But if you peek a room that you've joined and left and get an onRoom, you run into trouble. You also can't just always use onRoomMembership because this won't be triggered for the first time you see the room. So we end up using a combination of both.

See https://github.com/matrix-org/matrix-js-sdk/issues/464 for discussion on improving this
 2017-06-15 12:01:16 +01:00
Richard van der Hoff
65f351ff22 Clear Lifecycle.RtsClient on MatrixChat.mount 
- otherwise it ends up sitting around and failing later tests.
 2017-06-15 02:15:13 +01:00
David Baker
8840625045 Merge pull request #1097 from matrix-org/luke/attempt-fix-peeking-regression 
Luke/attempt fix peeking regression
 2017-06-14 17:33:45 +01:00
Luke Barnard
58554cce53 Remove racey condition 
joining might become false before we get the room down the sync
 2017-06-14 17:13:13 +01:00
Luke Barnard
9e3efb54d3 Merge pull request #1096 from matrix-org/dbkr/fix_warm_fuzzy_text_mk_2 
Show correct text in set email password dialog (2)
 2017-06-14 16:59:12 +01:00
Richard van der Hoff
e9aac09105 Merge pull request #1092 from matrix-org/rav/no_resume_client_on_login 
Don't create a guest login if user went to /login
 2017-06-14 16:58:12 +01:00
Luke Barnard
ed5f01d46f Add logging for diagnosis 2017-06-14 16:53:21 +01:00
Luke Barnard
b5fd78a97f Only attempt to peek once in the lifetime of RoomView 2017-06-14 16:50:46 +01:00
Luke Barnard
2d6ba056d1 Attempt to follow closely what RoomView did pre-ILAG 
In terms of peeking and what happens to the state when joining. This is another attempt to mitigate https://github.com/vector-im/riot-web/issues/4307
 2017-06-14 16:48:34 +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
Richard van der Hoff
5d649626b0 Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login 2017-06-14 11:08:16 +01:00
Richard van der Hoff
498ea53995 Don't create a guest login if user went to /login 
This fixes an unintuitive behaviour where, if you follow a link to
riot.im/app/#/login, we take you to the login page, but not before we've
registered a guest account (or restarted the MatrixClient with the stored
creds).

This actually ends up simplifying some of the startup dance, as we special-case
the registration flows earlier on.
 2017-06-14 11:02:38 +01:00
Luke Barnard
57dfbc4701 Remove unused imports 2017-06-14 10:53:02 +01:00
Luke Barnard
040f28463d Merge pull request #1045 from ollieh/issues/4009 
Fixed pagination infinite loop caused by long messages
 2017-06-14 10:40:02 +01:00
Richard van der Hoff
9e70884415 Merge pull request #1085 from matrix-org/rav/clear_storage_on_login 
Clear persistent storage on login and logout
 2017-06-14 10:34:26 +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
Robert Swain
e2759774fc RoomView: Correctly pass userId from matrix client 
It isn't set in the state anywhere.
 2017-06-13 15:19:38 +02:00
Robert Swain
99b1de7f0e RoomView: Display AppsDrawer if apps in room state 2017-06-13 15:19:06 +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
Richard van der Hoff
392cd7861d Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener 
remove RoomViewStore listener from MatrixChat on unmount
 2017-06-13 13:10:49 +01:00
Richard van der Hoff
68e1a7be74 Clear persistent storage on login and logout 
Make sure that we don't end up with sensitive data sitting around in the stores
from a previous session.
 2017-06-13 12:51:47 +01:00
Richard van der Hoff
1ea9ed5d8c remove RoomViewStore listener from MatrixChat on unmount 
... to avoid spurious warnings from the tests.
 2017-06-13 12:39:26 +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
Matthew Hodgson
bc55d44bcf Merge pull request #1079 from matrix-org/t3chguy/voip/force_turn 
allow forcing of TURN
 2017-06-12 21:44:00 +01:00
Michael Telatynski
c1d1a1377c allow forcing of TURN, pass account val per-call until UX is designed. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-12 20:20:27 +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
Michael Telatynski
c1cbdbcc4f Merge branches 'develop' and 'kegan/hide-join-part' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
 2017-06-12 13:22:52 +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
Richard van der Hoff
9e96e8e87f Remove guest-only bits of UserSettings 
There is now no way to open UserSettings as a guest, so we might as well lose
the dead code.
 2017-06-12 08:36:41 +01:00
Richard van der Hoff
56efe7d2f2 Merge pull request #1064 from matrix-org/rav/delinting 
Delinting
 2017-06-12 08:34:58 +01:00
Oliver Hunt
4124a8dcff Save scroll state immediately before updating 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-12 06:19:12 +01:00
Michael Telatynski
ccad1013a7 don't return null in case it breaks things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-11 23:42:22 +01:00
Michael Telatynski
1069bd33f0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/updating_stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-11 23:21:50 +01:00
Michael Telatynski
6ead97c7a6 change interface to UpdateCheckBar and change launching mechanism 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-11 19:12:40 +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
Luke Barnard
ecc8abbfc9 When ChatCreateOrReuseDialog is cancelled by a guest, go home 2017-06-09 13:46:45 +01:00
Robert Swain
9e0b476b72 Merge branch 'develop' into rob/apps 2017-06-09 12:06:44 +02:00
David Baker
924c08b143 Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room 
Goto /home when forgetting the last room
 2017-06-09 11:03:14 +01:00
Luke Barnard
19bb879fbf Handle only 1 room in the list 2017-06-09 10:54:42 +01:00
Luke Barnard
c7229967a6 Goto /home when forgetting the last room 2017-06-09 10:28:45 +01:00
Luke Barnard
a21b6e61a6 Default to home page when settings is closed 
If the current room isn't set.
 2017-06-09 10:08:26 +01:00
Richard van der Hoff
105c6b2b87 delint MatrixChat 
once more. with feeling.
 2017-06-09 03:09:03 +01:00
Richard van der Hoff
20bdae6079 delint UserSettings.js 2017-06-09 03:08:57 +01: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
Luke Barnard
5588e115eb Clarify doc for highlighted 2017-06-08 17:57:37 +01:00
Luke Barnard
9892566007 Highlighted means highlighted 2017-06-08 17:54:41 +01:00
Matthew Hodgson
df625b0d31 hit MemberInfo with Gemini to fix vector-im/riot-web#4223 2017-06-08 17:26:40 +01:00
Luke Barnard
c02dbd1cdc Rename initial state variables 2017-06-08 17:26:08 +01:00
David Baker
3d59fe58dc Merge pull request #1060 from matrix-org/dbkr/fix_login_error_message 
Better error messages for login
 2017-06-08 16:57:40 +01:00
David Baker
5e55b6a643 PR feedback 2017-06-08 16:23:43 +01:00
David Baker
9def0bb5c2 Oops, fix email check 2017-06-08 16:08:19 +01:00
David Baker
8dc20606c8 Use comma for list of three things 2017-06-08 16:07:29 +01:00
Luke Barnard
000a045e35 Rename RVS state (event -> initialEvent) and redocument 2017-06-08 15:52:21 +01:00
David Baker
d691c891e7 Move all login error string generation into view 
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
 2017-06-08 15:49:48 +01:00
Luke Barnard
1792fa45f4 Null-guard roomId before sending a dispatch to update scroll state 
Otherwise we pointlessly assign the null key to something
 2017-06-08 15:45:50 +01:00
Luke Barnard
59e649f326 Add comment about roomId potentially not being resolved following an update from RoomViewStore 2017-06-08 15:43:45 +01:00
Luke Barnard
e58e4db628 Explain why search results are cleared when eventId changes 2017-06-08 15:38:58 +01:00
Luke Barnard
dca2be6325 Add RoomView initial state and docs 2017-06-08 15:37:30 +01:00
Luke Barnard
2e82bf40fb Explain setting of highlighted in room/$eventId showScreen handling. 2017-06-08 15:34:20 +01:00
Luke Barnard
8ddc38c9b1 Doc _viewRoom highlighted 2017-06-08 15:32:31 +01:00
Luke Barnard
aa20ad706e Remove redundant currentRoomAlias 2017-06-08 15:30:43 +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
Luke Barnard
f320f7d475 Remove redundant action id 2017-06-08 14:30:45 +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
David Baker
6d1fa775a0 Formatting 2017-06-08 14:14:45 +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
Richard van der Hoff
566fb2caeb Add some logging around switching rooms 
... which I wish had been there when I was staring at a rageshake.
 2017-06-07 22:41:02 +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
David Baker
1dbdbc163b Cancel 'join room' action if 'log in' is clicked 
or 'choose different server'

We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.

Fixes https://github.com/vector-im/riot-web/issues/4217
 2017-06-07 11:55:24 +01:00
Kegan Dougal
4127e7121c Translate src/components/structures 
Includes some pluralisation! Tested them manually to make sure they work.
 2017-06-07 11:40:46 +01:00
Richard Lewis
c552f7f336 App icon styling 2017-06-07 10:55:49 +01:00
Oliver Hunt
3d59d72aaa Fixed pagination infinite loop caused by long messages 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-07 04:49:41 +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
David Baker
9f15e8e152 Merge branch 'master' into develop 2017-06-06 17:41:05 +01:00
David Baker
00ccf4bb51 Revert "Call MatrixClient.clearStores on logout" 
This reverts commit c3d37c1ff9.

This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
 2017-06-06 17:33:50 +01:00
Luke Barnard
205fd1fad4 Allow password reset when logged in 2017-06-06 17:22:49 +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
c27f50207d comment 2017-06-06 11:43:07 +01:00
David Baker
12d2480916 Reset 'first sync' flag / promise on log in 
Otherwise on any logins after the first,we always think the first
sync has completed.
 2017-06-06 11:36:33 +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
ed7c138d91 quick and dirty override to disable MD globally 2017-06-05 21:38:25 +01:00
Matthew Hodgson
d77a09adba quick and dirty override to disable MD globally 2017-06-05 21:33:01 +01:00
David Baker
a99f6525c9 Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action 
Cancel deferred actions
 2017-06-05 21:27:13 +01:00
Luke Barnard
4ab6dc9ddd Merge branch 'new-guest-access' into luke/ilag-i18n 2017-06-05 20:28:51 +01:00
David Baker
f6cfff9098 Cancel deferred actions 
if the set mxid dialog is canceled
 2017-06-05 18:37:38 +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
3553aea5df Merge pull request #1038 from matrix-org/dbkr/ilag_defer_create_room 
Defer an intention for creating a room
 2017-06-05 17:52:57 +01:00
David Baker
5924654f9d Defer an intention for creating a room 2017-06-05 17:45:01 +01:00
David Baker
ad87e9bd50 Apply 9cae667c06 to ilag branch 2017-06-05 17:28:36 +01:00
Erik Johnston
998a55a590 Add basic group view 2017-06-05 17:10:08 +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
David Baker
3dbea45426 Comment 2017-06-05 16:50:00 +01:00
David Baker
3c0290588c Always show the spinner during the first sync 
Before, we were relying on the fact that `ready` would still have
been false from before. This was not the case, for example, if we
naviagted straight to /#/login (which causes a guest session to be
set up and the sync for that completes after we navigate to the
login screen).

We should always mark ourselves as not-ready after login since we
will always have to wait for the sync.
 2017-06-05 16:17:32 +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
David Baker
c5cd6aecd6 Revert "Call MatrixClient.clearStores on logout" 
This reverts commit c3d37c1ff9.

This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
 2017-06-05 15:54:44 +01:00
Luke Barnard
6125395675 _t for SetMxIdDialog 2017-06-05 15:36:10 +01:00
David Baker
85aa3f6f13 Merge pull request #1032 from matrix-org/luke/fix-welcome-user-background 
Only view welcome user if we are not looking at a room
 2017-06-05 14:38:55 +01:00
David Baker
d8e3423060 Merge pull request #1031 from matrix-org/luke/fix-deferred-start-chat-settings 
Keep deferred actions for view_user_settings and view_create_chat
 2017-06-05 14:10:29 +01:00
Luke Barnard
c82e79ab5f Only view welcome user if we are not looking at a room 2017-06-05 14:07:24 +01:00
Luke Barnard
3195b9f964 Keep deferred actions for view_user_settings and view_create_chat 
This will bring up the correct UI as intended instead of defaulting to the home page with welcome user in the room list.

Fixes https://github.com/vector-im/riot-web/issues/4162
 2017-06-05 13:41:52 +01:00
Luke Barnard
beafb68538 Don't do a deferred start chat if user is welcome user 
There's no point in deferring creating a new DM with the welcome user because the setMxId dialog will do so anyway.
 2017-06-05 13:14:55 +01:00
Luke Barnard
239874ccce Introduce state peekLoading to avoid collision with roomLoading 
The room loading spinner will now be displayed if the alias is being resolved (roomLoading) or if the peek is being loaded for the room `peekLoading`.
 2017-06-05 09:52:39 +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
98e99d542b i18n things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:49:28 +01:00
Michael Telatynski
0f4dc5c072 first iter of manual update control 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:49:28 +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
David Baker
2cc9f9c403 Fix accepting a 3pid invite 
Fixes https://github.com/vector-im/riot-web/issues/4123
 2017-06-02 16:25:14 +01:00
David Baker
ec0ad93ad7 Merge pull request #1007 from matrix-org/dbkr/propagate_room_join_errors 
Propagate room join errors to the UI
 2017-06-02 16:09:34 +01:00
Kegan Dougal
bfb313ce9d riot-bot only if english please 2017-06-02 14:13:45 +01:00
Matthew Hodgson
375b435dfe hide analytics settings if no piwik url 2017-06-02 13:34:01 +01:00
Matthew Hodgson
adfeff34ae Merge pull request #1004 from matrix-org/t3chguy/hide_redactions 
allow hiding redactions, restoring old behaviour
 2017-06-02 12:27:52 +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
David Baker
03f4f269ce Propagate room join errors to the UI 
Dispatch so we can set the state in RoomViewStore. Show the error
when the room join fails (unsure if it's better to do this from
the component or the store). Remove unused joinError from roomview.
 2017-06-02 11:53:10 +01:00
Luke Barnard
6e84b6e996 Display profile errors better 2017-06-02 11:50:58 +01:00
Luke Barnard
e88b52fa8f Add comment 2017-06-02 11:42:47 +01:00
Luke Barnard
6a9781f023 Remove redundant state 2017-06-02 11:41:09 +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
Kegan Dougal
a8ca7c899f Review comments 2017-06-02 11:16:08 +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
Michael Telatynski
5e2e550bf9 don't lose date seperator when the first event of the new day is redacted 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 04:39:44 +01:00
Michael Telatynski
d2d0ba952a allow hiding redactions. no point onAccountData as it'd cause a full 
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 04:23:07 +01:00
Matthew Hodgson
ec433907f0 Merge pull request #850 from t3chguy/webrtc_settings 
webrtc config electron
 2017-06-02 00:48:25 +01:00
Michael Telatynski
b1973d7998 undefined =/= '' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:42:19 +01:00
Michael Telatynski
f4db83a031 try empty string as falsey key 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:31:43 +01:00
Michael Telatynski
6b4daf02a9 i18 missed things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:27:20 +01:00
Michael Telatynski
0bafd6458a Revert voodoo 2017-06-02 00:26:31 +01:00
Matthew Hodgson
c7285b9053 fix fr layout 2017-06-02 00:21:00 +01:00
Michael Telatynski
46a9326607 special case default - CallMediaHandler can figure it out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:20:34 +01:00
Matthew Hodgson
6a225d1ac2 use new sign-in string 2017-06-02 00:16:17 +01:00
Michael Telatynski
3eb519b227 this is just endless 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:54:17 +01:00
Michael Telatynski
beedeec163 copy the arrays so we're not making a mess 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:50:14 +01:00
Michael Telatynski
0f2c89d525 lets actually make things work, eh? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:39:54 +01:00
Michael Telatynski
4e36c10c38 only unshift default if there is no deviceId===default 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:33:36 +01:00
Michael Telatynski
dd4480f8c3 change device data structure to array of objects 
so that we can set falsey values, for unsetting device
                               most dolphinately needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:26:43 +01:00
Michael Telatynski
aa90d6b097 fix **AMAZING** C&P derp 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:00:25 +01:00
Michael Telatynski
dbba1dedb6 i18nize all the things and change show logic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 22:58:17 +01:00
Michael Telatynski
04b86e5d1d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings 
and i18nize webrtc stufffs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
 2017-06-01 22:56:31 +01:00
Matthew Hodgson
ee965a89a7 Merge pull request #986 from uhoreg/compact 
enable useCompactLayout user setting an add a class when it's enabled
 2017-06-01 21:32:54 +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
7d55f3e75d handle room key request cancellations 2017-06-01 18:40:04 +01:00
Richard van der Hoff
d5bc24d9f7 Initial implementation of KeyRequestHandler, KeyShareDialog etc 2017-06-01 18:40:04 +01:00
Matthew Hodgson
33214b8752 Merge pull request #991 from turt2live/travis/date-sep-12hr 
Support 12hr time on DateSeparator
 2017-06-01 18:26:13 +01:00
Luke Barnard
16c4c14a16 Fix to show the correct room 2017-06-01 18:01:30 +01:00
Richard van der Hoff
b3e9716126 Revert "add labels to language picker" 2017-06-01 17:52:25 +01:00
Richard van der Hoff
53ebc8d7bd Merge pull request #983 from matrix-org/rav/clear_storage_on_logout 
Call MatrixClient.clearStores on logout
 2017-06-01 17:34:21 +01:00
turt2live
ab1e277f5f Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:53:24 -06:00
Kegan Dougal
ced68f2719 Find a way to translate the name of RTE in user settings 
I never said it was a *nice* way...
 2017-06-01 15:53:08 +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
Hubert Chathi
92d1a9a6ff enable useCompactLayout user setting an add a class when it's enabled 
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
 2017-05-31 22:00:30 -04:00
Matthew Hodgson
3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
Matthew Hodgson
b4284cf000 fix up Can't connect to HS i18n with _tJsx 2017-06-01 01:17:39 +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
Richard van der Hoff
c3d37c1ff9 Call MatrixClient.clearStores on logout 
... to make sure that we don't have any sensitive data sitting around in the
stores.
 2017-05-31 18:28:21 +01:00
Luke Barnard
8192374481 Add missing _t import 2017-05-31 16:02:42 +01:00
Luke Barnard
7abaadddde Merge pull request #977 from matrix-org/luke/session-store-null-on-logout 
Remove cachedPassword from localStorage on_logged_out
 2017-05-31 16:00:24 +01:00
Luke Barnard
d0e270bd1c Only re-render LoggedInView if MatrixClientPeg.get() is truthy 2017-05-31 15:15:27 +01:00
Richard van der Hoff
2d73f094ff Delint MatrixChat, again (#979) 
grrr.
 2017-05-31 15:09:09 +01:00
Kegan Dougal
fc93517094 WIP join/part hiding 
- Doesn't work with MELS
- Doesn't work with read markers
- Doesn't work with jumping to events

Shelving this for now as I fix some of this mess.
 2017-05-31 13:36:19 +01:00
daniel tygel
d4a89cc2df Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-05-31 09:09:27 -03:00
Richard Lewis
dac154f828 Add full width widgets 2017-05-31 10:08:39 +01:00
Michael Telatynski
dcd99ac3de Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 
# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json

First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:54:57 +01:00
Michael Telatynski
0d930c0553 change wording and i18n it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:46:51 +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
b51f5ac6d1 Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access 2017-05-30 16:11:11 +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
Matthew Hodgson
90c2fc01d2 Merge pull request #964 from matrix-org/luke/start-url 
Add /start to show the setMxId above HomePage
 2017-05-30 15:45:43 +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
Luke Barnard
2baef643e3 Add /start to show the setMxId above HomePage 2017-05-30 14:27:02 +01:00
Matthew Hodgson
9b8b562499 Merge pull request #960 from matrix-org/luke/fix-chat-invite-perf 
Improve ChatInviteDialog perf by ditching fuse, using indexOf and lastActiveTs()
 2017-05-30 14:26:37 +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
Michael Telatynski
ee6789ed15 change aux order so room settings is top most, forwarding could go weird 
if you clicked roomsettings whilst forwarding

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 11:22:27 +01:00
Michael Telatynski
baba2e12e2 fix weird indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 11:21:33 +01:00
Michael Telatynski
ff9141e424 add a hideCancel flag as some things have own cancel etc on RoomHeader 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 11:20:41 +01:00
Richard Lewis
ec03cf4de3 disable iframe sandboxing. Remove BBC news iframe 2017-05-30 10:46:51 +01:00
Luke Barnard
9536e1ef36 Merge pull request #954 from matrix-org/matthew/ilag-login 
add login link to SetMxIdDialog
 2017-05-30 09:48:33 +01:00
Matthew Hodgson
ad1b14967b hide rightpanel on welcome page 2017-05-30 03:59:06 +01:00
Michael Telatynski
7e02977c27 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 22:32:45 +01:00
Michael Telatynski
a2229ced11 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 2017-05-29 21:56:45 +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
Michael Telatynski
9b8dcaf274 make analytics setting use new thing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 15:11:37 +01:00
Michael Telatynski
97d0c41d30 fix ugly special casing in generic settings renderer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 15:08:11 +01:00
Michael Telatynski
f5d336103e add opt out / un opt out toggle 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 14:36:50 +01:00
Michael Telatynski
7e8123e5fe move all init/enable/disable logic to Analytics/MatrixChat 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 14:26:29 +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
Matthew Hodgson
10a9313bba Merge pull request #944 from matrix-org/t3chguy/fix-focus-steal 
don't focus_composer on window focus
 2017-05-27 23:30:00 +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
Marcel
8935e9706e Change variable name as mentioned by t3chguy 2017-05-27 21:21:23 +02:00
Marcel
a30110b5d3 Fix vector-im/riot-web#4042 2017-05-27 21:11:00 +02:00
Michael Telatynski
4cd7964b58 remove window onFocus handling entirely 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 18:43:59 +01:00
Matthew Hodgson
3703306a9e oops 2017-05-27 18:35:18 +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
1eb7993aa7 Merge pull request #946 from matrix-org/t3chguy/fix_imports 
import _t, drop two unused imports
 2017-05-27 18:08:00 +01:00
Michael Telatynski
8524f5868c import _t, drop two unused imports 
without this FilePanel would ever-load

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 17:59:11 +01:00
Matthew Hodgson
957aa0403d fix https://github.com/vector-im/riot-web/issues/4052 2017-05-27 16:03:07 +01:00
Michael Telatynski
8e1db84bee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal 2017-05-27 14:29:06 +01:00
Michael Telatynski
2bcb381aa7 maybe window focus should be ignored so focus is left as what it was 
but with this at least clicking on a text input will not make you
be thrown into composer instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 14:19:34 +01:00
Matthew Hodgson
03194e66b3 actually wire up alwaysShowTimestamps 2017-05-27 00:14:16 +01:00
Matthew Hodgson
81704a5b5e s/username/User name/ 2017-05-27 00:13:16 +01:00
Luke Barnard
fd27d6dab1 Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings 
Block user settings with view_set_mxid
 2017-05-26 18:48:55 +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
23fbce66a2 Translate 'email' threepid label 2017-05-26 17:56:51 +01:00
Matthew Hodgson
ed79a3adef Merge pull request #935 from matrix-org/luke/new-guest-access-no-barf-on-username-check-err 
Show "Something went wrong!" when errcode undefined
 2017-05-26 17:47:52 +01:00
David Baker
c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30:02 +01:00
Matthew Hodgson
3d688a6ada Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart 
Set the displayname to the mxid once PWLU
 2017-05-26 17:17:23 +01:00