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
David Baker