cc53825b06
fix defaultValue on getLocalSetting and getSyncedSetting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-25 22:01:35 +01:00
de89c1f710
lets make eslint at least somewhat happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-25 22:00:50 +01:00
fa9c2d1373
Fix specifying custom server for registration
...
Broken by 9cd7914ea5
2017-04-25 19:21:09 +01:00
c1336f09fe
Merge remote-tracking branch 'origin/develop' into luke/improve-country-dd
2017-04-25 18:06:04 +01:00
bc045698b9
Fix for fuse 2.7.2
...
As of v2.7.2, fuse.js introduces a regression where the second argument to the constructor `Fuse` is assumed to be an object. There was one instance where we were not passing any argument. This fixes that.
2017-04-25 18:01:56 +01:00
96e7479d8b
Show "jump to message" when message is not paginated
2017-04-25 17:19:36 +01:00
71a119376c
Guard against no children
2017-04-25 17:05:54 +01:00
1e9a2e80e9
Remove empty line
2017-04-25 11:57:03 +01:00
0d4ab07250
Fix not autoSelecting first item in dropdown
...
Fixes https://github.com/vector-im/riot-web/issues/3686
2017-04-25 11:53:14 +01:00
aac0238882
Remove redundant API for getting country prefix
2017-04-25 11:25:14 +01:00
336462366e
Improve country dropdown UX and expose +prefix
...
A prefix is now exposed through a change to the API for onOptionChange. This now returns the entire country object which includes iso2, prefix etc.
This also shows the prefix in the Registration and Login screens as a prefix to the phone number field.
2017-04-25 11:21:47 +01:00
5c83d4d2ed
Merge pull request #832 from t3chguy/ude_break_out_room
...
show the room name in the UDE Dialog
2017-04-25 10:04:23 +01:00
e64b647799
show the room name in the UDE Dialog
...
especially useful when it appears after you switch rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-25 09:26:21 +01:00
29e48d1801
Merge pull request #826 from matrix-org/matthew/mels-profile-changes
...
summarise profile changes in MELS
2017-04-25 00:18:19 +01:00
63dac026a8
remove spammy log
2017-04-25 00:17:46 +01:00
3997974f0f
remove debug console log (ignore its content pls)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:16:15 +01:00
9ae9aeea07
lets improve forwarding :D
...
ditch double quotes
stop caring about rhs state
always call hide_right_panel, nop if already hidden
use new restore_right_panel to bring it back if it was visible pre-us
actually tell things that we sent a message or failed in doing so
now the UDE works :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:14:45 +01:00
28a2266f70
tidy up UDE handler
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:11:20 +01:00
bfba25f3da
we don't care about rhs state anymore as we can just restore it sanely
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:10:14 +01:00
4cf9e0c1ae
Create a way to restore last state of the rhs panel.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:00:59 +01:00
ee560a969a
upon forwarding message to current room, explicitly remove clear from aux
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 20:17:29 +01:00
fbca0e0d0d
correct cancel appearing when it shouldn't
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 20:03:07 +01:00
e6fd380947
Change redact -> remove for clarity
...
Addresses vector-im/riot-web#2814
Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 12:49:09 -06:00
4285c395f5
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into forward_message
...
Conflicts:
src/components/structures/RoomView.js
2017-04-24 18:36:33 +01:00
cf2cf66cae
fix deep-linking to riot.im/app
2017-04-24 18:19:51 +01:00
bb6dd363d7
unbreak in-app permalinks correctly
2017-04-24 18:19:39 +01:00
3bd77d56db
Allow h1 and h2 tags again. CSS handled by riot-web
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 08:45:22 -06:00
74e92d6c23
Remove DM-guessing code
2017-04-24 15:44:45 +01:00
28923cdb93
Merge remote-tracking branch 'upstream/develop' into travis/h1-h2-to-h3
2017-04-24 08:29:10 -06:00
1347d9fa65
fix scroll behaviour on macs with no gemini
2017-04-24 12:53:53 +01:00
6f461f0ebb
add in scrollto button
2017-04-24 01:09:57 +01:00
96e733b487
Merge pull request #825 from matrix-org/matthew/missing-keyboard-modifiers
...
limit our keyboard shortcut modifiers correctly
2017-04-23 12:02:29 +01:00
5e8b43f3ed
if we're not granted, show an ErrorDialog with some text which needs changing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 06:16:25 +01:00
0590ce7faf
Conform damn you (mostly)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 06:07:53 +01:00
24f2aed45f
summarise profile changes in MELS
...
fixes https://github.com/vector-im/riot-web/issues/3463
2017-04-23 04:05:50 +01:00
a2be764681
display err.message to user if available in error msgs
2017-04-23 01:48:27 +01:00
db996f678c
show better errors when slash commands fail
2017-04-23 01:32:51 +01:00
7854cac61d
hook up keyb shortcuts for roomdir
2017-04-23 01:00:44 +01:00
fa033e6116
limit our keyboard shortcut modifiers correctly
...
fixes https://github.com/vector-im/riot-web/issues/3614
2017-04-23 00:49:14 +01:00
6a63c7e50c
fix deep-linking to riot.im/app
2017-04-22 21:06:38 +01:00
34c1a8f3cf
make autofocus explicit on errordialog as it autoFocus attr seems unreliable
2017-04-22 17:28:48 +01:00
0e5006b041
typo
2017-04-22 17:28:28 +01:00
e18e965eb8
missing key attr
2017-04-22 16:26:39 +01:00
0ac836919d
Merge pull request #822 from t3chguy/BaseDialog_restore_focus
...
Remember element that was in focus before rendering dialog
2017-04-22 16:05:34 +01:00
33e841a786
move user settings outward and use built in read receipts disabling
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 15:40:29 +01:00
6a657a6555
Remember element that was in focus before rendering dialog
...
restore focus to that element when we unmount
also remove some whitespace because ESLint is a big bad bully...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 05:44:27 +01:00
aa0658d9ce
Merge pull request #802 from t3chguy/t3chguy/file_download_improvements
...
File Download Consistency
2017-04-22 02:59:25 +01:00
6c177bc617
Merge pull request #806 from t3chguy/t3chguy/show_access_token
...
Show Access Token under Advanced in Settings
2017-04-22 02:51:54 +01:00
ad76dd0dd1
Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements
...
Link tags/commit hashes in the UserSettings version section
2017-04-22 02:38:30 +01:00
febd9c637e
Merge pull request #813 from t3chguy/RoomSettings_close_focus_composer
...
On return to RoomView from auxPanel, send focus back to Composer
2017-04-22 02:08:48 +01:00
ba0bb677c8
Merge pull request #817 from turt2live/travis/rw-3626
...
Change presence status labels to 'for' instead of 'ago'
2017-04-22 01:45:21 +01:00
304136766d
Merge pull request #816 from t3chguy/ability_to_disable_scalar
...
Disable Scalar Integrations if urls passed to it are falsey
2017-04-22 01:39:20 +01:00
872d0e0f50
Merge branch 'develop' into travis/hide-read-receipts
2017-04-22 01:36:38 +01:00
b36eb90a10
Merge pull request #819 from turt2live/travis/no-typing-notifs
...
Add option to not send typing notifications
2017-04-22 01:35:07 +01:00
1faecfd0f7
fix sticky headers on resize
2017-04-22 01:29:48 +01:00
ec6a1c4c75
recalculate roomlist when your invites change
2017-04-22 01:16:25 +01:00
80b8be64d1
Transform h1 and h2 tags to h3 tags
...
Addresses vector-im/riot-web#1772
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 15:09:56 -06:00
64e416e117
Add option to not send typing notifications
...
Addresses vector-im/riot-web#3220
Fix applies to both the RTE and plain editor.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 14:50:26 -06:00
e4c4adc517
Add option to hide other people's read receipts.
...
Addresses vector-im/riot-web#2526
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 14:28:28 -06:00
2d39b59556
Change presence status labels to be more clear.
...
As per vector-im/riot-web#3626 the current labels are unclear. Changing the verbage should make it more clear.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 13:41:37 -06:00
8e9f52e217
Disable Scalar Integrations if urls passed to it are falsey
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 19:46:19 +01:00
589d41e3b9
DRY the code a little bit in anticipation of #813
...
which sends a `focus_composer` onCancelClick()
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 18:51:49 +01:00
fdc26a490a
On return to RoomView from auxPanel, send focus back to Composer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 18:45:28 +01:00
ae8d04b35d
Merge pull request #805 from matrix-org/luke/feature-read-marker
...
Sync RM across instances of Riot
2017-04-21 16:52:46 +01:00
29c2bd3d18
reset last_rr_sent on error
...
Indicate that setting the RR was a failure and that hitting the API should be retried (in the case where the errcode !== "M_UNRECOGNISED")
2017-04-21 16:46:36 +01:00
19d6d1ef4b
Merge pull request #811 from matrix-org/luke/login-ui
...
First iteration on improving login UI
2017-04-21 16:25:16 +01:00
9c4c706120
Remove :server.name for custom servers
...
Custom servers may not be configured such that their domain name === domain part.
2017-04-21 16:09:11 +01:00
64112da25c
only re-show right panel if it was visible before we were mounted
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 14:13:01 +01:00
b6ca16fc2f
add RoomView state for message being forwarded
...
add RoomView action handler for message forward
clear forwardingMessage onCancelClick RoomView
change var into const in render RoomView
load ForwardMessage from rooms.ForwardMessage
if there is a messageForwarding object in state show panel in aux
Create ForwardMessage class
Modify RoomHeader so that it shows the cancel button more greedily
reskindex
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 13:50:22 +01:00
8308555489
Mark sync param as optional so that my IDE will stop complaining.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 13:50:22 +01:00
b0288ebd89
fix stupid typos in RoomList's shouldComponentUpdate
2017-04-21 12:40:13 +01:00
2b9cb999ba
autoFocus PasswordLogin
2017-04-21 11:50:19 +01:00
9cd7914ea5
Finishing off the first iteration on login UI
...
This makes the following changes:
- Improve CountryDropdown by allowing all countries to be displayed at once and using PNGs for performance (trading of quality - the pngs are scaled down from 32px to 25px)
- "I want to sign in with" dropdown to select login method
- MXID login field that suffixes HS domain (whether custom or matrix.org) and prefixes "@"
- Email field which is secretly the same as the username field but with a different placeholder
- No more login flickering when changing ServerConfig (!) fixes https://github.com/vector-im/riot-web/issues/1517
This implements most of the design in https://github.com/vector-im/riot-web/issues/3524 but neglects the phone number login:
This will be updated in another PR to implement desired things:
- Country code visible once a country has been selected (propbably but as a prefix to the phone number input box.
- Use square flags
- Move CountryDropdown above phone input and make it show the full country name when not expanded
- Auto-select country based on IP
2017-04-21 11:37:08 +01:00
bbd1f34336
Prepend REACT_SDK_VERSION with a v to match riot-web version output
...
Add simple helper to construct version/commit hash urls
var -> let/const and prepend olmVersionString with v for same reason
for both matrix-react-sdk and riot-web, if unknown/local don't do anything
else try to create a link to the commit hash/tag name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 03:04:34 +01:00
be9b858193
focus on composer after jumping to bottom
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 01:06:00 +01:00
3d507e9840
(Room)?Avatar: Request 96x96 avatars on high DPI screens
2017-04-21 00:05:52 +02:00
35a16edccc
oops, actually refresh roomlist when its state changes!
2017-04-20 15:47:59 +01:00
0d8d3c6710
HOW DID THIS EVER WORK?
2017-04-20 15:15:20 +01:00
67089cb527
If new RR-RM API not implemented, fallback to RR-only API
2017-04-20 14:34:59 +01:00
238f59dc87
return the event from RoomTile's onClick to distinguish clicks from keypresses
2017-04-20 14:16:45 +01:00
e69ea68133
unbreak stack overflow which fires on tests due to mocked timers
2017-04-20 13:53:36 +01:00
5a3b4b6a60
various bug fixes:
...
don't redraw RoomList when the selectedRoom changes
keep passing selectedRoom through to RoomTiles so they have correct initial state
handle onAccountData at the RoomList, not RoomTile level
Fix some typos
2017-04-20 01:12:57 +01:00
90f526bdeb
autofocus doesn't seem to work on this button
2017-04-20 00:42:13 +01:00
9f99224a1f
fix bugs from PR review
2017-04-19 17:59:06 +01:00
a4ba5f041c
Remove log, reinstate comment
2017-04-19 10:46:08 +01:00
edeaef8c2f
Initialise last_rm_sent_event_id
2017-04-19 10:28:38 +01:00
81bf2be13b
Make note of inconsistant roomReadMarkerTsMap
...
This will become redundant when there is server support for directionality of the RM
2017-04-19 10:27:43 +01:00
a787ee8480
Remove spammy log
2017-04-19 10:20:53 +01:00
00cf5b5918
Revert change
2017-04-19 10:20:24 +01:00
e32f153573
Remove Room.accountData listener on unmount
2017-04-19 10:18:25 +01:00
28818b857a
Remove log
2017-04-19 10:17:44 +01:00
81bdfe2126
Update to match renamed API
2017-04-19 10:14:57 +01:00
566a315242
Initial commit on riot-web#3524 (login UI update)
2017-04-19 10:08:04 +01:00
fb6252a16b
fix invite highlights take 3
2017-04-19 00:16:17 +01:00
4a9c168682
fix invite highlights
2017-04-19 00:13:01 +01:00
abf2300c0d
highlight invites correctly
2017-04-19 00:09:03 +01:00
093b9a0b52
kick the roomtile on RoomState.members
2017-04-18 23:29:28 +01:00
8389a67c75
we don't need RoomTile specific focus in the end
2017-04-18 22:54:30 +01:00
015a4480e2
oops, wire up Room.receipt again, and refresh roomtiles on Room.timeline
2017-04-18 22:36:54 +01:00
61071b89df
Show Access Token under Advanced in Settings
...
behind a Spoiler, onClick = spoil+select
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-18 19:55:08 +01:00
c1c3956df4
fix bugs, and handle shortcircuit react when updating roomtile
2017-04-18 19:28:24 +01:00
062963b32f
move focus-via-up/down cursors to LeftPanel
2017-04-18 17:49:28 +01:00
4fb9635175
nudge focus shortcut code further to working
2017-04-18 17:12:42 +01:00
c431c9ab22
Clarify comment
2017-04-18 15:18:21 +01:00
d38520dfb4
Undo change in ghost RM logic
...
Put a XXX to indicate that the ghost tile should be replaced with something mor e stable. As it stands, the ghost will appear, potentially at a different position to the RMs actual position
2017-04-18 15:17:42 +01:00
d33afa99ab
marker -> event_id
2017-04-18 15:13:05 +01:00
4b5364e9ae
Merge branch 'develop' into luke/feature-read-marker
2017-04-18 14:45:18 +01:00
28ed69b617
m.read_marker -> m.fully_read
2017-04-18 14:44:43 +01:00
9591ad31e6
fix bugs, experiment with focus pulling, make it vaguely work
2017-04-18 02:43:29 +01:00
da569c2c8d
add constantTimeDispatcher and use it for strategic refreshes.
...
constantTimeDispatcher lets you poke a specific react component to do something
without having to do any O(N) operations. This is useful if you have thousands
of RoomTiles in a RoomSubList and want to just tell one of them to update,
without either having to do a full comparison of this.props.list or have each
and every RoomTile subscribe to a generic event from flux or node's eventemitter
*UNTESTED*
2017-04-17 21:06:37 +01:00
6f0c3b1c03
Pass file name (as name) to the ImageView modal
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-17 14:50:34 +01:00
a0c498e8ba
Make Download behaviour consistent with that of E2E (iframed) download butttons (ACTUALLY DOWNLOAD)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-17 14:37:24 +01:00
691639d1e0
track RoomTile focus in RoomList, and stop the RoomList from updating during mouseOver
2017-04-15 13:25:32 +01:00
0a91511f05
cmd-k for quick search
2017-04-15 12:13:29 +01:00
1189368aab
add a class to remove evil blue outlines
2017-04-15 00:30:48 +01:00
617e1eede3
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-04-14 18:30:21 +01:00
7ae13f5889
Merge pull request #762 from lieuwex/hide-link-preview-quote
...
Don't show link preview when link is inside of a quote
2017-04-12 15:31:43 +01:00
a29d8c2af2
Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings
...
Escape closes UserSettings
2017-04-12 15:18:19 +01:00
9c9dc84f45
Remove redundant setting of readMarkerEventId
2017-04-12 15:12:37 +01:00
249e42747b
Fix bug where `roomId` was expected to be a property on timelineSet
2017-04-12 15:09:56 +01:00
1c25ed89b0
Initial implementation of using new RM API
...
As detailed here https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit , the RM state is no longer kept locally, but rather server-side. The client now uses it's locally-calculated RM to update the server and receives server updates via the per-room account data.
The sending of the RR has been bundled in to reduce traffic when sending both. In effect, whenever a RR is sent the RM is sent with it but using the new API.
This uses a js-sdk change which has set to be finalised and so might change.
2017-04-12 15:05:39 +01:00
424aae6b91
Prevent the ghost and real RM tile from both appearing
2017-04-12 15:04:38 +01:00
726cb43fee
Merge pull request #794 from matrix-org/luke/feature-textual-pls
...
Implement user power-level changes in timeline
2017-04-12 09:52:53 +01:00
d4dc16545a
Fix people section vanishing on 'clear cache'
...
Stop the client first
Fixes https://github.com/vector-im/riot-web/issues/3610
2017-04-11 18:16:29 +01:00
811cd79206
Make the clear cache button work on desktop
...
Fixes https://github.com/vector-im/riot-web/issues/3597
2017-04-10 17:39:27 +01:00
7578737deb
Merge pull request #797 from matrix-org/matthew/fix-e2e-export-warnings
...
fix the warning shown to users about needing to export e2e keys
2017-04-10 13:35:00 +01:00
5de71ef504
unbreak in-app permalinks correctly
2017-04-10 12:07:39 +01:00
2a4b052fa5
unbreak in-app permalinks
2017-04-10 12:06:54 +01:00
8b4836b60e
Refactor roles into Roles.js
...
So that the mapping between a numerical power level and a "role" are done in one place. PowerSelector.js has been modified to use the same mapping.
2017-04-10 10:09:26 +01:00
6dbb4e9002
fix the warning shown to users about needing to export e2e keys
...
apparently when we added the buttons to export e2e keys to the Logout button, we didn't change the text warning the user that e2e export was coming soon. likewise when changing password and forgetting password (where we didn't even have a button to export keys)
2017-04-07 23:34:11 +01:00
88c04344b0
Merge pull request #792 from matrix-org/dbkr/indexeddb_webworker
...
Add support for using indexeddb in a webworker
2017-04-07 16:17:35 +01:00
6352784a2c
Merge pull request #795 from matrix-org/luke/fix-pagination3
...
Fix infinite pagination/glitches with pagination
2017-04-07 13:24:22 +01:00
4342a2ad47
Merge pull request #793 from matrix-org/luke/fix-guest-team-token-home-page
...
Fix issue where teamTokenMap was ignored for guests
2017-04-07 11:53:00 +01:00
d218f90cde
Fix infinite pagination/glitches with pagination
...
I think this was being caused by a bug introduced in 47f29b that meant that `backwards` was actually being used as `forwards`.
2017-04-07 11:34:31 +01:00
a815788af8
Fix issue where teamTokenMap was ignored for guests
...
This was an issue because guests do not log in with a teamToken, it is implicitly set by MatrixChat when it mounts. The fix is to view_home_page when a login occurs and MatrixChat has this._teamToken set.
2017-04-06 17:10:32 +01:00
6010350ce5
Implement power-level changes in timeline
...
Fixes https://github.com/vector-im/riot-web/issues/266
2017-04-06 17:02:35 +01:00
6c09a08a7d
Click emote sender -> insert display name into composer
...
Also, fix the imports TextualBody.
2017-04-06 14:08:59 +01:00
880a48494b
Merge pull request #785 from matrix-org/luke/fix-scroll-past-big-event
...
Fix scroll token selection logic
2017-04-06 12:36:30 +01:00
5f8a7b46a8
Remove redundant setState call, always focus composer after sync
2017-04-06 11:44:25 +01:00
95b40a976c
Replace sdkReady with firstSyncPromise, add mx_last_room_id
...
- Create a promise that will serve as a lock to be blocked on by things that need to wait for the first sync before accessing state.
- Use this promise to block `view_room` calls until a sync has occured instead of just dropping them silently if the sync hasn't happened yet.
- Store the current room ID in a localStorage item `mx_last_room_id` when `view_room` fires. This persists the last viewed room ID so that it can be restored on refresh, browser quit. This replaces the previous logic which set the room following a sync based on the most recent unread room.
2017-04-06 11:38:06 +01:00
b78f654476
Add support for using indexeddb in a webworker
2017-04-06 11:13:39 +01:00
b0a04e6f00
Clarify comment
2017-04-05 17:52:05 +01:00
423babdb17
Remove fairly redundant condition
...
Making sure that a node is intersected by the bottom of the wrapper is a bit overkill, given that we iterate from the bottom. This also prevents the scenario of having no nodes that are not precisely intersected, but possibly straddling the bottom of the wrapper.
2017-04-05 17:51:07 +01:00
47f29b9454
Simplify simulated unfill
2017-04-05 17:48:24 +01:00
106ce90916
Change "Unread messages." to "Jump to first unread message."
...
Also get rid of the "up" arrow so as not to indiciate direction. This is important because in future the RM will not be based on what has been paginated into the client (but instead RM will be handled server-side) and thus we cannot assert any kind of direction on it relative to the events in the viewport.
2017-04-04 16:31:28 +01:00
5737994957
Clarify and simplfiy unpagination logic
2017-04-04 13:28:26 +01:00
94fe9999db
Reimplement _saveScrollState
...
The actual fix to https://github.com/vector-im/riot-web/issues/3175 is this change to `_saveScrollState`, which is to pick the trackedScrollToken based on which node is intersected by the bottom of the scroll panel. This is opposed to the previous logic that picked based on which node was the first from the bottom to be above the bottom of the viewport.
In the case where the viewport bottom does not intersect any events, the topmost event is used.
2017-04-04 11:55:53 +01:00
e3ac63777c
Merge pull request #786 from matrix-org/dbkr/indexeddb_hide_internals
...
Update for new IndexedDBStore interface
2017-04-04 10:39:45 +01:00
bb25bee8fa
Merge pull request #787 from VShell/patch-3
...
Add <ol start="..."> to allowed attributes list
2017-04-02 12:49:01 +01:00
3ff54b8e4b
Add <ol start="..."> to allowed attributes list
...
Fixes vector-im/riot-web#3273
Signed-off-by: Shell Turner <cam.turn@gmail.com>
2017-04-02 11:19:50 +01:00
9c4614e7ff
Update for new IndexedDBStore interface
2017-03-31 14:55:33 +01:00
8e5a83a056
Reduce number of unpaginated events by 1
...
When unpaginating in the backwards direction
2017-03-30 18:02:33 +01:00
fff83ba234
Fix the onFinished for timeline pos dialog
...
This was causing a blank RoomView because it was trying to work with `room_id = undefined`.
2017-03-30 17:18:22 +01:00
11a1c8099c
Merge pull request #776 from matrix-org/luke/fix-directory-search-enter
...
Only join a room when enter is hit if the join button is shown
2017-03-30 09:59:42 +01:00
dff79984a6
Merge remote-tracking branch 'origin/develop' into dbkr/remove_session_load_error
2017-03-29 18:24:06 +01:00
22b0f69ac9
Merge pull request #782 from matrix-org/dbkr/matrixchat_tidy
...
Use Login & Register via component interface
2017-03-29 18:23:36 +01:00
5a411ba005
Merge pull request #781 from matrix-org/luke/fix-flaky-tests-maybe
...
Attempt to fix the flakyness seen with tests
2017-03-29 17:32:56 +02:00
a6612bb8ad
Remove non-functional session load error
...
MatrixChat was trying to display an error if the session failed to
restore, but it was never actually being shown because it was just
set as a member variable and therefore never actually caused
a re-render for the error to be displayed. Almost all errors are
caught by _restoreFromLocalStorage which displays the fancy dialog
if your session can't be restored, so I'm not convinced this ever
even tried to do anything anyway. Remove it.
2017-03-29 16:23:18 +01:00
cee2628b41
Use Login & Register via component interface
...
Login & Register were being imprted directly for some reason,
rather than going via the normal component interface.
Should be functionally identical.
2017-03-29 15:24:47 +01:00
e139f5212a
Remove React warning
...
Fire onOptionChange in componentWillMount, otherwise end up trying
to update state effectively in a render method, which is bad.
2017-03-29 15:05:49 +01:00
2146e89c09
Attempt to fix the flakyness seen with tests
...
Specifically:
```
JS 2.1.1 (Linux 0.0.0) joining a room over federation should not get stuck at a spinner FAILED
Did not find exactly one match (found: 0) for componentType:function (props, context, updater) {
```
actually meant that the room directory wasn't displayed - probably because the dispatch `view_room_directory` ended up on another tick of the event loop, meaning that the directory wasn't displayedi. The fix attempted in ths commit is to use `this._setPage` instead to view the directory. This uses `setState` to set the screen to the directory, so I'm not entirely convinced this will solve the problem (as `setState` may also end up doing things on another tick.
and
```
JS 2.1.1 (Linux 0.0.0) loading: MatrixClient rehydrated from stored credentials: shows a room view if we followed a room link FAILED
MatrixChat still not ready after 5 tries
awaitRoomView@/home/travis/build/vector-im/riot-web/test/all-tests.js:201363:90
```
was happening probably because in the handler for the `sync` event in `MatrixChat` (around line 840), there was one case in which the `ready` state may not be true (causing all 5 attempts to fail), and this case relied on `starting_room_alias_payload`. This `starting_room_alias_payload` is now redundant because of `initialScreenAfterLogin`, which was added recently.
2017-03-29 15:02:28 +01:00
90242c2c85
Only send local echo RR if we're at the end
2017-03-29 14:12:50 +01:00
3373f00d90
Only clear the local notification count if needed
...
Only zero the local notification count when we actually send a
read receipt, otherwise we cause a re-render of the RoomList every
time the user moves the cursor in the window, basically.
2017-03-29 14:08:31 +01:00
e90897d117
Merge pull request #777 from matrix-org/dbkr/fix_notifs_on_refresh
...
Don't re-notify about messages on browser refresh
2017-03-28 15:16:12 +01:00
4587b5f995
Don't re-notify about messages on browser refresh
...
Don't notify unless the js-sdk state is SYNCING, otherwise we'll
display notifications for messages that come in during the
incremental between the js-sdk cached data and the present.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/405
Fixes https://github.com/vector-im/riot-web/issues/3251
2017-03-28 15:02:08 +01:00
98a0b804c7
Only join a room when enter is hit when the join button is shown
2017-03-28 13:02:13 +01:00
91d10646b5
Merge pull request #775 from matrix-org/luke/fix-RoomList-notif-flashing
...
Improve zeroing of RoomList notification badges
2017-03-28 11:33:38 +01:00
4a0988f83e
Do not send the room with action
...
By not sending the room with the action, we prevent its state from being updated by registered views listening for on_room_read
2017-03-28 11:26:40 +01:00
f4dc7ae8b1
Improve zeroing of RoomList notification badges
...
Use an action and force an update when zeroing the number of notifications in a room. This is better than waiting for a `render` to happen at some point. This will hopefully fix https://github.com/vector-im/riot-web/issues/3257
2017-03-28 10:38:57 +01:00
e1b7347810
Merge pull request #774 from matrix-org/luke/fix-voip-bar-hidden
...
Fix VOIP bar hidden on first render of RoomStatusBar
2017-03-28 10:03:21 +01:00
ffd8ef84d6
Fix VOIP bar hidden on first render of RoomStatusBar
...
componentDidUpdate is not called for the initial render of a React component (https://facebook.github.io/react/docs/react-component.html#componentdidupdate )
componentWillMount is used so that the initial state and props of RoomStatusBar can also trigger props.isVisible.
This fixes https://github.com/vector-im/riot-web/issues/3181
2017-03-28 09:30:41 +01:00
a38a954fb5
Merge pull request #772 from matrix-org/dbkr/disinvite_is_not_kick
...
Correct confirm prompt for disinvite
2017-03-27 17:42:39 +01:00
aa486b605d
Merge pull request #773 from matrix-org/luke/fix-login-flash-new-state
...
Add state loggingIn to MatrixChat to fix flashing login
2017-03-27 18:24:49 +02:00
c743663f7d
Merge pull request #771 from matrix-org/dbkr/invite_always_show_valid_mxid
...
Fix bug where you can't invite a valid address
2017-03-27 17:20:51 +01:00
c650cfffac
logged_in -> loggedIn
...
Also added `loggingIn` to `initialState` and removed some commented code.
2017-03-27 17:14:39 +01:00
db3339de33
I still can't type
2017-03-27 17:03:59 +01:00
9125c1b2cc
I can't type
2017-03-27 17:00:05 +01:00
a3efa45795
Correct confirm prompt for disinvite
...
It should be 'disinvite' not 'kick', and probably doesn't really
need a reason.
2017-03-27 16:53:00 +01:00
a230354dbe
Fix bug where you can't invite a valid address
...
Always show the entered text as an option if it's a valid address,
otherwise there's no way to invite an address that is valid and
also returns other mxids in the search results.
Fixes https://github.com/vector-im/riot-web/issues/3496
2017-03-27 16:40:01 +01:00
30c5af35e5
Add state loggingIn to MatrixChat to fix flashing login
...
To prevent the login screen from flashing when refreshing the app, use some state to indicate that a login is in progress, and OR that with the existing `loading` boolean to show the `<Spinner>` instead of the default `<Login>`.
This might be too invasive, and a default spinner may be better.
2017-03-27 16:39:04 +01:00
7eb3a776dc
Merge pull request #761 from matrix-org/luke/fix-people-section2
...
Fix people section DropTarget and refactor Rooms
2017-03-27 15:52:28 +02:00
a4b4c3feb8
Read Receipt offset
...
Read receipts were always one read receipt to the left further than they should have been. This fixes that and simplifies the logic.
2017-03-27 14:34:05 +01:00
dca02d916a
Merge branch 'develop' into luke/fix-people-section2
2017-03-27 09:45:14 +01:00
975a2db3e4
UI delay done in UI
2017-03-27 09:42:04 +01:00
a8d85ca2ad
Merge pull request #756 from matrix-org/dbkr/add_msisdn
...
Support adding phone numbers in UserSettings
2017-03-24 10:54:22 +00:00
5e3b991ec2
PR feedback fixes
2017-03-24 10:45:38 +00:00
707fd60624
Prevent crash on login of no guest session
...
The bound functions are only set when the Notifier is started, so
if stop() was called without start() having been called, the
listener function would be null which would throw an exception.
2017-03-23 10:38:00 +00:00
d5272149f6
Another unmounted guard
2017-03-22 16:42:44 +00:00
b58d8bffe1
More PR feedback
...
Unmounted guards, extra semicolon, return early to lose indent
level, add keys.
2017-03-22 16:41:08 +00:00
3d71cb8325
Merge pull request #768 from matrix-org/kegan/memleaks-are-bad-mkay
...
Add canResetTimeline callback and thread it through to TimelinePanel
2017-03-22 16:39:07 +00:00
6b78440466
Unmounted guard
2017-03-22 16:36:42 +00:00
e39979a61f
Convert to old style react class
2017-03-22 16:15:45 +00:00
cca607d469
Make phone number form a bit more semantic
2017-03-22 15:39:09 +00:00
4cd24d15d4
Factor out AddPhoneNumber to a separate component
2017-03-22 15:18:27 +00:00
4cebded04f
Add canResetTimeline callback and thread it through to TimelinePanel
2017-03-22 15:06:52 +00:00
6a37fc4325
Comment typos
2017-03-22 12:00:16 +00:00
6a56828974
Just return the promise if it's a bg request
...
This makes the code a bit neater.
2017-03-22 11:25:33 +00:00
5ae7d5e4b2
More comments
2017-03-22 11:13:00 +00:00
e5a5ca9efc
Don't set busy state at all for background request
2017-03-22 10:53:15 +00:00
ec63e18b42
Show spinner whilst processing recaptcha response
...
The fact that we showed no feedback whilst submitting the captcha
response was causing confusion on slower connections where this
took a nontrivial amount of time.
Takes a new flag from the js-sdk that indicates whether the
request being made is a background request, presenting a spinner
appropriately.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/396
2017-03-21 18:40:41 +00:00
d5f7b3983b
Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn
2017-03-21 13:44:55 +00:00
4a29d674f8
Merge pull request #750 from matrix-org/dbkr/msisdn_signin_2
...
Login / registration with phone number, mark 2
2017-03-21 13:43:11 +00:00
9ccda7ed81
Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display
2017-03-21 11:11:45 +00:00
69c3bd7f80
Escape closes UserSettings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-03-20 12:13:21 +00:00
f65cc940c3
Merge pull request #764 from lieuwex/fix-extraneous-space-emote
...
Fix extraneous leading space in sent emotes
2017-03-19 21:34:13 +00:00
bf8973ad33
avoid leading space in HTML /me too
2017-03-19 21:33:18 +00:00
c697b48f99
fix leading extraneous space in emotes
2017-03-19 21:52:24 +01:00
7891f9b246
UnknownBody: add explanatory title
2017-03-19 15:21:12 +05:30
df63c779dd
clarify that redact === delete
2017-03-19 02:34:25 +00:00
25a4f4e3b6
Add ConfirmRedactDialog component
...
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
2017-03-18 18:58:28 -07:00
b3fc1844e8
don't show link preview when link is inside of a quote
...
Signed-off-by: Lieuwe Rooijakkers <lieuwerooijakkers@gmail.com>
2017-03-18 11:50:49 +01:00
92d5f55a46
Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display
2017-03-17 13:55:07 +00:00
7ecabe49d2
Fix people section DropTarget and refactor Rooms
...
- Set the verb for the people section to "tag as direct chat". This requires some CSS modifications to Riot because it's a long bit of text relative to, say, "demote".
- Because it's quite useful to be able to set the DM status of a room with just a boolean, add a convenience function for guessing a DM member and setting the DM flag on that room with the resulting member.
2017-03-17 11:59:22 +00:00
f8a1634720
Merge pull request #759 from matrix-org/luke/display-redactions-better
...
Display timestamps and profiles for redacted events
2017-03-16 17:14:10 +00:00
d4ed9e816b
Display timestamps and profiles for redacted events
...
This is part of fixing https://github.com/vector-im/riot-web/issues/3390
2017-03-16 17:00:10 +00:00
c413de4452
Merge pull request #757 from matrix-org/luke/fix-unverified-warning-voip
...
Fix UDD for voip in e2e rooms
2017-03-16 15:18:12 +00:00
b06111202d
Display threepids slightly prettier
...
ie. Put a + on the front of msisdns.
2017-03-16 15:16:24 +00:00
3ce0da4528
Fix UDD for voip in e2e rooms
...
When starting a call, several events are sent and if some devices are unverified, all three will trigger their own UnknownDeviceError. This causes three overlapping, identical UnknownDeviceDialogs.
This change effectively dedupes the dialogs so that only one is shown. This is safe to do because the UDD allows resending of _all_ events that were left unsent.
Fixes https://github.com/vector-im/riot-web/issues/3285
2017-03-16 15:05:54 +00:00
af8c3edba6
Support adding phone numbers in UserSettings
2017-03-16 14:56:26 +00:00
e04a368f7e
Merge pull request #755 from matrix-org/luke/export-e2e-on-logout
...
Add "Export E2E keys" option to logout dialog
Tests were failing due to flaky test, fixed in 544a65
2017-03-16 14:53:06 +00:00
544a6593e1
Unregister the UploadBar event listener on unmount
2017-03-16 14:19:17 +00:00
b21f016d37
Add "Export E2E keys" option to logout dialog
...
Fixes https://github.com/vector-im/riot-web/issues/3184
2017-03-16 14:18:18 +00:00
67757a16f3
Don't remove the line that gets the error message
2017-03-16 12:54:18 +00:00
ed22a74eaf
Fix People section a bit
...
This does two things:
- Sets `editable` to true for the "People" `RoomSubList` so that people can be dragged to favourites. This has the downside that you can drag a "People" to "Rooms", but it won't set the direct chat flag. This is because im.vector.fake.direct != m.direct, sadly.
- Sets `alwaysShowHeader` to `true` so that the `IncomingCallDialog` can be showneven when there are no people in `sortedList`. Fixes https://github.com/vector-im/riot-web/issues/2956 .
2017-03-16 11:31:47 +00:00
d292a627d8
Handle no-auth-flow error from js-sdk
2017-03-15 16:44:56 +00:00
648ad8d66c
Merge pull request #753 from matrix-org/luke/fix-register-not-routing
...
Do routing to /register _onLoadCompleted
2017-03-15 13:18:34 +00:00
5330e47b3f
Add null check
2017-03-15 13:05:03 +00:00
238e48e4af
Do routing to /register _onLoadCompleted
...
_onLoadCompleted happens straight away because Lifecycle finishes loading the session instantly when registration parameters (client_secret etc.) are set.
2017-03-15 12:02:08 +00:00
3325dd6ede
Merge pull request #747 from matrix-org/luke/increase-scrollback-window
...
Double UNPAGINATION_PADDING again
2017-03-15 11:46:34 +00:00
47958180a6
Add null check to start_login
2017-03-14 15:13:36 +00:00
2c1ac29d30
Send legacy parameters on login call
...
To support login on old HSes
2017-03-14 14:37:18 +00:00
5e93dde0dd
Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus
...
Merge the two RoomTile context menus into one
2017-03-14 14:19:36 +00:00
0e95926925
Merge pull request #748 from matrix-org/luke/logout-after-deactivate
...
Fix import for Lifecycle
2017-03-14 14:13:08 +00:00
17c9fcbb85
Merge branch 'develop' into luke/UDE-file-upload
2017-03-14 13:59:04 +00:00
30b442515e
Merge pull request #743 from matrix-org/luke/fix-screen-after-login
...
Decide on which screen to show after login in one place
2017-03-14 13:44:08 +00:00
878413f6a4
Support msisdn signin
...
Changes from https://github.com/matrix-org/matrix-react-sdk/pull/742
2017-03-14 11:50:13 +00:00
ba0715ba7c
Fix import for Lifecycle
...
This fixes https://github.com/vector-im/riot-web/issues/2991 although we might need to give more feedback than just showing the login screen. Maybe a dialog that says "your account has been deactivated".
2017-03-13 14:10:14 +00:00
d8a30aa848
Double UNPAGINATION_PADDING again
2017-03-13 13:48:15 +00:00
925bbb79ad
fix kick dialog CSS
2017-03-13 00:47:33 +00:00
8a0b08e7f6
fix CSS for ChatCreateOrReuseDialog.js
2017-03-13 00:03:33 +00:00
bf64f387ce
name class to match file
2017-03-12 23:50:12 +00:00
3a849bce60
name class to match file
2017-03-12 23:48:57 +00:00
185473b898
copyright...
2017-03-12 23:48:49 +00:00
3aaf37df1a
beautify a tonne more errors
2017-03-12 22:59:41 +00:00
71e0780eee
beautify search fail error
2017-03-12 22:24:16 +00:00
e5a5b5cd08
oops
2017-03-12 20:13:39 +00:00
b7d5d2fd56
beautify UserSettings error msg
...
fix up default dialog cancel button
2017-03-12 20:03:14 +00:00
2786fb0f46
Revert "Support registration & login with phone number ( #742 )"
...
This reverts commit 0269562383
2017-03-09 18:32:44 +00:00
7fb9ce2b78
Merge pull request #744 from matrix-org/luke/add-onclick-permalinks
...
Add onClick to permalinks to route within Riot
2017-03-09 18:29:42 +00:00
6c7b191577
Merge pull request #605 from SijmenSchoon/feature/pastefiles
...
Add support for pasting files into the text box
2017-03-09 17:55:58 +00:00
1f788feacd
Merge the two RoomTile context menus into one
...
This will require riot-web changes https://github.com/vector-im/riot-web/pull/3395
2017-03-09 17:03:57 +00:00
0269562383
Support registration & login with phone number ( #742 )
...
* WIP msisdn sign in
* A mostly working country picker
* Fix bug where you'dbe logged out after registering
Stop the guest sync, otherwise it gets 401ed for using a guest
access token for a non-guest, causing us to beliebe we've been
logged out.
* Use InteractiveAuth component for registration
* Fix tests
* Remove old signup code
* Signup -> Login
Now that Signup contains no code whatsoever related to signing up,
rename it to Login. Get rid of the Signup class.
* Stray newline
* Fix more merge failing
* Get phone country & number to the right place
* More-or-less working msisdn auth component
* Send the bind_msisdn param on registration
* Refinements to country dropdown
Rendering the whole lot when the component was rendered just makes
the page load really slow, so just show 2 at a time and rely on
type-to-search.
Make type-to-search always display an exact iso2 match first
* Propagate initial inputs to the phone input
* Support msisdn login
* semicolon
* Fix PropTypes
* Oops, use the 1qst element of the array
Not the array of object keys which has no particular order
* Make dropdown/countrydropdown controlled
* Unused line
* Add note on DOM layout
* onOptionChange is required
* More docs
* Add missing propTypes
* Don't resume promise on error
* Use React.Children to manipulate children
* Make catch less weird
* Fix null dereference
Assuming [0] of an empty list == undefined doesn't work if you're
then taking a property of it.
2017-03-09 10:59:22 +00:00
4f7914813d
Make UDD appear when UDE on uploading a file
...
This has highlighted the fact that an unsent image looks very much like a sent image (https://github.com/vector-im/riot-web/issues/3391 ). Also, the "Resend" status bar doesn't appear when an image is unsent.
2017-03-09 10:44:09 +00:00
c98a2144e9
Merge branch 'develop' into luke/add-onclick-permalinks
2017-03-09 09:59:09 +00:00
173daddb04
Comment typo
2017-03-09 09:56:52 +00:00
676c5c21c1
Merge pull request #739 from matrix-org/luke/visible-redactions
...
Show message redactions as black event tiles
2017-03-09 09:41:31 +00:00
2513bfa612
Add onClick to permalinks to route within Riot
2017-03-08 16:55:44 +00:00
c4001b5c5d
Use else instead of two returns
2017-03-08 15:11:38 +00:00
eca82bdb42
Make sure the screen is set, otherwise ignore screenAfterLogin
2017-03-08 10:45:07 +00:00
06a05c351d
Decide on which screen to show after login in one place
...
This follows from a small amount of refactoring done when RTS was introduced. Instead of setting the screen after sync, do it only after login.
This requires as-yet-to-be-PRd riot-web changes.
This includes:
- initialScreenAfterLogin, which can be used to set the screen after login, and represents the screen that would be viewed if the window.location at the time of initialising Riot were routed.
- guestCreds are now part of state, because otherwise they don't cause the login/registration views to update when set.
- instead of worrying about races and using this._setPage, use a dispatch.
2017-03-08 10:25:54 +00:00
b7f1b1a424
Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog
...
Allow user to choose from existing DMs on new chat
2017-03-07 16:22:52 +00:00
65ce8c2113
Merge pull request #741 from matrix-org/dbkr/fix_teamserver_2
...
Fix the team server registration
2017-03-06 17:57:42 +00:00
391886cac4
Remove dis as a dep in RoomTile
2017-03-06 17:45:25 +00:00
bf348a0f78
Instead of listening for view_room, use a callback
...
But make sure that nothing other than the callback is done when RoomTile is clicked.
2017-03-06 17:44:29 +00:00
341f978743
Fix the team server registration
...
Pass extra info from the UI auth process as a second parameter to
onAuthFinished. Allows the email sid & client secret to be used
outside of the UI auth process.
2017-03-06 17:31:21 +00:00
04510da057
Clarify "No devices" message
2017-03-06 16:01:22 +00:00
20fa36325f
Remember to unregister on unmoun
2017-03-06 15:01:46 +00:00
4548d1b824
Use dispatch instead of passing `onClick`, adjust dialog wording.
2017-03-06 14:51:01 +00:00
a122b5d88e
Style
2017-03-06 14:22:12 +00:00
c0fc3ba3fe
Make redactions appear when the event has been redacted (on Room.redaction)
2017-03-06 14:20:24 +00:00
49c66d8645
Merge pull request #735 from matrix-org/luke/matrix-to-timestamp-permalink
...
Change timestamp permalinks to matrix.to
2017-03-06 11:07:50 +00:00
30eddf9fda
Merge pull request #734 from matrix-org/luke/fix-resend
...
Fix resend bar and "send anyway" in UDD
2017-03-06 11:06:52 +00:00
edccfeb20b
No text required, do not continuate after redacted even
...
It's curious, however, that a continuation occured after a redacted event, given that the event shouldn't have a sender
2017-03-06 10:26:26 +00:00
abd71cd2ac
No need for "redactor" as we dont currently show it
2017-03-03 17:57:13 +00:00
9bae936816
Add the redacter display name to the redaction text
2017-03-03 17:35:42 +00:00
5ef61b7c35
Only show a redaction tile for messages
2017-03-03 16:45:29 +00:00
6c32e3720b
Remove seemingly unused "bounce"
2017-03-03 15:51:14 +00:00
fa2cf41039
Make COLOR_REGEX stricter
2017-03-03 15:46:13 +00:00
2bd9885288
Start to show redacted events
2017-03-03 15:42:24 +00:00
62d9439530
Remove old import & pass through result
...
in InteractiveAuthDialog
2017-03-03 14:31:52 +00:00
ca5c2fb82e
Allow user to choose from existing DMs on new chat
...
When creating a new chat with one person, show a dialog that asks the user whether they'd like to use an existing chat or actually create a new room.
Fixes https://github.com/vector-im/riot-web/issues/2760
2017-03-03 13:48:37 +00:00
1bdf213d67
Merge pull request #729 from matrix-org/dbkr/register_ui_auth
...
Port registration over to use InteractiveAuth
2017-03-03 13:37:41 +00:00
977b8a7379
Make UIAuth Dialog show an error
...
when auth fails
2017-03-03 12:08:26 +00:00
ab9aaa9174
Merge pull request #732 from matrix-org/luke/fuse-test
...
Test to see how fuse feels
2017-03-03 10:46:41 +00:00
923ea9c6aa
Change timestamp permalinks to matrix.to
2017-03-03 10:42:44 +00:00
8522231d4f
Revery unintentional change
...
to when teamToken was returned
2017-03-03 10:28:10 +00:00
b822bc66ee
Remove redundant null check
2017-03-03 10:22:02 +00:00
7be55ce65c
Merge pull request #733 from matrix-org/luke/display-name-blur-to-submit
...
Submit a new display name on blur of input field
2017-03-03 10:03:21 +00:00
4fff383de5
Fix resend bar and "send anyway" in UDD
2017-03-03 10:02:08 +00:00
6a007d01a1
Merge pull request #610 from matrix-org/luke/feature-css-msg-colors
...
Allow [bf]g colors for <font> style attrib
2017-03-03 08:35:32 +00:00
f4278b61ea
Update comment
2017-03-02 18:13:01 +00:00
1d5e47cd70
On cancel, blur. Only onValueChanged when the value has changed...
2017-03-02 18:07:24 +00:00
7a092e4ac7
Submit a new display name on blur of input field
2017-03-02 17:29:06 +00:00
0f8ab99158
Have COLOR_REGEX constant
2017-03-02 17:02:00 +00:00
9c6782af6f
Oops, lost trackPromise
2017-03-02 15:08:15 +00:00
91ef26a7f8
makeRegistrationUrl is required
2017-03-02 15:04:10 +00:00
51b2001f70
Remove todo which is now done!
2017-03-02 15:03:24 +00:00
88586a0823
Oops, lost defaultDeviceDisplayName
2017-03-02 15:01:56 +00:00
0914226327
Actuall pass our proxy makeRegistrationUrl
2017-03-02 14:47:47 +00:00
3028b335a4
Oops, re-add referrer param
...
as Registration was still using it
2017-03-02 14:46:18 +00:00
dd762cc835
Add makeRegistrationUrl to proptypes
2017-03-02 14:40:55 +00:00
a5cf3a964b
doc
2017-03-02 14:39:25 +00:00
518a749d90
Add proptypes / isRequired
2017-03-02 14:36:54 +00:00
770c1ce11f
Remove redundant prop
2017-03-02 14:35:08 +00:00
e75c21e9f9
Merge pull request #683 from matrix-org/luke/mels-xor
...
MELS: either expanded or summary, not both
2017-03-02 14:08:06 +00:00
8be66d0f04
Merge pull request #730 from Half-Shot/hs/video-gif-autoplay
...
Autoplay videos and GIFs if enabled by the user.
2017-03-02 13:41:30 +00:00
4b5e8d66b8
Fixed styling + removed log line
2017-03-02 13:39:56 +00:00
0035a91596
Merge pull request #731 from matrix-org/luke/warn-users-e2e-first-time
...
Warn users about using e2e for the first time
2017-03-02 13:28:15 +00:00
95cff17698
Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog
...
Show UDDialog on UDE during VoIP calls
2017-03-02 13:13:45 +00:00
b951713f7f
Remove custom attribs as consumed
2017-03-02 11:39:40 +00:00
36795fa192
Use data-mx[-bg]-color instead of stripping style
...
This has the benefit of not needing a spec for custom CSS. Instead we rigourously sanitise the values for custom data attributes that are transformed to CSS equivalents. `data-mx-color` translates to CSS `color` for example.
2017-03-02 11:36:56 +00:00
9c5fb00da4
Fix syntax
2017-03-01 18:33:45 +00:00
ef5d2bca91
Get errorText from error in stageUpdated
2017-03-01 16:59:25 +00:00
c9ef879afa
PR feedback: Move the email token request here
2017-03-01 16:04:15 +00:00
b7bd93c613
var -> const
2017-03-01 15:55:15 +00:00
187c91b76a
Adjust warning message
2017-03-01 15:42:05 +00:00
6d296a0e7a
Warn users about using e2e for the first time
2017-03-01 15:41:13 +00:00
39427839b9
Use ES6 export style
2017-03-01 14:33:25 +00:00
dd33624454
Merge remote-tracking branch 'origin/develop' into dbkr/register_ui_auth
...
(This ended up mostly being merged by hand as git made a complete
mess of the merge)
2017-03-01 10:45:17 +00:00
f85c452e35
Merge pull request #726 from matrix-org/luke/rts-set-team-token-on-login
...
Notify MatrixChat of teamToken after login
2017-02-28 15:57:22 +00:00
a339316ede
Use a "normal" promise in order to .then
2017-02-28 15:40:49 +00:00
0ef8e2a8f4
Various fixes
2017-02-28 15:18:00 +00:00
48a3d0d595
Refactor to not set team token in bad ways
...
Use the on_logged_in dispatch instead. Call setPage in one place, _onLoggedIn, when deciding which page to view on login. Change some require to import, var to const. Remove onTeamMemberRegistered and just use a nullable argument to onRegistered
2017-02-28 15:05:49 +00:00
1995c16013
Add a user option to enable autoplaying gifs and videos.
2017-02-27 22:17:43 +00:00
4509901592
image (gifs) and video messages will autoplay if enabled.
2017-02-27 22:16:56 +00:00
c22db1db5f
Fix race when signup is completed elsewhere
...
as commented
2017-02-27 18:22:26 +00:00
e5853a6571
Put back server picker for registration
...
* Also fix bug where you couldn't picxk a different server if
you were already registered as a guest (because it still sent
the access token which the new server rejected)
* Propagate errors from UI auth back to registration so it goes
back to the registration screen
2017-02-27 17:24:28 +00:00
7221900497
Refactor remove resend_all_events and cancel_all_events dispatches
2017-02-27 13:39:12 +00:00
5fc828f24c
Allow span, and only allow style attrib
2017-02-27 11:32:57 +00:00
886b0a3f13
Sanitise for *, fix style issues
2017-02-27 11:23:37 +00:00
5be2c62011
Fix a couple of issues with RRs
...
- Shift to the left _before_ adding an avatar so that there are always `MAX_READ_AVATARS` visible, instead of there being `MAX_READ_AVATARS + 1` avatars displayed following the first "collapse".
- Use `right` instead of `left` so that double-digit remainders don't get overlapped.
2017-02-27 11:16:13 +00:00
454aa0757a
Poll for authentication completion
...
on registration (both for email validation and completion of the
whole auth session).
2017-02-24 17:24:10 +00:00
76b381b849
Spurious newline
2017-02-24 12:01:06 +00:00
51467506f8
Port registration over to use InteractiveAuth
...
These changes are moved over from the dbkr/msisdn_signin branch
2017-02-24 11:41:23 +00:00
e1a40a8ef0
Notify MatrixChat of teamToken after login
2017-02-23 16:30:26 +00:00
439bde309e
General ChatInviteDialog optimisations
...
- Use avatar initial instead of "R" or "?"
- Use Fuse.js to do case-insensitive fuzzy search. This allows for better sorting of results as well as search based on weighted keys (so userId has a high weight when the input starts with "@").
- Added debounce of 200ms to prevent analysis on every key stroke. Fuse seems to degrade performance vs. simple, non-fuzzy, unsorted matching, but the debounce should prevent too much computation.
- Move the selection to the top when the query is changed. There's no point in staying mid-way through the items at that point.
2017-02-23 12:12:25 +00:00
fd3c1ab9e1
Merge pull request #718 from matrix-org/luke/ignore-no-tile-events
...
Do not push a dummy element with a scroll token for invisible events
2017-02-23 10:17:16 +00:00
8737112a8c
Merge pull request #715 from matrix-org/luke/mels-scrolling-fix
...
MELS: check scroll on load + use mels-1,-2,... key
2017-02-23 10:12:26 +00:00
0a76e0f621
Merge pull request #723 from matrix-org/luke/fix-e2e-input-placeholder
...
Fix message composer placeholders
2017-02-23 10:09:07 +00:00
8bd42693f7
Fix message composer placeholders
2017-02-23 09:05:26 +00:00
b41787c335
Initial work on improving invite dialog
2017-02-23 09:03:20 +00:00
b68b0e25c8
Merge Matthew's wording patch
2017-02-22 16:59:45 +00:00
f92708fbe6
In practice the MELS-1,2,3 solves nothing, revert it
2017-02-22 16:54:32 +00:00
436e6b36f1
Move UDE handling to a its own file, adjust wording
2017-02-22 16:42:14 +00:00
2b91b0d9c4
Merge pull request #720 from matrix-org/luke/clarify-e2e-input-box
...
Clarify non-e2e vs. e2e /w composers placeholder
2017-02-22 16:20:26 +00:00
816e0be3a0
Retry->Send anyway
2017-02-22 16:17:49 +00:00
9515cf2cf2
Only hangup on call errors, not errors on sendEvent
2017-02-22 16:12:37 +00:00
799e5ee0e9
Less jargon
2017-02-22 14:40:07 +00:00
f230b0a3c0
Fix status bar expanded on tab-complete
...
This had regressed when `_getSize` was introduced. It didn't consider tab completing.
2017-02-22 14:03:30 +00:00
c13ff254b1
Add "Retry" button to UDE
2017-02-22 10:21:43 +00:00
878e31eba2
Show UDDialog on m.call.invite failure
...
Requires https://github.com/matrix-org/matrix-js-sdk/pull/378
Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one.
2017-02-21 17:22:22 +00:00
658c34abf3
Change the name of the database
...
Full name is now `matrix-js-sdk:riot-web-sync`.
2017-02-21 15:44:57 +00:00
fd146a732b
Clarify non-e2e vs. e2e /w composers placeholder
...
For E2E rooms, display "Send an encrypted message…" otherwise display "Send a plaintext message…" as the placeholder for the input box in [old] message composer.
2017-02-21 15:33:44 +00:00
581c8c138e
Do not push a dummy element with a scroll token for invisible events
...
If an event does not `wantTile`, do not add a dummy element with a scroll token, as this can be unperformant with 1000s of events.
2017-02-21 15:01:18 +00:00
05d242cb5c
allow @local:domain style mxids
2017-02-21 14:50:09 +00:00
995e59b973
Merge pull request #716 from matrix-org/luke/feature-default-hs
...
Allow setting the default HS from the query parameter
2017-02-21 14:43:36 +00:00
629f8caad7
oops, remove unneeded import
2017-02-21 09:50:10 +00:00
aabf9255d2
anchor the authcache on LoggedInView to prevent it persisting over logouts
2017-02-21 01:03:22 +00:00
6af0b9618a
first cut of improving UX for deleting devices.
...
This adds a 5 minute auth cache to speed up the process of deleting
old devices. It has the following nastinesses (mainly due to being
written on a flight whilst juggling kids):
* the auth cache is done as context attached to MatrixChat.
one could argue that it should be per-client instead, but we don't
yet have multiple clients.
* the auth cache is only maintained currently in DevicesPanelEntry
(i.e. set & invalidated). One could argue that it might be better
maintained in InteractiveAuth.js or a dedicated cache object
abstraction, but given the only use I can think of is when managing
devices, perhaps this is good enough for now.
2017-02-21 00:19:49 +00:00
9eef3c53a3
Allow setting the default HS from the query parameter
...
Fixes https://github.com/vector-im/riot-web/issues/3207
2017-02-20 16:53:26 +00:00
6fead66f89
MELS: check scroll on load + use mels-1,-2,... key
...
To fix https://github.com/vector-im/riot-web/issues/2916 , force the checking of scroll position by calling _onWidgetLoad (might need renaming...) when a MELS is expanded/contracted.
Also use an keying scheme for MELS that doesn't depend on the events contained, but rather a simple incrementing index based on the order of the MELS as it appears amongst all MELS.
2017-02-20 10:59:11 +00:00
7d07e7f958
Merge pull request #711 from matrix-org/dbkr/fix_commonmark_quote_multiline
...
Fix block quotes all being on a single line
2017-02-20 09:19:41 +00:00
8990e770b7
fix colouring in voip dark theme
2017-02-20 01:43:55 +02:00
5ac76acc05
limit avatar uploads to images
2017-02-19 02:07:08 +02:00
4f4e9a6c3a
Fix block quotes all being on a single line
...
Fixes https://github.com/vector-im/riot-web/issues/3154
2017-02-17 18:06:00 +00:00
db4b9691cc
Support reasons for kick / ban
...
Don't ban me for fun, girl
Let me be the one, girl
Ban me for a reason
Let the reason be love.
2017-02-17 17:27:46 +00:00
10534e7df4
Merge pull request #709 from matrix-org/dbkr/show_when_banned
...
Show when you've been kicked or banned
2017-02-17 16:48:59 +00:00
b18473ccb2
Handle there being no member event when banned
...
Here, and also in MemberEventListSummary where this also broke.
2017-02-17 16:35:18 +00:00
1f5fdf7945
Get a member object, not the user object
2017-02-17 16:14:51 +00:00
a3aea6ba2d
Swap rejoin / forget
2017-02-17 16:11:20 +00:00
9f9de46b10
Add onForgetClick proptype
2017-02-17 16:09:25 +00:00
5abcb91e0d
Merge pull request #708 from matrix-org/kegan/clear-cache
...
Add a 'Clear Cache' button
2017-02-17 15:51:08 +00:00
de4773ba93
Show when you've been kicked or banned
...
Update the room state when you've been kicked or banned, and show
a message in the preview bar, including the reason.
2017-02-17 15:50:30 +00:00
8d6c3cd3f4
Review comments
2017-02-17 15:37:49 +00:00
0a31efa0b7
Add a 'Clear Cache' button
...
This deletes the IndexedDB database and reloads the page.
This solely exists as a get-out clause for users in case the indexedDB instance
gets corrupted. Hopefully we won't ever need to point users to it.
2017-02-17 15:16:28 +00:00
a3746ea1b6
Merge remote-tracking branch 'origin/develop' into dbkr/update_on_room_name
2017-02-17 14:41:54 +00:00
97722af3d6
Merge pull request #698 from matrix-org/dbkr/add_unban_button
...
Add a button to un-ban users in RoomSettings
2017-02-17 12:46:00 +00:00
cc11b3eadc
Merge pull request #687 from matrix-org/kegan/indexeddb
...
Use IndexedDBStore from the JS-SDK
2017-02-17 11:59:44 +00:00
b2344ceb74
Update the room view on room name change
2017-02-17 11:44:56 +00:00
cca266c62c
Review comments
2017-02-17 10:43:55 +00:00
4753552ddc
Merge pull request #706 from matrix-org/luke/fix-team-token-referral-link
...
Make UserSettings use the right teamToken
2017-02-16 18:12:46 +00:00
406c34b715
Make UserSettings use the right teamToken
...
This threads the correct teamToken through to UserSettings for generating the referral section.
2017-02-16 18:00:52 +00:00
9d2bb70823
If the home page is somehow accessed, goto directory
...
For example, if someone ends up on /home somehow, just redirect to the directory instead of displaying a very awkward "File not found" plain text in the home page iFrame.
2017-02-16 17:03:22 +00:00
53f3b5780e
Merge branch 'develop' into kegan/indexeddb
2017-02-16 16:10:23 +00:00
6945e7c154
Merge pull request #699 from matrix-org/luke/fix-avatar-initials
...
Display avatar initials in typing notifications
2017-02-16 14:06:05 +00:00
f07da44aa5
Don't handle logs db: It needs to close its connections first
2017-02-16 12:42:45 +00:00
74487c655d
If a referrer hasn't been specified, use empty string
...
This is interpretted by the RTS as a non-referred team member who still needs the team token to access their welcome page etc.
2017-02-16 09:22:44 +00:00
ebe7ec4000
Rename RTE labs option to "New Composer & Autocomplete"
...
As per confusion around https://riot.im/develop/#/room/!DdJkzRliezrwpNebLk:matrix.org/$1487091505948TmtGn:t2l.io
2017-02-16 02:20:34 +05:30
bdb8f9d052
Don't force-logout the user if reading localstorage fails
...
Give them a modal dialog to give them a chance to abort.
2017-02-15 19:33:39 +00:00
8698d40d3c
Fix docs & add MatrixClient check
...
Addresses PR feedback without breaking RoomSettings
2017-02-15 19:01:00 +00:00
a5a056292d
Revert c082827fc7
...
Revert the WithMatrixClient change: RoomView calls methods on
the RoomSettings component and this breaks when RoomSettings is
wrapped in a WithMatrixClient.
2017-02-15 18:58:59 +00:00
c082827fc7
Fix docs & use WithMatrixClient
2017-02-15 17:58:50 +00:00
8067bb627f
Display avatar initials in typing notifications
...
It seems they don't overlap hawkwawdly anymore, so this displays them always.
Fixes https://github.com/vector-im/riot-web/issues/3084
2017-02-15 16:29:08 +00:00
42bb26925d
Merge branch 'develop' into dbkr/add_unban_button
2017-02-15 13:19:22 +00:00
a5325ee14a
Merge pull request #697 from matrix-org/dbkr/missed_accessiblebuttons
...
Convert some missed buttons to AccessibleButton
2017-02-15 13:10:14 +00:00
431e7a875d
Copyright
2017-02-14 18:10:40 +00:00
1e1ae5c950
Merge pull request #696 from matrix-org/dbkr/ban_becomes_unban
...
Make ban either ban or unban
2017-02-14 18:00:15 +00:00
87516fb950
Add a button to un-ban users in RoomSettings
...
https://github.com/vector-im/riot-web/issues/3091
2017-02-14 17:54:57 +00:00
e1cb34e255
Merge remote-tracking branch 'origin/develop' into dbkr/missed_accessiblebuttons
2017-02-14 17:45:30 +00:00
973b92b8f6
Merge pull request #694 from matrix-org/dbkr/confirm_ban
...
Add confirmation dialog to kick/ban buttons
2017-02-14 17:31:51 +00:00
6fc70415cb
s/onBan/onBanOrUnban/
2017-02-14 17:29:40 +00:00
3d4a831624
Merge pull request #695 from matrix-org/luke/fix-scalar-popup
...
Fix typo with Scalar popup
2017-02-14 17:13:55 +00:00
f38b2dee78
Convert some missed buttons to AccessibleButton
...
In RoomSettings
2017-02-14 17:06:16 +00:00
6663f5bff0
Remove commented stuff
...
That I've now broken such that it wouldnt work if it were
uncommented
2017-02-14 16:12:04 +00:00
ec0ce76d87
Clarify docs
2017-02-14 16:09:02 +00:00
a1c990a2ea
Make ban either ban or unban
...
depending on whether the user is banned already
Mostly gives some feedback that the ban has actually taken effect.
2017-02-14 16:03:30 +00:00
0303a42fc7
Fix typo with Scalar popup
2017-02-14 15:35:14 +00:00
5e232d8500
Argh, ES6 import syntax
2017-02-14 14:33:21 +00:00
ff61b76bf7
Fix imports
2017-02-14 13:58:29 +00:00
689972f023
Copyright
2017-02-14 13:57:22 +00:00
8001c0b16b
Add confirmation dialog to kick/ban buttons
...
Add a specific dialog used for confirming member actions.
Also remove onFinished from MemberInfo which did absolutely
nothing.
2017-02-14 13:40:19 +00:00
1b8e93d4f2
Treat the literal team token string "undefined" as undefined
...
Some users appear to have gotten team tokens into their local storage. This fix will treat the literal string "undefined" as undefined.
2017-02-14 12:56:29 +00:00
0e08646d01
Merge pull request #692 from matrix-org/luke/fix-missing-sid
...
Store retrieved sid in the signupInstance of EmailIdentityStage
2017-02-14 11:35:12 +00:00
6996291f0c
Store retrieved sid in the signupInstance of EmailIdentityStage
...
When registeration is complete, the RTS needs the sid, which was previously only sent to the HS. This update will also store it in the signupInstance so that it can be sent to the RTS.
2017-02-14 11:00:40 +00:00
17b08aedfc
Merge pull request #691 from matrix-org/dbkr/interactive_auth_nondialog
...
Split out InterActiveAuthDialog
2017-02-14 10:55:12 +00:00
43a740df15
Add busy param to docs
2017-02-14 10:34:43 +00:00
ba3e62e395
Remove old docs
2017-02-14 10:31:56 +00:00
18cba1fe45
Merge pull request #689 from matrix-org/luke/rts-set-team-token-view-home
...
View /home on registered /w team
2017-02-14 10:21:23 +00:00
36d126f3a9
PR feedback
2017-02-13 19:09:43 +00:00
8fc3104507
Replace submit button with a spinner when busy
...
and update test accordingly
2017-02-13 18:52:33 +00:00
77b226631a
Copyright
2017-02-13 16:15:00 +00:00
79d9deb339
Split out InterActiveAuthDialog
...
Into a component that does Interactive Auth and a dialog that
wraps it, so we can do interactive auth not necessarily in a
dialog.
As a side effect:
* Put the buttons for each auth stage in the stage itself.
Some stages don't have submit buttons (and it's very possible
other stages may have other buttons entirely, like 'resend')
so it makes more sense for the buttons to live in the stage
components themselves. Plus it saves the slightly evil
calling-functions-on-react-children thing we were doing (and
indeed extending that to show the submit button at all).
* Give all BaseDialogs a cross in the top right to cancel. They
were all dismissable by clicking outside or pressing esc, so
this adds a more visually obvious way of dismissing them. Plus,
it means our InteractiveAuthDialog can have a way of canceling
the whole operation separate from buttons for the individual
stages.
2017-02-13 16:03:21 +00:00
16e3365240
Use a callback prop instead of `window.`
2017-02-13 14:36:35 +00:00
a21e71f59d
Merge pull request #688 from matrix-org/luke/rts-use-sid-client-secret
...
Instead of sending userId, userEmail, send sid, client_secret
2017-02-13 13:49:23 +00:00
b45da45457
Merge pull request #686 from matrix-org/luke/rts-enable-branded-urls
...
Enable branded URLs again by parsing the path client-side
2017-02-13 13:38:55 +00:00
75deb55844
Null check on teamName
2017-02-13 11:48:03 +00:00
4ac769168a
View /home on registered /w team
2017-02-10 17:17:58 +00:00
29f5e88f6a
Instead of sending userId, userEmail, send sid, client_secret
...
This has the benefit of being possible from the _second_ riot instance, which may not actually have the email of the user registering. With these parameters, the RTS can get the email and user ID itself.
(see https://github.com/matrix-org/riot-team-server/pull/15 )
2017-02-10 16:50:25 +00:00
33fc4f7d8d
Merge pull request #680 from matrix-org/luke/rts-fix-reg-icon
...
Use new method of getting team icon
2017-02-10 16:39:11 +00:00
c46f282139
Comments
2017-02-10 16:19:39 +00:00
f628ee2ef0
Merge branch 'develop' into kegan/indexeddb
2017-02-10 16:16:17 +00:00
bdd031eac2
Enable branded URLs again by parsing the path client-side
...
Use the first path segment to key off config.teamTokenMap, which contains a mapping to teamTokens. The client then behaves as before, keeping the path in the address bar constant with no redirects required.
2017-02-10 15:09:45 +00:00
407bcf1bb9
Delete database on logout. DI a SyncAccumulator. Log uncaught errors
2017-02-10 14:22:54 +00:00
ec730056d8
Alter comment
2017-02-10 11:39:22 +00:00
bab6a0b84a
Persist query parameter team token across refreshes
2017-02-10 11:31:04 +00:00
45f5b8b3a9
Thread teamToken through to LeftPanel for "Home" button
...
This means the riot-web will use the same teamToken used by sdk components. This includes cases where only the fragment query parameter has been provided.
Fixes matrix-org/riot-web#3185
2017-02-10 09:57:28 +00:00
8d3876c7d0
MELS: either expanded or summary, not both
...
Fixes vector-im/riot-web#3097
2017-02-09 15:14:16 +00:00
69add8fd64
Actually use the RTS URL
2017-02-09 13:16:46 +00:00
ae03244e6e
Merge branch 'develop' into luke/feature-css-msg-colors
2017-02-09 13:14:15 +00:00
7ba9e27893
Merge pull request #682 from matrix-org/luke/fix-typing-notif
...
Fix typing notif and status bar
2017-02-09 10:46:37 +00:00
103710728f
Do not show "+1 other"
...
Instead show a user name or avatar.
2017-02-09 10:30:06 +00:00
553054409f
Use (props,state) ordering of arguments
...
There was a bug here that meant that sometimes arguments were given in the wrong order; presumably leading to the status bar not appearing for calls etc.
2017-02-09 10:01:59 +00:00
cc69e982a7
Use single state to set both avatars and typing notif
2017-02-09 10:01:51 +00:00
40658494b4
Consider emails ending in matrix.org as a uni email
...
For the purposes of testing (and having a team page)
2017-02-09 09:29:55 +00:00
747c0c44a6
Use new method of getting team icon
...
This was necessary because the team token may not be known when registering, but domain is. Storing the icon under the "common" directory is the chosen solution to this.
2017-02-09 09:24:46 +00:00
ad2710ec5d
fix CSS for import/export buttons
2017-02-09 02:00:58 +00:00
ea50acfc87
fix dark theme for uploadbar
2017-02-09 01:26:53 +00:00
231997dd63
unbreak /markdown off
2017-02-09 01:18:09 +00:00
449519dc32
Merge pull request #679 from matrix-org/luke/rts-email-verif-referrer
...
Set referrer qp in nextLink
2017-02-08 22:05:49 +00:00
c2d5b72d68
Set referrer qp in nextLink
...
This is so that when the verification link is clicked from an email, the referrer is set on the new instance of riot when /rts/register is hit
2017-02-08 17:58:40 +00:00
260cb62438
Do not set team_token if not returned by RTS on login
2017-02-08 16:49:33 +00:00
fe17e2452b
Merge pull request #676 from matrix-org/luke/rts-team-token-login
...
Get team_token from the RTS on login
2017-02-08 10:54:24 +00:00
8fea4c27cb
fix NPE
2017-02-07 22:00:56 +00:00
3d30db81e0
Only init RTS if configured correctly
2017-02-07 15:24:57 +00:00
3f9f59bb73
Import RtsClient at top
2017-02-07 15:23:23 +00:00
96539a4054
Merge pull request #666 from matrix-org/luke/rts-welcome-pages
...
RTS Welcome Pages
2017-02-07 13:42:47 +00:00
d5f6ecdc49
Use teamToken, not config when doing screen fallback
2017-02-07 13:23:58 +00:00
c93b6c3c34
Style, fixes
2017-02-07 13:15:40 +00:00
af19ea8bb7
Document login API
2017-02-07 12:01:44 +00:00
484d9d708e
Logging to try to track down riot-web#3148
...
Since I can't figure out how this is happening, add a shedload of logging to
try to pin it down.
2017-02-06 16:01:25 +00:00
77f76db68b
UserSettings: s/vector-web/riot-web/
...
vector is dead, long live riot
2017-02-06 09:50:14 +00:00
4f3549cc37
Fix: actually get the team token
2017-02-03 14:42:22 +00:00
173e80a5de
Get team_token from the RTS on login
...
Use the /login endpoint of the RTS to get the team token when the user has successfully logged in.
2017-02-03 14:34:24 +00:00
827b5a6811
Fix deviceverifybuttons
...
Use DeviceInfo from deviceVerificationChanged event rather than calling
non-existent getStoredDevice
2017-02-03 14:34:19 +00:00
efae5f6bf1
Use localStorage team token with fall-back on query parameter
2017-02-03 11:48:24 +00:00
5df5fed6f5
Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty
...
Fix timeline & notifs panel spuriously being empty
2017-02-03 11:35:28 +00:00
2b67c1245f
Merge pull request #636 from matrix-org/matthew/blacklist-unverified
...
UI for blacklisting unverified devices per-room & globally
2017-02-03 11:32:24 +00:00
3ea746db1d
Fix RoomSettings
...
Don't enable encryption unless the box is checked!
2017-02-03 11:20:36 +00:00
470e760e42
Fix timeline & notifs panel spuriously being empty
...
Only claim there's nothing to display once we've failed to back
paginate, otherwise we'll show the empty message instead of the
MessagePanel and therefore never try to back-paginate.
2017-02-03 11:11:37 +00:00
e018eef9fa
UnknownDeviceDialog.js: tweak warning
2017-02-03 10:50:03 +00:00
28d28b55d1
correctly reflect verify/blacklist state in UI
2017-02-03 01:49:22 +00:00
5de84f845a
tweak verbiage
2017-02-03 01:49:05 +00:00
e825a4af3c
show better error msg after UnkDevDialog
...
should fix https://github.com/vector-im/riot-web/issues/3122
2017-02-03 00:45:33 +00:00
be41462f3a
merge
2017-02-02 22:05:44 +00:00
cd5a1abfac
Merge pull request #673 from matrix-org/dbkr/make_default_avatars_clickable
...
Make default avatars clickable
2017-02-02 18:49:08 +00:00
e7a32faf64
Wrap multiline JSX in parens
2017-02-02 18:47:24 +00:00
8799891e0e
hopefully fix key array warning
2017-02-02 18:47:15 +00:00
2bb275c071
missing (c)
2017-02-02 18:45:49 +00:00
1fc5c9ddcc
Merge pull request #672 from matrix-org/dbkr/velociraptor_always_change_visibility
...
Fix one read receipt randomly not appearing
2017-02-02 18:45:29 +00:00
10edab06a6
Don't c+p the complex markup
2017-02-02 18:41:50 +00:00
7484cc3f70
Make default avatars clickable
...
BaseAvatar can be passed an onClick which is called when it's, er,
clicked, except when it was the default avatar in which case it
merrily ignored it. Make it not ignore it.
2017-02-02 18:29:33 +00:00
2cf24c17e2
double scrollback window on roomview
2017-02-02 18:27:21 +00:00
d567b3bb6a
fix 'show rightpanel' button alt text & icon
2017-02-02 18:27:21 +00:00
42f75e1740
Fix one read receipt randomly not appearing
...
The velociraptor was only actioning hidden -> visible transitions
if the position had changed, so the one RR that stayed in position
but became visible... didn't become visible.
2017-02-02 18:21:53 +00:00
e45ac36a3b
Merge pull request #635 from matrix-org/matthew/warn-unknown-devices
...
very barebones support for warning users when rooms contain unknown devices
2017-02-02 18:08:18 +00:00
5d5125df15
fix copyright & always show gemini
2017-02-02 18:02:07 +00:00
4ab479594b
temporarily stop hiding the statusbar
...
as per https://github.com/vector-im/riot-web/issues/1991#issuecomment-276953915
2017-02-02 17:48:54 +00:00
e9a53a8957
Merge pull request #671 from matrix-org/dbkr/fix_read_receipt_unhide
...
Fix expanding/unexapnding read receipts
2017-02-02 17:45:04 +00:00
b561b711df
Fix expanding/unexapnding read receipts
...
Make the AccessibleButton element be the img directly rather than
wrapping it in a div which is unnecessary and breaks the rendering.
Fixes https://github.com/vector-im/riot-web/issues/3052
2017-02-02 17:36:26 +00:00
eebc7539f9
Megolm export: Increase to 500000 PBKDF rounds
...
This takes 370ms on my machine (100000 only took 100ms).
2017-02-02 16:38:19 +00:00
08ad69847c
show placeholder of timeline empty
2017-02-02 16:32:10 +00:00
68f644c824
Merge pull request #669 from matrix-org/dbkr/read_receipt_title
...
Make read receipt's titles more explanatory
2017-02-02 15:25:45 +00:00
7ae54b34f3
Merge pull request #667 from matrix-org/dbkr/fix_markdown_spurious_html
...
Fix spurious HTML tags being passed through literally
2017-02-02 15:18:42 +00:00
c5b752cac1
Make read receipt's titles more explanatory
...
Throwing this one in a suggestion while I'm in the area: I think
this would help people understand what the read receipt avatars
are.
2017-02-02 15:08:18 +00:00
300cd962e5
Add glue code to make react-sdk use indexedDB
2017-02-02 14:27:27 +00:00
853c89dfdc
Fix spurious html tags like <shrug>
...
* Only render HTML tags in markdown if they're del tags
* Consider non-allowed HTML tags as plain text nodes, so
a message of just '<shrug>' doesn't need to be sent as
HTML
* Consequently rewrite isPlaintext to just look at the parse
tree rather than making and gutting a renderer to walk
the tree (now we're using a library that actually produces
a meaningfgul parse tree).
* Tweak when we put \n on text output to avoid putting \n on
the end of messages.
Fixes https://github.com/vector-im/riot-web/issues/3065
2017-02-02 14:17:07 +00:00
b9bc8eefd0
Typo
2017-02-02 13:56:54 +00:00
1c4c80cc5f
boldify the preview bar click
2017-02-02 13:32:19 +00:00
211be5752c
try to make joining rooms more obvious
2017-02-02 13:32:07 +00:00
2aaf77974d
Pass RTS URL through
2017-02-02 11:57:56 +00:00
63e47d8677
Make ourselves a new rendered each time
...
Rather than keeping one in memory, abusing it in different ways
each time and then craefully putting it back the way it was (and
in one case, failing, because we forgot to put the `out` method
back).
2017-02-02 11:45:21 +00:00
72e5b2235d
Parse once and re-use the parsed output
...
Rather than re-parsing the same output in each function
2017-02-02 11:34:39 +00:00
fc90ed1c3a
Update the comments in Markdown.js
...
so they don't claim it;s a wrapper around marked when it's now
commonmark, and comment why we render markdown to plaintext which
is somewhat unintuitive.
2017-02-02 11:27:07 +00:00
8c941b11cd
Use `mx_team_token` instead of config
2017-02-02 11:22:40 +00:00
5e5b7f89f4
support scrollable content for UnknownDeviceDialog
2017-02-02 00:25:49 +00:00
c09d173415
Merge branch 'develop' into matthew/warn-unknown-devices
2017-02-01 22:34:55 +00:00
acde1f3db7
Merge branch 'develop' into luke/rts-welcome-pages
...
Conflicts:
src/components/views/avatars/BaseAvatar.js
2017-02-01 17:22:45 +00:00
f8d7902d2e
Merge pull request #662 from matrix-org/luke/rts-handle-errors
...
Throw errors on not 'ok' status codes from RTS, swap to `whatwg-fetch` for sending requests to RTS.
2017-02-01 11:44:04 +00:00
028c40e293
Linting
2017-02-01 11:16:14 +00:00
fa1981ce09
Use whatwg-fetch instead of browser-request
2017-02-01 10:39:52 +00:00
6f53b2de2c
Merge pull request #663 from matrix-org/rav/fix_tests
...
Make tests pass on Chrome again
2017-02-01 10:20:30 +00:00
cd1cf09dc9
Make tests pass on Chrome again
...
It seems that a number of the tests had started failing when run in
Chrome. They were fine under PhantomJS, but the MegolmExport tests only work
under Chrome, and I need them to work...
Mostly the problems were timing-related, where assumptions made about how
quickly the `then` handler on a promise would be called were no longer
valid. Possibly Chrome 55 has made some changes to the relative priorities of
setTimeout and sendMessage calls.
One of the TimelinePanel tests was failing because it was expecting the contents
of a div to take up more room than they actually were. It's possible this is
something very environment-specific; hopefully the new value will work on a
wider range of machines.
Also some logging tweaks.
2017-01-31 22:40:53 +00:00
2f188770e5
Typo
2017-01-31 15:59:38 +00:00
be869a8ac6
Add referral section to user settings ( #661 )
...
This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition. Also allows the base referral URL to be configurable (i.e. for Electron app, etc.) and be default this is `window.location.origin`.
2017-01-31 15:55:42 +00:00
c261ca1f5e
Allow base referral URL to be configurable
2017-01-31 15:17:43 +00:00
4c4cc585c7
Throw errors on !==200 status codes from RTS
2017-01-31 13:40:01 +00:00
c2b0c603c0
Add referral section to user settings
...
This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition.
2017-01-31 13:17:01 +00:00
91d33e3cc4
Merge pull request #660 from matrix-org/rav/megolm_export_fixes
...
Two megolm export fixes:
2017-01-31 13:13:20 +00:00
c5f447260a
Megolm import: Fix handling of short files
...
Make sure we throw a sensible error when the body of the data is too short.
2017-01-31 12:30:30 +00:00
62c8c20268
Megolm export: fix Android incompatibility
...
I'd carefully added a workaround to maintain compatibility with the Android
AES-CTR implementation... to the wrong thing.
2017-01-31 12:29:16 +00:00
878e5593ba
Implement tracking of referrals ( #659 )
...
* Implement tracking of referrals
This also modifies (or fixes) auto-joining.
2017-01-31 11:13:05 +00:00
4e9229e936
Get rid of dupl. declaration
2017-01-30 16:37:16 +00:00
1e279d2335
Finish with .done()
2017-01-30 16:35:34 +00:00
f5efc8e765
Use const, not var
2017-01-30 16:33:16 +00:00
eb4d7f04e7
Use busy spinner when requesting teams
2017-01-30 16:23:52 +00:00
318d871097
Formatting
2017-01-30 16:13:57 +00:00
4e0889454a
GET /teams from RTS instead of config.json
...
Now that the RTS contains config for teams, use GET /teams to get that information so that users will see be able to register as a team (but not yet auto-join rooms, be sent to welcome page or be tracked as a referral).
2017-01-30 15:50:31 +00:00
f5458d34aa
Fix inviting import fail
2017-01-27 21:57:34 +00:00
d9a8acd431
Redo team-based registration ( #657 )
...
For compatibility with referral campaign flows, re-implement team registration such that the team is selected through providing an email with a known team domain. The support email is now only shown when an email that _looks_ like a UK/US university email address, but is not known.
2017-01-27 16:31:36 +00:00
f462bd8f99
Expand status *area* unless status *bar* not visible ( #655 )
2017-01-26 18:07:42 +00:00
9c99dafba5
Guard onStatusBarVisible/Hidden with this.unmounted
2017-01-26 17:03:01 +00:00
2c7b3d9a02
UnknownDeviceDialog: Reword the warning
2017-01-26 14:55:58 +00:00
0a3d9fc17f
Fix lint
2017-01-26 14:12:00 +00:00
67bd2cf9dd
Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified
2017-01-26 14:09:25 +00:00
f06de1f129
Merge pull request #654 from matrix-org/rav/fix_e2e_dialog_cancel
...
Fix cancel button on e2e import/export dialogs
2017-01-26 11:41:30 +00:00
e2edecc55b
Merge pull request #653 from matrix-org/dbkr/invite_look_up_emails
...
Look up email addresses in ChatInviteDialog
2017-01-26 11:35:06 +00:00
c42b705497
Use a cancel function
...
rather than checking queryList each time
2017-01-26 10:54:07 +00:00
23a25e550d
Missed a `function`
2017-01-26 10:09:33 +00:00
bf66f77acb
Set state in _lookupThreepid
2017-01-26 10:08:44 +00:00
60d7575146
Merge branch 'matthew/warn-unknown-devices' of github.com:matrix-org/matrix-react-sdk into matthew/warn-unknown-devices
2017-01-25 23:17:57 +00:00
ebf6ba8994
explicitly set device known-ness
2017-01-25 23:52:56 +01:00
70190be65c
Factor out common onSendMessageFailed
2017-01-25 22:23:21 +00:00
5da6ca8fc1
Refactor UnknownDeviceDialog
...
hopefully make this a bit more readable, and use our new BaseDialog.
2017-01-25 22:23:21 +00:00
5538ce7c30
Merge branch 'develop' into matthew/warn-unknown-devices
2017-01-25 22:22:50 +00:00
81d95ecea0
Fix cancel button on e2e import/export dialogs
...
Make sure that we preventDefault on the cancel button.
Fixes https://github.com/vector-im/riot-web/issues/3066
2017-01-25 22:15:09 +00:00
e1e87807b5
Look up email addresses in ChatInviteDialog
...
So email addresses known to the IS get a display name & avatar
2017-01-25 18:51:28 +00:00
c3616fd208
Merge pull request #652 from matrix-org/kegan/rageshake-glue
...
Move BugReportDialog to riot-web
2017-01-25 17:20:43 +00:00
12642bdf2b
Merge pull request #651 from matrix-org/rav/roomheader_theming_fix
...
Fix dark theme styling of roomheader cancel button
2017-01-25 17:02:07 +00:00
8a5e19f64f
Merge pull request #649 from matrix-org/rav/stack_dialogs
...
Allow modals to stack up
2017-01-25 16:45:50 +00:00
a2dd1fa0a9
Merge branch 'develop' into matthew/warn-unknown-devices
2017-01-25 16:44:03 +00:00
21f3aeac8e
Revert accidental change
...
This was an unrelated change which is being done on another branch anyway
2017-01-25 16:40:27 +00:00
e9de34ec40
We no longer supply a BugReportDialog
2017-01-25 16:35:16 +00:00
5099f07562
Fix dark theme styling of roomheader cancel button
2017-01-25 16:33:29 +00:00
bea6df88e0
Move BugReportDialog to riot-web
2017-01-25 16:33:00 +00:00
55dc2e0161
Factor out common CancelButton
2017-01-25 16:32:06 +00:00
e5fde759e6
Merge pull request #642 from matrix-org/kegan/rageshake-ui
...
Add bug report UI
2017-01-25 16:03:22 +00:00
a3b938427d
Merge pull request #625 from matrix-org/dbkr/user_search_feedback
...
Better feedback in invite dialog
2017-01-25 15:59:47 +00:00
602ce37ba7
Merge branch 'develop' into kegan/rageshake-ui
2017-01-25 15:52:00 +00:00
dc7a169779
Merge pull request #647 from matrix-org/rav/megolm_backup_ui
...
Import and export for Megolm session data
2017-01-25 15:43:15 +00:00
ced1c45a34
Doc state in getinitialstate
2017-01-25 15:23:50 +00:00
9cadc2f55f
Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality
...
Overhaul MELS to deal with causality, kicks, etc.
2017-01-25 15:20:30 +00:00
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
Michael Telatynski
