2c5fb01f03
Fix bugs introduced by dodgy merge
2017-05-16 14:13:22 +01:00
6bd7af2917
Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1"
...
This reverts commit 3549ff25431db677141e
2017-05-16 14:00:09 +01:00
66985e6d08
Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd
2017-05-16 13:59:54 +01:00
5a3c32044e
disableConfirmation -> confirm
2017-05-16 12:45:14 +01:00
c6350379dc
Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password
...
Remove "Current Password" input if mx_pass exists
2017-05-16 12:29:23 +01:00
633c6b39f6
Add comment to Lifecycle
2017-05-16 11:58:37 +01:00
eb36e979c2
Reference store token, call .remove on it on unmount
2017-05-16 11:52:51 +01:00
f7e6a996c5
Add proptype
2017-05-16 11:51:09 +01:00
93ecdc90a9
Make confirmation optional on ChangePassword
...
Add option to disable password change confirmation (`disabledConfirmation`). Style fixes, use `<button>` element on ChangePassword submit button.
2017-05-16 11:45:01 +01:00
d7eec27c4b
Merge pull request #889 from matrix-org/luke/new-guest-access-need-to-set-mx-id
...
Replace NeedToRegisterDialog /w SetMxIdDialog
2017-05-15 18:36:20 +01:00
f199f3599e
Replace NeedToRegisterDialog /w SetMxIdDialog
...
This uses MatrixChat's `view_set_mxid`
2017-05-15 17:31:26 +01:00
269fd51130
Remove SessionStore listener on unmount
2017-05-15 17:17:32 +01:00
eb0041d21a
Remove redundant state
2017-05-15 17:03:54 +01:00
f73cf772fb
Move sessionStore ref from MatrixChat to LoggedInView
...
MatrixChat didn't actually use the sessionStore, so this is one less prop to pass.
2017-05-15 14:56:05 +01:00
da3cb0ee48
SessionStore extends flux.Store
2017-05-15 14:52:19 +01:00
8715b5233c
link to #/register
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-15 10:31:17 +01:00
83cb1e6e29
tell guests they can't use filepanel until they register
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-15 10:15:35 +01:00
317e24852d
explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531
2017-05-15 03:03:17 +01:00
486301cffb
remove dodgy heuristics for hiding dates on RRs and use DateUtils instead.
...
reverts 5d99d68a64https://github.com/vector-im/riot-web/issues/3523
2017-05-15 02:55:07 +01:00
6879f7ee6f
add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720
2017-05-15 02:43:23 +01:00
5c0c49e1f6
ignore voip answer/hangup in unread events - fixes https://github.com/vector-im/riot-web/issues/3827
2017-05-15 02:18:18 +01:00
82092dc2d8
onClick MELS avatars = expand MELS; fixes https://github.com/vector-im/riot-web/issues/3899
2017-05-15 02:15:00 +01:00
7d8c104cb8
Merge pull request #884 from matrix-org/t3chguy/tiny_usersettings_fixes
...
I broke UserSettings for webpack-dev-server
2017-05-15 01:57:45 +01:00
7f78e737eb
Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing
...
various fixes to RoomHeader
2017-05-15 01:52:42 +01:00
24d09d8f5b
Merge pull request #885 from matrix-org/t3chguy/rte_emote_weirdness
...
remove /me whether or not it has a space after it
2017-05-15 01:50:53 +01:00
48864b0880
fix visibility of topbar close on dark theme, fixing https://github.com/vector-im/riot-web/issues/3783
2017-05-15 01:39:57 +01:00
c5f2b69e48
add alt attributes to e2e icons on msgs; fixes https://github.com/vector-im/riot-web/issues/3786
2017-05-15 01:37:24 +01:00
c0cead1546
workaround for https://github.com/vector-im/riot-web/issues/3633 .
...
unsure our vector url match could ever return undefined, but apparently it is...
2017-05-15 01:32:37 +01:00
f3274426db
revert f999aa9 and support full date formats when desired
2017-05-15 00:25:20 +01:00
38cb123506
Merge pull request #883 from matrix-org/t3chguy/file_panel_fixes
...
show error if we can't set a filter because no room
2017-05-15 00:19:45 +01:00
d7c88a9813
only removed /me , remove anyway to fix vector-im/riot-web#3733
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-13 15:20:31 +01:00
6ec799a028
I broke UserSettings for webpack-dev-server
...
where version file doesn't exist, version starts as null
then gets set to undefined by the promise
this wasn't handled and now undefined is understood to be unknown
rather than null
also picked up on a small casing error
threePids vs threepids, most things using the latter apart from the init
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-13 15:04:20 +01:00
29568feb95
show error if we can't set a filter
...
this way it still works for a room we've been in before
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-12 22:38:57 +01:00
60b13d76a5
conform to Luke's other comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-12 21:20:56 +01:00
822f2f10f2
conform to Luke's comment
...
https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-12 21:16:55 +01:00
69d860e982
revert name overengineering, undefined onClick should be fine on div
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-12 21:06:36 +01:00
683f1b8a1a
Invite the welcome user after registration if configured
...
This will shift focus to the welcome user DM.
We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
2017-05-12 17:39:38 +01:00
2b4c87aca6
Remove useless comment
2017-05-12 16:02:38 +01:00
536724e7c5
ES6 SessionStore
2017-05-12 15:58:44 +01:00
6ffe7ef9b2
Use same singleton impl as MatrixClientPeg for SessionStore
2017-05-12 15:50:01 +01:00
5c8187dc8f
Explicitly pass thru userHasGeneratedPassword
2017-05-12 15:47:37 +01:00
1176573f39
Implement SessionStore
...
This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)
2017-05-12 12:02:45 +01:00
8725ef3863
Remove "Current Password" input if mx_pass exists
...
If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.
2017-05-11 17:47:45 +01:00
5e4467adce
hide settings/search appropriately
...
pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE
if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-11 17:35:06 +01:00
f55b27f432
looks like it is passed and accessed like a string
...
so unless I'm going insane, it should be a string.
fixes
```
rageshake.js:61 Warning: Failed prop type: The prop `onClick` is marked as required in `AccessibleButton`, but its value is `undefined`.
in AccessibleButton (created by RoomHeader)
in RoomHeader (created by RoomView)
in div (created by RoomView)
in RoomView (created by LoggedInView)
in main (created by LoggedInView)
in div (created by LoggedInView)
in div (created by LoggedInView)
in LoggedInView (created by MatrixChat)
in MatrixChat
```
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-11 17:32:23 +01:00
cfa108a28c
No need to dispatch, just call setMxId
2017-05-11 17:07:03 +01:00
6326a95b39
Prevent ROUs from creating new chats/new rooms
...
Spawn a SetMxIdDialog instead and do nothing.
2017-05-11 17:04:11 +01:00
2437eb7910
Merge pull request #874 from matrix-org/luke/fix-rm-not-updating
...
Fix RM not updating if RR event unpaginated
2017-05-11 15:54:49 +01:00
5151264f60
Merge branch 'develop' into new-guest-access
...
Conflicts:
src/component-index.js
2017-05-11 13:22:30 +01:00
852e1eb720
Rename some variables
...
`ReadUpTo` -> `RR`
`ReadReceipt` -> `RR`
`ReadMarker` -> `RM`
2017-05-11 09:31:59 +01:00
