ebe6cddd21
Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui
2017-01-25 15:13:14 +00:00
69b55fd9d1
Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down
...
Re-add dispatcher as alt-up/down uses it
2017-01-25 15:10:56 +00:00
e9804086ca
Point to InviteAddressType
2017-01-25 15:03:01 +00:00
adf8f50f6e
Merge remote-tracking branch 'origin/develop' into rav/base_dialog
2017-01-25 15:01:11 +00:00
b34f63d3e7
Re-add dispatcher as alt-up/down uses it
...
Alt-up/down still doesn't go through rooms in the right order,
but it should probably not error.
2017-01-25 14:59:18 +00:00
fd8d5af63a
Fix import of InviteAddressType
...
and rewrite to import while we're at it
2017-01-25 14:54:21 +00:00
9020a7515c
Correctly bail out on unknown address
2017-01-25 14:50:00 +00:00
b00e090600
Do not show the bug report section if there is no bug_report_endpoint_url
2017-01-25 14:43:47 +00:00
e567162d28
Merge pull request #648 from matrix-org/rav/fix_set_displayname
...
Fix SetDisplayNameDialog
2017-01-25 14:32:52 +00:00
f9ca2a8e59
Fix _renderCommaSeparatedList
2017-01-25 11:28:12 +00:00
f66e412d3a
Merge pull request #643 from matrix-org/luke/fix-typing-indication
...
Sync typing indication with avatar typing indication
2017-01-25 11:13:55 +00:00
b887d5b823
Much linting
2017-01-25 11:05:45 +00:00
fc9987a827
Merge pull request #646 from matrix-org/matthew/password-reset-warning
...
Warn users of E2E key loss when changing/resetting passwords or logging out
2017-01-25 11:04:35 +00:00
8091cf7df8
Enumerate->label
2017-01-25 09:32:28 +00:00
f8e46819c5
Rename truncated->coalesced
2017-01-25 09:28:26 +00:00
3b8b2cf500
Document _getCanonicalTransitions
2017-01-25 09:18:47 +00:00
29b4dde878
Fix SetDisplayNameDialog
...
SetDisplayNameDialog got broken by the changes to support asynchronous loading
of dialogs.
Rather than poking into its internals via a ref, make it return its result via
onFinished.
Fixes https://github.com/vector-im/riot-web/issues/3047
2017-01-25 08:01:45 +00:00
10018374f8
Allow modals to stack up
...
Show the most recent modal; if we end up with more than one, just show the most
recent.
2017-01-25 07:44:33 +00:00
770820e6fa
Fix a bunch of lint complaints
2017-01-24 22:41:52 +00:00
6a40abbbf0
actually, move signout warning to UserSettings.js
...
also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog.
This in turn fixes https://github.com/vector-im/riot-web/issues/2152
2017-01-24 23:18:25 +01:00
6e55bb4956
actually, move signout warning to UserSettings.js
...
also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog.
This in turn fixes https://github.com/vector-im/riot-web/issues/2152
2017-01-24 23:15:00 +01:00
b85f53cadd
Implement Megolm key importing
2017-01-24 21:50:24 +00:00
e23deac1bb
Implement e2e export
2017-01-24 21:50:24 +00:00
b148619c52
warn on logout too
2017-01-24 22:47:03 +01:00
5b61d00533
warn users that changing/resetting password will nuke E2E keys
2017-01-24 22:36:55 +01:00
86276450f6
Add AccessibleButton to component-index
2017-01-24 21:27:57 +00:00
79e1108564
Merge branch 'develop' into rav/base_dialog
2017-01-24 21:03:08 +00:00
72492fd909
Fix broken merge
...
I messed up the merge in 6dd46d5
2017-01-24 20:55:10 +00:00
6dd46d532a
Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux
2017-01-24 20:47:24 +00:00
6c263c1c89
Change what AddressTile takes to be Objects
...
Rather than just passing in a list of strings. This paves the way
for passing in display names & avatars of looked-up threepids.
2017-01-24 18:23:34 +00:00
56cf7a6af7
Create a common BaseDialog
...
I'm fed up with copying the boilerplate for modal dialogs the whole time.
2017-01-24 18:18:54 +00:00
a92fff9da7
Fix linting warnings
2017-01-24 17:18:56 +00:00
4186a769ca
Default prop for whoIsTypingLimit
2017-01-24 17:16:26 +00:00
97387db014
Reduce log spam: Revert a16aeeef2a
...
As per #riot-dev, this is no longer required.
2017-01-24 16:40:26 +00:00
9a360a48d2
Use the same property to limit avatars
2017-01-24 16:04:37 +00:00
7c66d1c867
Sync typing indication with avatar typing indication
...
Follow the same rules for displaying "is typing" as with the typing avatars.
2017-01-24 16:01:39 +00:00
5991172182
Review comments
2017-01-24 15:51:53 +00:00
3b9a112136
Add bug report UI
2017-01-24 14:47:11 +00:00
ce7434984b
Expand timeline in situations when _getIndicator not null
...
The status bar will now be expanded when:
- props.numUnreadMessages
- !props.atEndOfLiveTimeline
- props.hasActiveCall
2017-01-24 14:32:52 +00:00
bd106968ce
Merge branch 'develop' into luke/fix-join-part-collapsing-causality
...
Conflicts:
src/components/structures/MessagePanel.js
2017-01-24 14:22:18 +00:00
d690677bde
Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality
...
Conflicts:
src/components/views/elements/MemberEventListSummary.js
2017-01-24 14:17:11 +00:00
5091bab657
Fix failed merge #2
2017-01-24 13:59:02 +00:00
5f24fc3e5d
Fix merge fail
2017-01-24 13:56:22 +00:00
c0de0870ed
Some sarcastic comments
2017-01-24 13:32:17 +00:00
f1f6fc809c
Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback
2017-01-24 11:26:09 +00:00
c47d3e04a5
Merge pull request #621 from matrix-org/dbkr/add_searching_known_users
...
Add 'searching known users' to the user picker
2017-01-24 10:51:23 +00:00
a06ecb87bc
Hide RoomStatusBar when it displays nothing ( #615 )
...
Use CSS class `mx_RoomView_statusArea_expanded` to indicate an expanded status bar. Without this, the status bar may be hidden from view. A 10s debounce will prevent it from bouncing frequently.
2017-01-23 16:01:39 +01:00
3cfa539230
Merge pull request #637 from matrix-org/luke/fix-typing-avatars-displays-me
...
Fix typing avatars displaying "me"
2017-01-23 12:43:34 +00:00
3df686c272
Merge pull request #638 from matrix-org/rav/unbreak_verification
...
Fix device verification from e2e info
2017-01-23 12:33:25 +00:00
dc08d9dfdf
Fix device verification from e2e info
...
Don't attempt to reuse the same AsyncWrapper for different dialogs - which ends
up pushing the props for the new dialog into the old dialog.
Fixes https://github.com/vector-im/riot-web/issues/3020
2017-01-23 12:18:41 +00:00
506d37bbad
Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users
2017-01-23 11:34:44 +00:00
f64a4e0ecb
Merge pull request #623 from matrix-org/dbkr/user_search_word_boundary
...
Make user search do a bit better on word boundary
2017-01-23 11:31:26 +00:00
d97fc0a99a
Fix typing avatars displaying "me"
2017-01-23 10:25:33 +00:00
7bc3fc8696
make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020
2017-01-22 01:28:43 +01:00
d9c0513ee2
make it work
2017-01-21 22:49:29 +01:00
39c122fe4f
fix local storage idiocy
2017-01-21 22:27:55 +01:00
532f4e59c9
literally blindly add verification buttons
2017-01-21 19:06:15 +01:00
071e364be2
improve the verify warning if blacklisting is unabled
2017-01-21 17:56:48 +00:00
c618880af9
oops
2017-01-21 17:43:46 +00:00
3071fc0ddc
UI for blacklisting unverified devices per-room & globally
...
(written blind; untested as yet)
2017-01-21 17:39:39 +00:00
2e15e8f9b4
very barebones support for warning users when rooms contain unknown devices
2017-01-21 05:13:36 +00:00
937f13d578
fix a bunch of dark-theme buttons
2017-01-20 21:00:22 +00:00
0c5762b91d
Implement "someone is typing" avatars ( #631 )
...
When users are typing, their avatars can be seen instead of "..." in the RoomView StatusBar
2017-01-20 17:51:35 +01:00
18d4d3392a
Fix a bunch of linting errors
...
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
a16aeeef2a
Temporarily add more logging, to try to catch failures on travis
2017-01-20 13:06:06 +00:00
2d060c8d2e
Fix error display in account deactivate dialog
2017-01-20 11:04:47 +00:00
b76b0f755d
fix context menu bg
2017-01-20 02:47:47 +00:00
bd0706f103
Merge pull request #626 from matrix-org/dbkr/sanitize_chatinvitedialog
...
Sanitize ChatInviteDialog
2017-01-19 18:23:36 +00:00
afa384c4f3
Use null instead of false
2017-01-19 18:13:27 +00:00
2637ae3af3
Merge pull request #630 from matrix-org/rav/fix_themes
...
(hopefully) fix theming on Chrome
2017-01-19 17:34:36 +00:00
a2ff1cd8e6
Factor out adding the input field to the list
2017-01-19 17:03:16 +00:00
ee1f6c772e
Remove duplicate case handled above
...
And fix typo where it was handled
2017-01-19 16:50:09 +00:00
2a08abaa95
Keep old behaviour of submitting on enter
...
if input is empty
2017-01-19 16:35:40 +00:00
d8bcc1f067
Merge remote-tracking branch 'origin/develop' into dbkr/sanitize_chatinvitedialog
2017-01-19 16:26:59 +00:00
bb7d589287
Merge pull request #617 from matrix-org/rav/megolm_backup
...
Megolm session import and export
2017-01-19 16:14:18 +00:00
ba2460aef4
Merge pull request #618 from matrix-org/rav/async_dialog
...
Allow Modal to be used with async-loaded components
2017-01-19 16:08:30 +00:00
a88f9fdd73
(hopefully) fix theming on Chrome
...
Jump through some hoops to make Chrome behave sensibly on non-default themes.
2017-01-19 15:36:57 +00:00
89fa47dc26
Merge pull request #622 from kyrias/commonmark-fix-escaping
...
Fix escaping markdown by rendering plaintext
2017-01-19 13:39:07 +00:00
9e0c7a11d0
Merge pull request #628 from matrix-org/luke/feature-team-reg-auto-join-rooms
...
Implement auto-join rooms on registration
2017-01-19 11:44:37 +00:00
9c1c657a1e
Markdown: delete remaining pre-split relics
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-19 11:55:36 +01:00
b58a67f6b1
Add more punctuation. Also s/let/const/
2017-01-19 10:51:43 +00:00
8b60cb9df0
Megolm export: Clear bit 63 of the salt
2017-01-19 10:43:41 +00:00
242f5e0301
PR feedback
...
* Doc & properly indent escapeRegExp
* Add close bracket to the list of punctuation chars we search after
2017-01-19 10:24:21 +00:00
e9eb38fd74
Update propTypes and do null checks
2017-01-19 11:05:08 +01:00
e06dd6e34a
Implement auto-join rooms on registration
...
Also: This fixes registration with a team: only the email localpart was being used to register.
When a registration is successful, the user will be joined to rooms specified in the config.json teamsConfig:
"teamsConfig" : {
"supportEmail": "support@riot.im",
"teams": [
{
"name" : "matrix",
"emailSuffix" : "matrix.org",
"rooms" : [
{
"id" : "#irc_matrix:matrix.org",
"autoJoin" : true
}
]
}
]
}
autoJoin can of course be set to false if the room should only be displayed on the (forthcoming) welcome page for each team, and not auto-joined.
2017-01-19 10:56:04 +01:00
4e5689082d
correctly load synced themes without NPE
2017-01-18 20:06:54 +00:00
4df968ecdf
fix css snafu
2017-01-18 20:06:44 +00:00
7b7728c93a
Make behaviour of ChatInviteDialog more consistent
...
* Pressing enter now always adds whatever was in the input box
to the invite list, if it's a valid address (previously it
added it to the list of it was a search result but submitted
the form straight away if there were no results).
* Remove isValidAddress as it was only used in the context of
testing whether its return value was true or null (where null
meant "unsure") so just use getAddressType instead.
2017-01-18 18:32:38 +00:00
30bd01cdf2
Markdown: Split up render function into toHTML/toPlaintext
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 19:29:11 +01:00
f105ec2794
Attempt to sanitize ChatInviteDialog a bit
...
* Use binds rather than onFoo functions which aren't actually
handler functions themselves but return them
* Rename onKeyUp to moveSelectionDown etc,, reserving onKeyUp
for "a key has been released" rather than, "the up arrow key
has been pressed"
2017-01-18 17:51:39 +00:00
fc63067237
improve commentary
2017-01-18 16:36:27 +00:00
de621902fc
Better feedback in invite dialog
...
Show feedback if you enter a valid but unknown email address
or mxid
Fixes https://github.com/vector-im/riot-web/issues/2933
2017-01-18 15:21:50 +00:00
3d30553b7f
review fixes, plus unbreak to work with new webpack layout
2017-01-18 14:06:47 +00:00
6d2e521421
Markdown: Add comment about out function override
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 14:25:11 +01:00
a0bbe3a306
Merge branch 'develop' into matthew/postcss
2017-01-18 12:52:59 +00:00
5ef5204c8c
Implement simple team-based registration ( #620 )
...
* Implement simple team-based registration
Config required goes in the `teams` top-level property in config.json. This consists of an array of team objects:
```json
{
"name": "University of Bath",
"emailSuffix": "bath.ac.uk"
}
```
These can be selected on registration and require a user to have a certain email address in order to register as part of a team. This is for vector-im/riot-web#2940 . The next step would be sending users with emails matching the emailSuffix of a team to the correct welcome page as in vector-im/riot-web#2430 .
2017-01-18 12:48:28 +01:00
31df78f946
Use text-encoding-utf-8 as a TextEncoder polyfill
...
Somebody else seems to have done a good job of polyfilling TextEncoder, so
let's use that.
2017-01-18 11:39:44 +00:00
5dd1512ff2
Move aggregation code to dedicated function
2017-01-18 10:59:19 +01:00
484549e50b
Refactor a few things and document everything
2017-01-18 10:26:25 +01:00
2e3bdcf5c6
Markdown: Don't XML escape the output when not HTML
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 22:20:05 +01:00
49d60ff879
Markdown: softbreak is not HTML
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 21:04:12 +01:00
c819b433a2
Make old message composer use new markdown
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 20:37:27 +01:00
35d70f0b35
markdown: Only add \n\n on multiple paragraphs
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 20:32:06 +01:00
8288eb730c
a rather hacky implementation of theme switching
2017-01-17 19:13:23 +00:00
c2cdb626bd
let the tinter handle 'white' highlights of SVGs too
2017-01-17 19:13:04 +00:00
a87e7d6617
Make user search do a bit better on word boundary
2017-01-17 18:17:51 +00:00
3ba9f50873
Move functions around, remove redundancies, add docs
2017-01-17 19:07:45 +01:00
9574a0b663
Remove pointless length guard
2017-01-17 18:56:57 +01:00
893a5c971f
Fix escaping markdown by rendering plaintext
...
We still need to parse "plaintext" messages through the markdown
renderer so that escappes are rendered properly.
Fixes vector-im/riot-web#2870 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 16:23:58 +01:00
0b67fd5b4e
Add 'searching known users' to the user picker
...
So it's more obvious it's only finding people you've already seen
Fixes https://github.com/vector-im/riot-web/issues/2931
2017-01-17 14:48:50 +00:00
a18d94099e
switch to using <span/> for edit button
2017-01-17 14:11:15 +00:00
203172c886
typos
2017-01-17 14:11:01 +00:00
fcb1d7a664
Merge pull request #575 from kyrias/commonmark
...
Replace marked with commonmark
2017-01-17 11:57:08 +00:00
45655f4de3
Modified desc for invitation rejections, withdrawals
2017-01-17 12:01:19 +01:00
4f860b4c6d
Review comments: If-statement style
2017-01-17 10:50:44 +00:00
09ce74cc76
Fix a couple of minor review comments
2017-01-16 18:44:46 +00:00
aa6e168505
Remove comment
2017-01-16 18:58:53 +01:00
5ab287fa1a
Use pre-calculated displaynames to handle dupes
2017-01-16 18:57:49 +01:00
a79dc886ba
Order sequences by occurance of the first event in each sequence
2017-01-16 18:46:17 +01:00
f168f9cd06
Fix vector-im/riot-web#2833 : Fail nicely when people try to register numeric user IDs
2017-01-16 17:25:44 +00:00
ac22803ba0
Allow Modal to be used with async-loaded components
...
Add Modal.createDialogAsync, which can be used to display asynchronously-loaded
React components. Also make EncryptedEventDialog use it as a handy
demonstration.
2017-01-16 17:18:38 +00:00
4be444d524
Move shouldComponentUpdate
2017-01-16 15:12:00 +01:00
82d6805a71
Canonicalise certain transition pairs, handle arbitrary consecutive transitions
...
Transition pairs joined,left and left,joined are now transformed into single meta-transitions "joined_and_left" and "left_and_joined" respectively. These are described as "joined and left", "left and rejoined".
Treat consecutive sequences of transitions as repetitions, and handle any arbitrary repetitions of transitions:
...,joined,left,joined,left,joined,left,...
is canonicalised into
...,joined_and_left, joined_and_left, joined_and_left,...
which is truncated and described as
... , joined and left 3 times, ...
This also works if there are multiple consecutive sequences separated by other transitions:
..., banned, banned, banned, joined, unbanned, unbanned, unbanned,...
becomes
... was banned 3 times, joined, was unbanned 3 times ...
2017-01-16 14:49:07 +01:00
fb68fff536
Refactor renderCommaSeparated for reuse
2017-01-16 13:45:42 +01:00
d63f7e8359
Expose megolm import/export via the devtools
2017-01-14 01:34:34 +00:00
f8e56778ea
Encryption and decryption for megolm backups
2017-01-14 01:34:34 +00:00
1d5d44d63d
TextEncoder polyfill
...
Apparently Safari doesn't sport a TextEncoder, so here's a polyfill for it.
2017-01-14 00:45:51 +00:00
b323551f22
Adhered to code review
2017-01-13 19:36:41 +02:00
5e013860ee
Definition for AccessibleButton
2017-01-13 19:36:41 +02:00
959163f2ef
Proper accessible buttons
2017-01-13 19:36:41 +02:00
041196d729
Added quick search functionality
2017-01-13 19:36:40 +02:00
d2ff2715ce
Buttonified almost everything. Stylesheet is broken.
2017-01-13 19:36:40 +02:00
8d79716421
Turned the links to buttons to comply with MDN's recommendations
2017-01-13 19:36:40 +02:00
ad072cc179
Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons.
2017-01-13 19:36:40 +02:00
77ae041407
Order names by order of first events for users
2017-01-13 16:40:33 +00:00
dcd0acb2b5
Review comments
2017-01-13 15:17:34 +00:00
e196cfaf91
Show the error dialog when requests to PUT power levels fail
...
This is why I dislike Q.
2017-01-13 14:51:01 +00:00
d2d78919ce
Overhaul MELS to deal with causality, kicks, etc.
...
The MELS can now deal with arbitrary sequences of transitions per user, where a transition is a change in membership. A transition can be joined, left, invite_reject, invite_withdrawal, invited, banned, unbanned or kicked.
Repeated segments (modulo 1 and 2), such as joined,left,joined,left,joined will be handled and will be rendered as " ... and 10 others joined and left 2 times and then joined". The repeated segments are assumed to be at the beginning of the sequence. This could be improved to handle arbitrary repeated sequences.
2017-01-12 18:55:53 +00:00
cc8b3d4ba4
spell out email invites better
2017-01-12 13:46:19 +00:00
1f96467145
Merge pull request #609 from matrix-org/luke/fix-join-part-collapsing-redacted-joins
...
Fix redacted member events being visible
2017-01-11 17:10:35 +00:00
baaf827c48
Use `getStateKey` instead of `getSender`
...
This makes sure that the kickee is not the user used for the MemberEventListSummary
2017-01-11 17:03:14 +00:00
32185befc0
Only transform <font>
2017-01-11 16:41:05 +00:00
8e3f2eb858
Allow [bf]g colors for <font> style attrib
...
Instead of dropping the style attribute on `<font>` tags entirely, sanitise aggressively and only keep `background-color` and `color` keys, and also sanitise the values to prevent `url(XXXXXX)` and `expression(XXXXXX)` type XSS attacks.
2017-01-11 16:35:37 +00:00
6e2a75bbee
Fix redacted member events being visible
...
This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765 .
2017-01-11 11:27:07 +00:00
37d9108ceb
Add error popup if screen sharing fails
2017-01-11 10:06:48 +00:00
a16aae1124
Move screen sharing error check into platform
...
Because on the browser it depends on HTTPS, on electron it doesn't
matter.
2017-01-10 18:37:57 +00:00
13a5337e0f
Fix 'create account' link in 'forgot password'
...
Fixes https://github.com/vector-im/riot-web/issues/2853
2017-01-10 15:16:39 +00:00
ef88e02931
Add support for pasting into the text box
...
Only supports the new rich-text-supporting text editor
2017-01-08 02:21:36 +01:00
42de77e588
Remove "Cannot re-join empty room" error
...
This is a lying error message. burn it with fire
2016-12-27 19:17:48 +00:00
9c4671568d
fix disasterous thinko in 69b277b282
2016-12-24 22:33:04 +00:00
e2e3bc0637
improve captcha warning
2016-12-24 18:40:20 +00:00
69b277b282
ask electron users to do captchas in a web browser.
...
This will happen anyway when they follow email verification links.
make captchas poll for success so if they are completed elsewhere, electron moves on
2016-12-24 03:15:30 +00:00
b1c4c759f4
blind fix for captcha on electron
2016-12-23 14:35:40 +00:00
2a63017372
Account for timezone in date separator calculation ( #595 )
...
* Account for timezone in date separator calculation
Decide on date separators using MatrixEvent.getDate(). This requires matrix-org/matrix-js-sdk#311
2016-12-22 17:54:30 +00:00
fd44d9f4d6
Merge pull request #597 from matrix-org/dbkr/delete_threepid
...
Add support for deleting threepids
2016-12-22 15:31:34 +00:00
8a3f2d9e91
Merge pull request #598 from matrix-org/dbkr/display_msisdn_threepid
...
Display msisdn threepids as 'Phone'
2016-12-22 15:28:09 +00:00
a6fdbda011
Get variable name right
2016-12-22 15:26:08 +00:00
98b22460ec
They're not all emails anymore
2016-12-22 15:03:24 +00:00
7c841a86ef
Unbranded error messages
2016-12-21 14:28:01 -08:00
3dfffa385e
Display msisdn threepids as 'Phone'
...
rather than pretending only email exists
2016-12-21 18:56:50 +00:00
5e10ec4ece
Add support for deleting threepids
2016-12-21 18:49:38 +00:00
4804fb3a1c
Revert "Fix performance issues with wantsDateSeperator"
...
This change broke timezone handling, so that date-separators are shown at the
wrong time of day.
This reverts commit b908e7ef29
2016-12-21 09:48:41 +00:00
2658cd09b5
Fix scroll jumping when a video is decrypted
...
Call the `onWidgetLoad` prop on MVideoBody to notify the scroll panel to keep it's position when the size of the video widget updates.
2016-12-20 12:33:07 +00:00
d0d056e308
hide read markers
2016-12-20 02:26:23 +00:00
4be14080e1
Fix cancel button on uploads
2016-12-16 17:12:04 +00:00
b8c0fa507e
Merge pull request #590 from matrix-org/luke/fix-membereventlistsummary-performance
...
Improve the performance of MemberEventListSummary
2016-12-16 10:53:51 +00:00
7475056bb4
MELS component should update if there are fewEvents, effectively expanding the summary
2016-12-15 18:33:13 +00:00
6b52b247e7
Update comment on MELS key
2016-12-15 18:26:41 +00:00
88aeb6417e
Use the first member event ID or "initial" in the MELS key
2016-12-15 18:23:54 +00:00
71132c4610
Merge pull request #592 from matrix-org/kegan/bulk-reject-invites
...
Implement bulk invite rejections
2016-12-15 16:16:55 +00:00
ec41fc284a
Null guard on componentWillUnmount
2016-12-15 16:13:09 +00:00
55f85befc1
Allow component to update if currently expanded or if about to collapse
2016-12-15 14:43:59 +00:00
8a511ed54b
Add .done() to catch exceptions which may be thrown in setState
2016-12-15 14:17:29 +00:00
e7564f4dc5
Spelling
2016-12-15 13:16:36 +00:00
86739e7d1e
Simplify handling of only one member event
2016-12-15 13:15:00 +00:00
8f42134d9f
Explain why binding
2016-12-14 16:04:20 +00:00
b908e7ef29
Fix performance issues with wantsDateSeperator
...
This was causing rendering of MemberEventListSummary to be quite slow. Instead of creating two date objects, just check to see if they represent timestamps that happened on different days.
2016-12-14 16:01:32 +00:00
13dfe9ef0f
Implement bulk invite rejects
2016-12-14 16:00:50 +00:00
c07e5d4992
Improve the performance of MemberEventListSummary
...
- The MessagePanel now uses the same key for the MELS instances rendered so that entirely new instances are not created, they are simply passed new props (namely when new events arrive).
- MELS itself now uses `shouldComponentUpdate` so that it only updates if it is given a different number of events to previous or if it is toggled to expand.
2016-12-14 15:31:35 +00:00
1d4591ce68
Add UI in UserSettings for bulk rejecting invites
2016-12-14 15:01:50 +00:00
21e7b03e53
Merge pull request #586 from matrix-org/kegan/read-receipt-show-time-on-hover
...
Add read receipt times to the hovertip of read markers
2016-12-09 13:19:44 +00:00
5d99d68a64
Show the full date and time if the receipt was sent days after the event
2016-12-09 11:43:23 +00:00
49010c3e93
Refactor how 'readReceipts' are passed into EventTiles
...
Instead of passing a list of RoomMembers, pass a list of records with a
`roomMember` prop and a `ts` prop so we can display the timestamp on hover.
2016-12-09 11:24:10 +00:00
8d1095bc26
Don't throw exception on stop if no DMRoomMap
...
Prevents an exception when running the riot 'loading' tests in
isolation
2016-12-09 10:32:56 +00:00
bd7553d1ea
Add read receipt times to the hovertip of read markers
...
Fixes #2709 . Surprisingly, this data was never passed down to
ReadReceiptMarker.
2016-12-08 16:23:20 +00:00
587325b36c
Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir
...
Fix exception when clearing room dir search
2016-12-06 15:58:07 +00:00
fe0dc85d66
Merge pull request #583 from matrix-org/luke/fix-post-message-api-origin-check
...
Allow integration UI URLs with paths
2016-12-06 15:00:26 +00:00
9e3c94edf4
Fix exception when clearing room dir search
...
Needed more isMounted checks after promises return.
2016-12-06 14:59:10 +00:00
b3f642e835
Merge pull request #584 from matrix-org/dbkr/search_box_field_name
...
Give the search box field a name
2016-12-06 14:48:25 +00:00
a3ab59832e
Give the search box field a name
...
Should fix https://github.com/vector-im/riot-web/issues/2462
2016-12-06 14:40:09 +00:00
ef1cb9530f
Allow integration UI URLs with paths
...
The postMessage API assumed that event origins contained paths of their window origins, but they do not (https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage ). This changes the origin check such that the integrations UI URL must start with the event origin.
2016-12-06 14:30:21 +00:00
28e663dd48
Pass the room object into displayNotification
...
It needs it to do the view_room if the notification is clicked.
2016-12-06 13:27:36 +00:00
6777e07a41
Remove device name from crypto section
...
As it was getting it by assuming our device was the first one,
which is just not a valid assumption.
2016-12-05 20:03:43 +00:00
8ffe14881e
Don't throw an exception entering settings page
...
if end to end encryption is disabled (eg. if you're a guest and
the server is too old to support e2e for guests).
2016-12-05 18:33:38 +00:00
f321c6c346
Strip (IRC) when clicking on username
...
Fixes vector-im/riot-web#2072 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-03 01:20:50 +01:00
81e429eb14
Fix e2e attachment download by using iframes. ( #562 )
...
* Render attachments inside iframes.
* Fix up the image and video views
* Fix m.audio
* Comments, and only use the cross domain renderer if the attachment is encrypted
* Fix whitespace
* Don't decrypt file attachments immediately
* Use https://usercontent.riot.im/v1.html by default
* typos
* Put the config in the React context.
Use it in MFileBody to configure the cross origin renderer URL.
* Call it appConfig in the context
* Return the promises so they don't get dropped
2016-12-02 14:21:07 +00:00
5665a0ef37
Fix scroll jump on image decryption
...
`onWidgetLoad` is now being called when an image has been decrypted so that the ScrollPanel maintains its scroll position (whether it's stuckAtBottom or not). This attempts to fix https://github.com/vector-im/riot-web/issues/2624
2016-12-02 11:11:35 +00:00
5d03543f85
Make cut operations update the tab complete list
2016-11-30 10:49:40 +00:00
5f160d2e7f
Markdown: Use .call instead of .bind
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-11-30 01:03:05 +01:00
4d2926485b
Replace marked with commonmark
...
Marked has some annoying bugs, and the author is inactive, so replace it
with commonmark.js, which is the reference JavaScript implementation of
CommonMark. CommonMark is also preferable since it has a specification,
and a conformance test suite to make sure that parsers are correct.
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-11-29 23:14:04 +01:00
c7fb83ed2d
s/block/blacklist for e2e
...
Fixes https://github.com/vector-im/vector-web/issues/2315
2016-11-29 18:48:43 +00:00
21d65d2ad1
Fix the download icon on attachments
2016-11-25 23:19:20 +00:00
8547d00f32
Don't default the page_type to room directory
...
As it breaks the behaviour of redirecting to /#/directory
2016-11-24 16:39:48 +00:00
2aba646acd
Clear room alias etc. on logout
2016-11-24 14:58:37 +00:00
0069393650
Go back to same room after logging in
2016-11-24 13:28:51 +00:00
0bc4659fe0
Fix crash on logging in
...
If you arrived at the page via a link to a room.
Fixes https://github.com/vector-im/vector-web/issues/2634
2016-11-24 12:33:31 +00:00
6e6bcf8b78
Reinstate missing sections from the UserSettings
...
The 'devices' and 'cryptography' sections got removed from UserSettings by #566 .
2016-11-23 11:08:21 +00:00
42fc7b1b66
Use UNFILL_REQUEST_DEBOUNCE_MS constant, reset unfillDebouncer timeout reference.
2016-11-22 17:23:06 +00:00
d1a5d94916
Make the unpagination process less aggressive
...
This increases `UNPAGINATION_PADDING` (see the ASCII on ScrollPanel.js, `_getExcessHeight`), and also debounces unfilling requests made for 200ms. This forces unfilling requests not to be sent unless the next 200ms has no scrolling, effectively.
2016-11-22 16:47:56 +00:00
06f12b91b8
Merge pull request #566 from matrix-org/rav/remove_dead_labs_settings
...
Get rid of always-on labs settings
2016-11-21 10:38:06 +00:00
4476b09ce7
Get rid of always-on labs settings
...
If the setting is on by default, it's not much use as a Labs setting. The E2e
setting was only confusing everyone anyway.
2016-11-21 10:25:48 +00:00
03988015aa
Fix 'Quote' for e2e messages
...
Fixes https://github.com/vector-im/vector-web/issues/2612
2016-11-21 09:19:40 +00:00
2e691240ae
fix e2e disclaimer
2016-11-19 02:44:36 +02:00
8a5678efdd
boldify the preview bar click
2016-11-19 01:20:09 +02:00
7cb3c0935b
Make the spinner smaller, don't decrypt files as eagerly ( #564 )
2016-11-18 20:08:26 +00:00
341175ea58
Fix pagination issue where recent events are lost ( #563 )
...
Fix pagination issue where recent events are lost
Scrolling up a few pages followed by scrolling down to the most recent events previously caused some events to go missing. A test has been modified in conjunction with this fix to make sure that this failure mode is tested for in future. This commit should fix the issue, and the most recent events should be paginated back in.
2016-11-18 11:15:14 +00:00
f3582edb99
Merge pull request #560 from matrix-org/luke/fix-join-part-collapsing-regressions2
...
Fix more membership change collapsing bugs
2016-11-16 16:33:18 +00:00
7e88f0083d
Fix more join-part collapsing regressions
...
Use the previous content of the first event known for a user in a block of membership changes. This means single events are not special cased.
2016-11-16 16:26:24 +00:00
3618b49982
Use new js-sdk public unpaginate
2016-11-16 16:10:23 +00:00
324448563a
If only one mevent, return than one
...
Also, the net change of nil is detected as having the first and last events being _different_. The summary should only include those that have their first and last events being the _same_ because that is a net change (within the block of member events).
2016-11-16 16:07:19 +00:00
beecbc7cd7
Fix join/part collapsing regressions ( #553 )
...
* Fix join/part collapsing regressions
* Simplify loop
* Explain e,e
* Explain return null in _renderSummary
* Kill it properly
* Move . to _renderSummary
* Only use the first and last events to decide whether a net change has occured
* Do not sort events by TS before summarising
* fix loop and comment
* remove data-number-events
* Better explanation comment in _renderSummary
* Less tortuous comment
2016-11-16 14:42:30 +00:00
b718f1542c
Fix infinite loop when there are a lot of invisible events ( #554 )
...
Instead of using a window of a fixed number of events, unpaginate based on the distance of the viewport from the end of the scroll range.
The ScrollPanel uses the scrollTokens to convey to its parent (the TimelinePanel, in this case) the point to unpaginate up to. The TimelinePanel then takes a chunk of events off the front or back of `this.state.events` using `timelineWindow.unpaginate`.
Fixes https://github.com/vector-im/vector-web/issues/2020
2016-11-16 14:25:52 +00:00
6ccc825f0d
Cache the tinted SVGs for MFileBody as data URLs ( #559 )
...
* Use a list of callbacks for things that need tinting.
Rather than gutwrenching the internals of TintableSVG inside the Tinter.
* Share a data: url for the tinted download svg in MFileBody
* Check image exists before tinting
* Add comments
* Use fetch+DomParser rather than XMLHttpRequest
* Remove comment about XMLHttpRequest
2016-11-16 14:16:51 +00:00
218ced0276
Merge pull request #557 from matrix-org/rav/show_padlock_on_unencrypted_room
...
Show an open padlock for unencrypted rooms
2016-11-16 13:03:52 +00:00
595493e5bb
Clean up MFileBody.presentableTextForFile
2016-11-15 15:58:24 +00:00
bb776c217d
Merge pull request #556 from matrix-org/rav/decrypt_after_keys_arrive
...
Update eventtiles when the events are decrypted
2016-11-15 14:56:21 +00:00
a3d4ed5aee
Show an open padlock for unencrypted rooms
...
Also, add a tooltip, and enlarge the img to 12px wide, because the open padlock
looked silly at 10px and they both look fine at 12px
2016-11-15 12:31:17 +00:00
ec999f6fa1
Merge pull request #552 from matrix-org/rav/event_tile_withmatrixclient
...
Update EventTile to use WithMatrixClient instead of MatrixClientPeg
2016-11-15 11:25:48 +00:00
13f28e53e1
Generate thumbnails when sending m.image and m.video messages. ( #555 )
...
* Send a thumbnail when sending a m.image
* Use the 'thumbnail_file' when displaying encrypted images
* Whitespace
* Generate thumbnails for m.video
* Fix docstring, remove unused vars, use const
* Don't change the upload promise behaviour
* Polyfill for Canvas.toBlob to support older browsers
* Lowercase for integer types in jsdoc
2016-11-15 11:22:39 +00:00
b209cc551e
Update eventtiles when the events are decrypted
...
Events are sometimes decrypted after they arrive, so add an eventlistener for
it and update the tile.
2016-11-15 11:12:52 +00:00
0e8a49ebb7
Update EventTile to use WithMatrixClient instead of MatrixClientPeg
2016-11-14 16:00:24 +00:00
69f6393ed9
try to make joining rooms more obvious
2016-11-13 14:13:21 +00:00
a967ddd1cb
quick and dirty support for custom welcome pages, with an example for geektime techfest
2016-11-13 14:10:46 +00:00
34df6ea242
Complete attachment-encryption patch
...
https://github.com/matrix-org/matrix-react-sdk/pull/533 originally landed in
the wrong branch, and was reverted by
https://github.com/matrix-org/matrix-react-sdk/pull/546 .
https://github.com/matrix-org/matrix-react-sdk/pull/548 attempted to land it on
the develop branch, but omitted a small amount of the patch.
This lands the final part, which got missed out.
2016-11-12 12:20:36 +00:00
2eb9d90b86
Disable conference calling for encrypted rooms
2016-11-11 15:49:21 +00:00
1ff3a86457
Merge pull request #548 from matrix-org/markjh/encrypted-attachments
...
Encrypt attachments in encrypted rooms
2016-11-11 14:49:52 +00:00
72d24f58d0
Make the promises be q promises
2016-11-11 13:57:45 +00:00
9edfea3b32
Make imports more consistent, fix m.video
2016-11-11 13:57:45 +00:00
bf5ecbd016
Review comments
...
Conflicts:
src/ContentMessages.js
2016-11-11 13:57:42 +00:00
734c4eb638
Fix gif hoverover
2016-11-11 13:57:11 +00:00
de384480c6
Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself.
...
Conflicts:
src/components/views/messages/MImageBody.js
2016-11-11 13:57:08 +00:00
736ab743ee
Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded
...
Conflicts:
src/components/views/messages/MImageBody.js
2016-11-11 13:56:30 +00:00
ee1768f644
Use data:// URI rather than blob: URI to avoid XSS
2016-11-11 13:55:57 +00:00
b69e88d4e3
Decrypt m.file attachments
2016-11-11 13:55:57 +00:00
4e01a4f692
Decrypt m.audio attachments
2016-11-11 13:55:57 +00:00
48340a2817
Fix unencrypted video thumbnail
2016-11-11 13:55:57 +00:00
b56417f46e
Remove spurious TODO
2016-11-11 13:55:57 +00:00
95e8889857
Decypt m.video events
2016-11-11 13:55:57 +00:00
a4a0d02848
Move decryptFile into a utility function so that it can be shared between different components
...
Conflicts:
src/components/views/messages/MImageBody.js
2016-11-11 13:55:48 +00:00
5109833c42
Use correct prop types
2016-11-11 13:55:32 +00:00
49b3aec1e2
Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates
...
Conflicts:
src/ContentMessages.js
src/components/views/messages/MImageBody.js
2016-11-11 13:54:07 +00:00
2a1d32f4d5
Add key prop to memberlist summary
2016-11-11 13:49:25 +00:00
23e764604c
Merge remote-tracking branch 'origin/master' into develop
2016-11-11 12:00:53 +00:00
61921327c2
Merge remote-tracking branch 'origin/master' into develop
2016-11-11 12:00:30 +00:00
1e163eabf0
Revert "Encrypt attachments in encrypted rooms,"
2016-11-11 11:59:08 +00:00
998690431f
Merge pull request #542 from matrix-org/dbkr/get_app_version
...
Fix the vector web version in UserSettings
2016-11-11 11:11:36 +00:00
00ecff7497
Merge pull request #544 from matrix-org/luke/feature-truncate-m-room-member-events
...
Truncate consecutive member events
2016-11-11 11:01:47 +00:00
857c0d1747
Wrap getAppVersion() in promise
...
in case it throws
2016-11-11 10:05:53 +00:00
d3a548773a
Remove redundant lines
2016-11-10 18:01:34 +00:00
3d7f6919cf
Refactor renderNameList (thanks, @richvdh)
2016-11-10 17:36:22 +00:00
0695037f5f
pass in prop onClick by default
2016-11-10 17:30:35 +00:00
87e8f0e4da
trailing commas
2016-11-10 17:27:59 +00:00
3ec7940d12
Inline renderEvents
2016-11-10 17:26:36 +00:00
d2d7ebc979
correct comment
2016-11-10 17:22:16 +00:00
b11dd9542f
Add class to expand link for pointer and colour
2016-11-10 17:09:18 +00:00
e05aeb35a1
npm run reskindex
2016-11-10 17:03:24 +00:00
ac460122cc
revert now redundant TruncatedList edits
2016-11-10 15:51:27 +00:00
f71ac93946
Prefer null to falsy, use correct plural
2016-11-10 15:38:20 +00:00
1a4df38500
remove href
2016-11-10 15:20:53 +00:00
d8bc4d9a6f
Factor out avatar click leads to view_user
2016-11-10 15:18:59 +00:00
6b2aa43b71
Factor out "and others"
2016-11-10 14:33:41 +00:00
d6b74becfc
Children are required
2016-11-10 14:12:45 +00:00
370f5f0a11
Use _ prefix for private methods
2016-11-10 14:12:05 +00:00
8422017827
events are required
2016-11-10 14:09:40 +00:00
dcbb31279f
Prefer import React, set prevEvent to last MemberhsipChange
2016-11-10 14:08:11 +00:00
e2936376b6
Unnecessary props
2016-11-10 13:26:27 +00:00
566034cf2b
Render children EventTiles before passing to summary element
2016-11-10 13:25:48 +00:00
764959ec1c
Comment on i after membershipchanges
2016-11-10 13:14:04 +00:00
0ec5eebfc9
Hoist isMembershipChange out of for loop
2016-11-10 13:03:17 +00:00
d01bb0b78f
Use sdk.getComponent
2016-11-10 13:01:48 +00:00
79c01fa1a4
Remove empty lines
2016-11-10 11:03:43 +00:00
f5bc8d1fe0
Removed logs, updated phrasing on 'others joined'
...
Now it's:
1 user joined and left
>1 others joined and left
2016-11-10 10:42:33 +00:00
5f0b891d47
Add date seperator to the expanded events
...
netsplits across midnight is not handled, and @richvdh suggested splitting the list in two
2016-11-09 17:44:43 +00:00
04a934f738
Trying to get rid of the date separator problem
2016-11-09 16:24:56 +00:00
2f02c4b84e
WIP nicer join/part folding
2016-11-09 16:03:35 +00:00
f2222c84a8
Merge pull request #545 from matrix-org/dbkr/fix_ctrl_e
...
Fix the ctrl+e mute camera shortcut
2016-11-08 18:37:58 +00:00
a008f5010a
Fix the ctrl+e mute camera shortcut
...
* Fixes the altgr+e shortcut on Windows
(Fixes https://github.com/vector-im/vector-web/issues/2561 )
* Fixes the shortcuts to be cmd+e on mac rather than ctrl+e
which is more normal and doesn't clobber ctrl+e which old
school unix types use for go-to-end-of-line.
2016-11-08 18:04:22 +00:00
cd241a4a17
Truncate consecutive member events
...
This is needed for the IRC bridge to be able to do full membership list syncing without cluttering the message panel.
2016-11-08 16:34:02 +00:00
c838164f40
Make the promises be q promises
2016-11-08 16:26:25 +00:00
93ddb5539e
Make imports more consistent, fix m.video
2016-11-08 12:57:24 +00:00
d871ca2b24
PR feedback
2016-11-08 11:43:24 +00:00
911f9e4e63
Review comments
2016-11-08 11:42:20 +00:00
de83e578e7
Use generic error message
2016-11-08 11:18:44 +00:00
c0c662aeaf
Show the error that occured when trying to reach scalar
...
Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.
2016-11-08 10:57:48 +00:00
d44adcb7a9
Fix the vector web version in UserSettings
...
Add a getAppVersion() function to the platform rather than relying
on the updater code firing an event before we know what the app
version is.
2016-11-08 10:45:19 +00:00
5c2c01d414
Fix function to consistently return boolean
2016-11-07 11:45:55 +00:00
2bb7aec0de
Don't do URL previews for matrix.to
2016-11-07 10:57:08 +00:00
2ee98e9fdc
Fix NPE in LoggedInView
...
Fixes a NPE displaying the new version bar
(also fix displayname for WithMatrixClient)
2016-11-07 09:28:10 +00:00
dc679a8eca
Fix gif hoverover
2016-11-04 18:41:05 +00:00
4214c67f8f
Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself.
2016-11-04 18:20:20 +00:00
1529396ef5
Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded
2016-11-04 18:09:12 +00:00
8f778f54fd
Use data:// URI rather than blob: URI to avoid XSS
2016-11-04 15:39:39 +00:00
6ea0085290
Decrypt m.file attachments
2016-11-04 14:00:26 +00:00
94bfe31857
Decrypt m.audio attachments
2016-11-04 13:45:00 +00:00
91123431dd
Fix unencrypted video thumbnail
2016-11-04 13:13:25 +00:00
71c002d588
Remove spurious TODO
2016-11-04 13:08:17 +00:00
48cfd4f399
Decypt m.video events
2016-11-04 13:05:34 +00:00
b6653dd0ed
Move decryptFile into a utility function so that it can be shared between different components
2016-11-04 12:46:45 +00:00
12fc70c671
Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates
2016-11-04 11:52:47 +00:00
04c27205a3
Make room alias & user ID links matrix.to links
2016-11-04 11:38:28 +00:00
f301e55b6e
Merge remote-tracking branch 'origin/develop' into rav/memberinfo_use_client_from_context
2016-11-04 10:54:32 +00:00
da10660c86
Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context
2016-11-04 10:35:41 +00:00
cb5b311e44
Move saveScrollState into RoomView
...
It fits much more naturally here than in LoggedInView.
2016-11-04 09:28:35 +00:00
ab7007784f
Make MemberInfo use the matrixclient from the context
...
An arbitrary component to demonstrate how this works
2016-11-03 19:05:48 +00:00
d3f20e1d9d
Add the MatrixClient to the react context
...
Because that's the reacty way
2016-11-03 19:02:27 +00:00
f85a37c667
Factor out LoggedInView from MatrixChat
...
The idea here is to make a layer which sits around for as long as we have a
valid MatrixClient. Also it makes a plausible split for the render of
MatrixChat, even if they are much too tightly bound for now.
2016-11-03 18:59:32 +00:00
842b5aed56
The variable is called roomId here
2016-11-03 17:13:02 +00:00
e949d91162
Handle decryption errors
2016-11-03 16:39:20 +00:00
8cafe4936d
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-03 11:51:06 +00:00
d408b7c180
Fix copyright
2016-11-03 11:47:57 +00:00
5ae4228bfe
Merge remote-tracking branch 'origin/develop' into dbkr/platform_version
2016-11-02 19:45:40 +00:00
743e54f9bb
Specify promise arg
2016-11-02 19:23:09 +00:00
bd3fa6a7c5
Move version specific stuff to vector
2016-11-02 17:44:57 +00:00
920e3346dc
Move Notifications into Platform
...
Also add support for clearing notifications if the Platform
supports it.
2016-11-02 17:35:31 +00:00
b057577b15
Merge branch 'develop' into dbkr/platform_version
2016-11-02 16:34:43 +00:00
e0cea74c7e
Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them
2016-11-02 16:26:10 +00:00
29bdf992ff
s/fir/for/
2016-11-02 16:15:35 +00:00
3c4370c180
Move 'new version' support into Platform
...
Also adds support for the platform providing a changelog
2016-11-02 15:58:17 +00:00
f433f9ca32
Move platform-specific functionality into Platform
...
Platform classes are provided by the application via
PlatformPeg.set().
2016-11-02 15:10:21 +00:00
a53c1958eb
Merge pull request #527 from matrix-org/dbkr/highlight_async
...
Run highlight.js asynchronously
2016-10-27 09:57:23 +01:00
974e4c05c8
Merge pull request #528 from matrix-org/rav/fix_tinting
...
Fix room tinting
2016-10-27 09:57:00 +01:00
6246fdee7c
Fix room tinting
...
Looks like the cachebuster stuff in
https://github.com/vector-im/vector-web/pull/2515 broke room tinting. Add a
fix, along with some ranting.
2016-10-26 23:11:34 +01:00
8cf273a460
Run highlight.js asynchronously
...
Move the very minimal logic of highlightDOM into TextualBody
because then we can avoid scheduling a lot of timeouts which
would ultimately do nothing (ie. any messages that don't have code
blocks).
2016-10-26 18:41:28 +01:00
8395717f9b
Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join
...
Fix CPU spin on joining rooms
2016-10-26 15:46:42 +01:00
32ebd8083b
Stray comma
2016-10-26 15:32:09 +01:00
e5a770a373
Don't send read receipt if user has logged out
2016-10-26 13:19:36 +01:00
a2eb0a9cf0
Fix CPU spin on joining rooms
...
Ratelimit roomheader's updates and move some other things into
rate limited functions.
2016-10-26 13:09:53 +01:00
923d2264dd
Ignore components with no default export
...
InteractiveAuthEntryComponents is not a single component and
doesn't really fit into the structure: ignore it, otherwise
we crash when loading the skin.
2016-10-17 16:24:09 +01:00
022eb575d9
Upgrade to babel6 and enable some presets.
2016-10-17 16:23:25 +01:00
4f901f1894
Keyboard shortcuts to mute microphone/camera
...
Same as hangouts: ctrl-d for mute microphone; ctrl-e to mute camera.
2016-10-17 14:13:56 +01:00
3f067cbdf6
Give our input fields names
...
Otherwise browsers' 'Remember Password' feature has to guess
badly and ends up putting the login username / password in the
first two password reset fields which is a bit odd.
2016-10-14 15:34:44 +01:00
920f498925
Merge pull request #517 from matrix-org/rav/interactive_auth_on_device_delete
...
Interactive auth for device delete
2016-10-12 18:31:38 +01:00
ef22ba1f39
Merge pull request #516 from matrix-org/rav/interactive_auth_dialog
...
InteractiveAuthDialog
2016-10-12 18:27:23 +01:00
999a9e34b9
Merge pull request #514 from matrix-org/dbkr/prevent_email_spam
...
Prevent spamming emails by reusing client secret
2016-10-12 14:40:39 +01:00
1e683427da
TODO comments on the registration flow
...
Add some notes to Signup and the Registration component that it would be nice
to factor out some common code someday.
2016-10-12 14:27:21 +01:00
1a81397d31
InteractiveAuthDialog
...
A dialog which will take the user through an interactive-auth process
2016-10-12 08:23:28 +01:00
5c18a9ccca
Interactive auth for device delete
2016-10-12 08:23:08 +01:00
eb36509620
Refactor CaptchaForm to put less logic in signupstages
...
A bunch of work being done in the Recaptcha signupstage makes more sense in
the CaptchaForm; let's move it.
2016-10-11 18:57:51 +01:00
c45b076df9
More commentary
2016-10-11 18:13:26 +01:00
6ffb7efc9b
Prevent spamming emails by reusing client secret
...
Generate a client secret in the Signup class (if we don't already
have one) and re-usae it for subsequent attempts to register,
that way the IS can honour the sendAttempt flag and not re-send
the email if we're just retrying and requestToken becomes
idempotent.
2016-10-11 18:08:18 +01:00
78c3d5943a
Fix a load of warnings in the tests
...
Stub things out to make the tests not throw warnings, so we can see the actual
problems.
2016-10-11 14:20:40 +01:00
b62fb50619
Add some docs for the lifetime of Signup
2016-10-11 11:58:10 +01:00
30319d8e44
Fix registration retry
...
We need to clear the current stage & start from the beginning
again when we start a new registration attempt.
2016-10-11 11:12:02 +01:00
55d14d2adc
Fix registration
...
null check
2016-10-11 10:48:44 +01:00
acf76c2e28
Fix bug where riot would keep requesting tokens
...
We 'activeStage' is an object: we need to check the type
2016-10-11 10:18:40 +01:00
3756add402
Merge pull request #502 from matrix-org/dbkr/join_3p_location
...
Move 'show join button' functionality out
2016-10-05 14:00:14 +01:00
9d303712f2
more s/Vector/Riot/
2016-10-03 10:18:43 +01:00
91771ec17d
Ce n'est pas Python
2016-10-01 10:34:21 +01:00
6abf6c9ec0
Merge pull request #505 from matrix-org/dbkr/dont_replacestate
...
Fix version going blank after logging in
2016-09-30 14:32:01 +01:00
be99f17ee0
Oops, right variable
2016-09-30 14:05:01 +01:00
8aeb0cfb68
Dedicated function for resetting screen state
2016-09-30 11:56:32 +01:00
c41a8da4be
Argh, there's more
2016-09-30 11:40:27 +01:00
2f7366cb8a
Comment state fields
2016-09-30 11:37:50 +01:00
dca19a4940
Merge pull request #506 from matrix-org/dbkr/sign_in_not_log_in
...
Use 'Sign In' / 'Sign Out' universally
2016-09-30 11:30:00 +01:00
302074c71f
Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined
...
Prevent error when clicking 'log in'
2016-09-30 11:04:18 +01:00
ca5204c3f8
fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381
2016-09-30 00:17:52 +01:00
d5af2d2c52
Use 'Sign In' / 'Sign Out' universally
...
Rather than a mix of 'sign in/out' and 'log in/out'
2016-09-29 17:38:52 +01:00
8cbddfcf28
Fix version going blank after logging in
...
Don't use replaceState in MatrixClient: there's lots of stuff in
MatrixClient's state now (including the app version) so replacing
the entire state doesn't really make sense (and also blows away
all of the nice defaults we set in getInitialState). Instead,
setState of the things we actually care about wherever we used
replaceState.
Also add a couple of state variables to getInitialState that were
missing.
Fixes https://github.com/vector-im/vector-web/issues/2322
2016-09-29 17:23:07 +01:00
7b28dde263
Prevent error when clicking 'log in'
...
If you joined a room before clicking 'log in', it would throw an
exception here and break.
2016-09-29 16:57:10 +01:00
60ce49910a
Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper
...
Make RTE mode use the new Markdown wrapper class
2016-09-29 15:33:18 +01:00
9a633ee449
Move 'show join button' functionality out
...
And have it as a prop to the directory search box instead, so the
room directory can do more complex logic.
2016-09-29 15:05:15 +01:00
66ef1e8156
Merge pull request #501 from matrix-org/dbkr/get_hs_name
...
Add 'getHomeServerName' util to client peg
2016-09-28 10:22:11 +01:00
4942f4f35c
Typo
2016-09-28 10:17:47 +01:00
b366973151
let anyone create aliases - fixes https://github.com/vector-im/vector-web/issues/1585
2016-09-27 23:39:25 +01:00
c7ad9bfdad
Add 'getHomeServerName' util to client peg
2016-09-27 19:38:10 +01:00
b9576754e6
Nomenclature
2016-09-27 14:50:18 +01:00
ea25e48ccb
Merge pull request #499 from matrix-org/dbkr/fix_markdown_links
...
Fix markdown link syntax
2016-09-27 11:57:03 +01:00
e403bcd770
Merge pull request #500 from matrix-org/dbkr/linkify_fail_fast
...
Fail hard & fast if linkifyjs version is wrong
2016-09-27 11:29:39 +01:00
30ce35c3b4
Merge pull request #498 from matrix-org/dbkr/fast_lgm
...
Bring back the little green men without slowness
2016-09-27 11:28:48 +01:00
0448dca832
Fail hard & fast if linkifyjs version is wrong
...
Rather than carrying on an ending up with undefineds deep within the bowels of linkifyjs when we try to linkify a room alias.
2016-09-27 10:38:01 +01:00
2be1cc9f85
Give DMRoomMap an explicit makeShared
...
Otherwise it will hang on to the old state client on logout.
2016-09-27 09:56:31 +01:00
9bffd8da75
Fix markdown link syntax
2016-09-26 20:09:36 +01:00
690309adfc
Bring back the little green men without slowness
...
Introduces a singleton DMRoomMap that subscribes to account data to keep itself up to date so we don't have to keep doing the map inversion for each room tile.
2016-09-26 18:02:14 +01:00
2e1644877d
Merge pull request #496 from matrix-org/dbkr/directory_search_box
...
Directory search join button
2016-09-26 15:38:45 +01:00
ba090a1198
Trailing .+ was redundant
2016-09-26 15:13:57 +01:00
9333f91533
Give react callbacks underscores too
2016-09-26 14:29:12 +01:00
2dd0165bfc
Correct regex for hash at the start
2016-09-26 14:24:35 +01:00
bbfc05b0c0
Fix name of text emote sending & fix tests
2016-09-26 10:20:56 +01:00
40ba1ff5aa
disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343
2016-09-24 00:43:46 +01:00
bf037ed6c7
Add comment
2016-09-23 19:09:32 +01:00
db3f0d298a
Make RTE mode use the new Markdown wrapper class
...
Equivalent of https://github.com/matrix-org/matrix-react-sdk/pull/492 for rich text mode
2016-09-23 18:50:25 +01:00
fa193e775a
Implement join button appearing
...
Also switch input to controlled so we re-render when it changes so we can show/hide the join button
2016-09-23 16:34:47 +01:00
eb5b175213
Layout to support less hardcoded CSS
2016-09-23 15:58:11 +01:00
b1e4c911eb
WIP omnipresent join button
2016-09-23 15:25:38 +01:00
6281d76ade
Merge remote-tracking branch 'origin/develop' into dbkr/directory_search_box
2016-09-23 14:43:13 +01:00
18cbd452b0
Merge pull request #495 from matrix-org/dbkr/irc_links
...
Fix links to IRC rooms
2016-09-23 14:31:30 +01:00
d0a15975c8
Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive
...
Make markdown less aggressive
2016-09-23 14:31:20 +01:00
90c9d51c7d
Typos
2016-09-23 14:15:48 +01:00
2120963c7a
More linkifier fixes
...
* Accept underscores in usernames
* Accept usernames & room aliases on localhost
* Accept #localhost:foo.com and @localhost:foo.com
2016-09-23 14:02:14 +01:00
fae9b048dd
Merge remote-tracking branch 'origin/develop' into dbkr/irc_links
2016-09-23 13:50:03 +01:00
eeac0619f4
reskindex
2016-09-23 13:49:35 +01:00
61b48a5b1a
Add component for the directory search box
2016-09-23 13:48:24 +01:00
dd2da20031
Add the deviceId back to memberdeviceinfo
...
It was removed by @ara4n in 5fa5489
2016-09-22 19:28:50 +01:00
2f7b4f74fd
Move the device verification buttons to their own class
...
Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog
for utterly no reason and breaking everything
2016-09-22 19:24:09 +01:00
6ba20ec012
Better logic for wrapping in p tags or not
2016-09-22 18:57:46 +01:00
de0c92dadf
Remove unused code
2016-09-22 18:37:14 +01:00
ca240b0b85
Don't wrap everything in p tags
...
Preserves the old behaviour of not wrapping everything in p tags,
but also returns valid markup if the resulting markdown contains
multiple paragraphs (previously it stripped the <p> from the start
and the </p> from the end, leaving closing and opening paragraph tags
in the middle of the returned markup).
Also turn on the 'xhtml' option so marked uses self-closing tags
for br's, hr's and so forth.
2016-09-22 18:17:02 +01:00
0eddea1937
Disable link detection, as per comment
2016-09-22 17:51:34 +01:00
6c7259eec8
Better detection of when input contains markdown
2016-09-22 17:18:12 +01:00
898fbcee30
Merge pull request #489 from aviraldg/fix-2128
...
Force-hide autocomplete after sending message.
2016-09-22 10:49:23 +01:00
c228fac6d9
Merge pull request #488 from aviraldg/fix-2180
...
force old selection state after creating entities
2016-09-22 10:49:10 +01:00
77c4cd337e
Merge branch 'develop' into dbkr/irc_links
2016-09-22 09:50:18 +01:00
5fff3bdf24
Document brokenness
2016-09-21 16:25:18 +01:00
8ae210cbe2
Revert #333
...
Revert https://github.com/matrix-org/matrix-react-sdk/pull/333/files since sanitizer blindly allows urls with no scheme, meaning // links can be used to fetch images over whatever scheme you serve vector over (ie. normally http/https).
2016-09-21 16:19:41 +01:00
59117f1905
Fix linkifying rooms with underscores, try 2
...
Fixes https://github.com/vector-im/vector-web/issues/500
2016-09-21 14:11:43 +01:00
b83d1db24a
Missed some Vectors
2016-09-21 14:03:35 +01:00
5fa67d9617
Merge pull request #490 from matrix-org/rav/encrypted_event_dialog
...
EncryptedEventDialog updates
2016-09-21 10:52:22 +01:00
2842506b27
EncryptedEventDialog updates
...
* Separate info on the event from info on the device, and add a couple of new
fields.
* Use MatrixClient.getEventSenderDeviceInfo (requires
https://github.com/matrix-org/matrix-js-sdk/pull/214 )
* Don't force a download of the device keys every time we open the dialog
* Fix a react warning if the device query takes a while
2016-09-21 10:36:23 +01:00
5b216df28e
Not joined members any more
2016-09-21 09:57:17 +01:00
f171985e4c
Fix click-to-complete in RTE
...
Closes vector-im/vector-web#2179
2016-09-21 07:40:48 +05:30
44217422d0
Force-hide autocomplete after sending message.
...
Fixes vector-im/vector-web#2128
2016-09-21 07:28:07 +05:30
ea1419ff78
force old selection state after creating entities
...
Fixes vector-im/vector-web#2180
2016-09-21 07:20:50 +05:30
d1a5e54a69
Check if a room looks like a DM rooms on joining
...
and mark it as one if so.
Also change the heuristic to only count rooms with 2 total members rather than 2 joined members, otherwise this is going to mark any room as a DM if someone creates a room, invites a bunch of people and you happen to be first to join.
2016-09-20 17:59:46 +01:00
b66c449bd7
Comment typo
...
and out comment in more sensible place
2016-09-20 16:08:11 +01:00
a2904ad33f
fix 'new chat' layout bug
2016-09-20 10:06:57 -04:00
746aad9a18
Oops, missed one
2016-09-19 14:47:08 +01:00
c40a7a696e
Merge pull request #485 from matrix-org/dbkr/riot
...
Rebrand
2016-09-19 13:36:55 +01:00
31753fc3f3
Rebrand
2016-09-19 13:26:59 +01:00
b348cf1244
actually apply scalar CSS :(
2016-09-19 07:01:46 -04:00
993bb5c89d
Pass close_scalar postMessage action through to the dispatcher
2016-09-19 10:38:42 +01:00
7691559e01
more disclaimer
2016-09-17 22:07:43 +01:00
53bb6b96ce
don't warn when disabling crypto
2016-09-17 21:56:10 +01:00
5fa5489bbd
disambiguate devices by ID in memberinfo
2016-09-17 20:12:56 +01:00
6e57faecb0
trim whitespace when adding to list
2016-09-17 16:14:02 +01:00
da85df9d1a
let comma trigger autocomplete. hook up backspace. search displaynames that include space
2016-09-17 15:21:08 +01:00
88273e8065
move admin tools to the top
2016-09-17 15:07:41 +01:00
cf1b1442eb
no labs for guests
2016-09-17 14:29:40 +01:00
0046ae50b5
switch to 3-digit formatting for counts
2016-09-17 02:39:19 +01:00
c51e6907f0
fix spinner on createroom
2016-09-17 02:19:32 +01:00
026a2e6c7c
fix guest login when in a RoomView
2016-09-17 02:19:27 +01:00
671eacaac7
fix self/this crash, and don't let guests invite
2016-09-17 02:05:27 +01:00
736b6dac7a
default labs correctly :/
2016-09-17 00:54:56 +01:00
96fd460cc8
fix import
2016-09-16 23:29:35 +01:00
cfba600961
Merge pull request #482 from aviraldg/fix-2165
...
Replace <p>s with <br/>s consistently
2016-09-16 22:46:41 +01:00
00d2fd471d
Merge pull request #483 from matrix-org/dbkr/scrollpanel_start_at_bottom
...
Add 'startAtBottom' flag
2016-09-16 22:38:21 +01:00
c322a191af
turn on E2E and Scalar by default
2016-09-16 18:36:03 +01:00
08543a66c4
fix race between setting canonical alias and creating aliases
2016-09-16 18:01:14 +01:00
d0fd6e985f
Document paranoia on the startAtBottom param
2016-09-16 17:48:08 +01:00
67565f88fa
Merge pull request #474 from matrix-org/markjh/olm_version
...
Add the olm version to the settings page.
2016-09-16 17:30:35 +01:00
806ef11fde
Add 'startAtBottom' flag
...
Controls whether a scrollPanel starts off at the bottom.
This may not be necessary and could either be derived from stickyBottom, but
this means I can be sure that the behaviour of ScrollPanel is completely
unchanged for all other uses to avoid breaking any other uses of
ScrollPanel.
2016-09-16 17:18:58 +01:00
6befb09509
Replace <p>s with <br/>s consistently
...
Also, allow newlines in /commands.
Fixes vector-im/vector-web#2114 , vector-im/vector-web#2165 .
2016-09-16 21:40:00 +05:30
1341ffca59
Merge pull request #479 from matrix-org/dbkr/directory_network_selector
...
Pass through config for Room Directory
2016-09-16 17:08:44 +01:00
a28aab42c4
fix NPE in guest access
2016-09-16 16:45:43 +01:00
891578d800
Merge pull request #481 from aviraldg/fix-autocomplete-unicode
...
Fix unicode completions in autocomplete.
2016-09-16 16:44:47 +01:00
e1bd97d509
don't try to set DM data for guests
2016-09-16 16:15:34 +01:00
88d92d1b61
Merge pull request #477 from matrix-org/luke/pm-plumbing-state
...
Add ability to set plumbing state in a room
2016-09-16 14:57:15 +01:00
b852756332
DM title
2016-09-16 14:35:43 +01:00
2913e4605f
Fix unicode completions in autocomplete.
...
Fixes vector-im/vector-web#2208
2016-09-16 15:38:29 +05:30
2b9258d377
use new rawDisplayName in AddressTile
2016-09-16 03:19:33 +01:00
1c1c31eafc
fix tinter for LeftPanel
2016-09-16 02:53:41 +01:00
2c7c382d56
stop continuations leaking on filepanel
2016-09-16 02:40:09 +01:00
ff00474aa5
show RightPanel when people click on users
2016-09-16 02:37:06 +01:00
8519756c8c
add dialog keyboard shortcuts.
2016-09-16 02:26:17 +01:00
eeb01563f8
add dialog keyboard shortcuts. download keys on demand
2016-09-16 02:26:09 +01:00
77595320a7
close the RoomSettings when you close Scalar
2016-09-15 22:56:12 +01:00
3fcea1bfc7
only apply verified css to genuinely verified tiles
2016-09-15 22:56:12 +01:00
c21309fdf6
remove stale state
2016-09-15 22:56:12 +01:00
39d213429d
Disable username and room decorators
2016-09-16 02:47:27 +05:30
b98c2ae25e
update crypto state of the room in realtime when turned on
2016-09-15 19:25:53 +01:00
44fa851275
Pass through config for Room Directory
2016-09-15 17:18:53 +01:00
1899d61893
textual event for m.room.encryption
2016-09-15 17:01:02 +01:00
db66d728c9
more e2e disclaimers
2016-09-15 16:38:37 +01:00
70011410cf
Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning
...
Wmwragg/correct incoming call positioning
2016-09-15 15:59:06 +01:00
d3f50dc2da
Tweaking the positoning of the incomingCallBox
2016-09-15 15:33:08 +01:00
514d667db2
Add ability to set plumbing state in a room
...
This takes the form:
The bridge will not create an admin room if there is plumbing state in the room of the form:
```JS
m.room.plumbing: {
content: {
status: "enabled"
},
...
}
```
2016-09-15 15:24:08 +01:00
2bd408983d
Merge pull request #475 from matrix-org/wmwragg/remove-old-filter
...
Wmwragg/remove old filter
2016-09-15 15:01:19 +01:00
45f17eb973
Added incomingCallBox to header and removed from roomTile
2016-09-15 14:39:34 +01:00
54a65f8bd7
Corrected onKeyUp misstype and return can now be used instead of clicking the button
2016-09-15 12:17:32 +01:00
27456d0e20
Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog
2016-09-15 11:46:06 +01:00
faa39eb482
Removed the nolonger used InviteMemberList
2016-09-15 11:39:59 +01:00
c54b9c911f
Add the olm version to the settings page.
2016-09-15 11:31:54 +01:00
0d4eb4d22c
Removed all the InviteMemberList from the MemberList, and added a srearch box
2016-09-15 11:31:49 +01:00
f95a74951e
label device IDs
2016-09-15 02:49:25 +01:00
ce655c7f50
improve device info
2016-09-15 02:44:55 +01:00
8bda0bb095
basic verification UI
2016-09-15 01:55:51 +01:00
d8770b2b41
oops
2016-09-15 00:49:10 +01:00
499783d697
hide room settings when you launch scalar if you haven't made changes
2016-09-15 00:43:38 +01:00
1a126fee54
Merge pull request #473 from matrix-org/wmwragg/multi-invite-bugfix
...
Wmwragg/multi invite bugfix
2016-09-14 22:06:28 +01:00
acd999be45
better describe keys
2016-09-14 18:23:14 +01:00
6a91948469
Removed the Email (Invite by email) section
2016-09-14 18:01:07 +01:00
a06896f96c
Added the room name to the error message
2016-09-14 16:28:44 +01:00
435570a022
Better error reporting for failed multi invites
2016-09-14 16:19:09 +01:00
75c9f707e0
Don't show current user in queryList
2016-09-14 15:35:04 +01:00
d3a709f98e
Missed a _isDmChat call when refactoring
2016-09-14 15:19:57 +01:00
c3566e0b49
_isDmChat needs to check the passed in addrs rather than the state.inviteList as they may now differ
2016-09-14 15:17:29 +01:00
a7a81c8a32
A manual address doesn't have to be converted to an address tile before it can be used if it is the still in the input field when the start/invite button is pressed
2016-09-14 15:09:23 +01:00
2a8518b72b
Tab can now be used for selection of address from list, as well as adding a manual mxid or email address
2016-09-14 14:53:13 +01:00
2752d6b444
improve e2e and scalar settings UI
2016-09-14 02:07:37 +01:00
0473b14564
fix e2e icon transitions
2016-09-14 01:25:43 +01:00
fd707f6f62
s/Direct Messages/People/
2016-09-13 19:47:41 +01:00
Richard van der Hoff