David Baker
1aabaec158
Revert "comment out spammy CTD logging"
...
This reverts commit 19482d751d
2017-05-16 15:35:22 +01:00
David Baker
ff9c40472a
Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus"
...
This reverts commit 0ac836919d7e07ffd55f
2017-05-16 14:50:29 +01:00
David Baker
19dcd83aeb
Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs"
...
This reverts commit 1913a32fbd0c16298c45
2017-05-16 14:50:19 +01:00
David Baker
387529d130
Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2"
...
This reverts commit 3366d3bbaeceb71a4ef6
2017-05-16 14:49:55 +01:00
David Baker
d06bd3cf9d
Revert "Fix Create Room button"
...
This reverts commit 9cae667c06
2017-05-16 14:30:02 +01:00
David Baker
f8d1a6d240
Revert "Fix 'start chat' button"
...
This reverts commit c841eb641b
2017-05-16 14:26:46 +01:00
Luke Barnard
ca907f42dc
Fix redundant getComponent
2017-05-16 14:24:24 +01:00
Luke Barnard
219bfffea2
Only dispatch password_changed when password has changed
2017-05-16 14:24:09 +01:00
Michael Telatynski
58ada2c27d
move mxEvent.status check to js-sdk
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-16 14:14:06 +01:00
Luke Barnard
2c5fb01f03
Fix bugs introduced by dodgy merge
2017-05-16 14:13:22 +01:00
Michael Telatynski
db78534b45
remove no longer required parseIntWithDefault
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-16 14:10:00 +01:00
Michael Telatynski
d55f4f9e6a
use new RoomState method from matrix-org/matrix-js-sdk/pull/435
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-16 14:08:00 +01:00
Luke Barnard
49437e301e
Merge pull request #890 from matrix-org/luke/new-guest-access-change-pwd
...
Make confirmation optional on ChangePassword
2017-05-16 14:05:19 +01:00
Luke Barnard
c6ff45261d
Merge pull request #3921 from vector-im/luke/new-guest-access-set-pwd-dialog
...
Implement dialog to set password
2017-05-16 14:05:03 +01:00
David Baker
6bd7af2917
Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1"
...
This reverts commit 3549ff25431db677141e
2017-05-16 14:00:09 +01:00
Luke Barnard
66985e6d08
Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd
2017-05-16 13:59:54 +01:00
Luke Barnard
11d88aa6a2
import dispatcher
2017-05-16 13:56:12 +01:00
Luke Barnard
36ec39ffc0
Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog
2017-05-16 13:49:18 +01:00
Luke Barnard
48856c31f8
Dispatch password_changed when SetPasswordDialog finished
2017-05-16 13:48:56 +01:00
Michael Telatynski
aff1e14efc
first go at show redact only if we can redact
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-16 13:15:14 +01:00
Luke Barnard
e367fb5a98
disabledConfirmation -> confirm
2017-05-16 12:45:30 +01:00
Luke Barnard
5a3c32044e
disableConfirmation -> confirm
2017-05-16 12:45:14 +01:00
Luke Barnard
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
Luke Barnard
633c6b39f6
Add comment to Lifecycle
2017-05-16 11:58:37 +01:00
Luke Barnard
eb36e979c2
Reference store token, call .remove on it on unmount
2017-05-16 11:52:51 +01:00
Luke Barnard
f7e6a996c5
Add proptype
2017-05-16 11:51:09 +01:00
Luke Barnard
e6f6b8cebd
Merge pull request #3924 from vector-im/luke/new-guest-access-need-to-set-mx-id
...
Replace NeedToRegister with SetMxId dialog
2017-05-16 11:48:24 +01:00
Luke Barnard
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
Luke Barnard
79d32868a6
Replace NeedToRegister with SetMxId dialog
2017-05-16 11:39:30 +01:00
Luke Barnard
5814a3fdc8
Fix copyright
2017-05-16 10:11:44 +01:00
Luke Barnard
0e787a09c3
Implement dialog to set password
...
Until https://github.com/matrix-org/matrix-react-sdk/pull/881 , ChangePassword will not know about the cached password (so it won't hide "Current Password" yet).
There's also a bit of work left - informing the SessionStore that the password has changed (marked with a TODO)
2017-05-16 09:44:52 +01:00
Matthew Hodgson
c8ac60768d
Merge pull request #3919 from vector-im/t3chguy/patch-1
...
fix #3894
2017-05-15 21:15:03 +01:00
Michael Telatynski
cef26a5b20
fix #3894
2017-05-15 21:14:01 +01:00
Matthew Hodgson
c15a67a8d8
Merge pull request #887 from matrix-org/t3chguy/guests_cant_filter
...
tell guests they can't use filepanel until they register
2017-05-15 19:45:49 +01:00
Luke Barnard
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
Luke Barnard
f199f3599e
Replace NeedToRegisterDialog /w SetMxIdDialog
...
This uses MatrixChat's `view_set_mxid`
2017-05-15 17:31:26 +01:00
Luke Barnard
269fd51130
Remove SessionStore listener on unmount
2017-05-15 17:17:32 +01:00
Luke Barnard
eb0041d21a
Remove redundant state
2017-05-15 17:03:54 +01:00
Luke Barnard
5584a5cdfd
Merge pull request #882 from matrix-org/luke/new-guest-access-welcome-user
...
Invite the welcome user after registration if configured
2017-05-15 15:06:44 +01:00
Luke Barnard
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
Luke Barnard
da3cb0ee48
SessionStore extends flux.Store
2017-05-15 14:52:19 +01:00
Richard van der Hoff
824da83ecd
Merge pull request #888 from matrix-org/luke/reskindex-cache-filenames
...
Prevent reskindex -w from running when file names have not changed
2017-05-15 11:39:43 +01:00
Michael Telatynski
8715b5233c
link to #/register
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-15 10:31:17 +01:00
Luke Barnard
15201d86aa
Prevent reskindex -w from running when file names have not changed
2017-05-15 10:16:47 +01:00
Michael Telatynski
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
Matthew Hodgson
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
Matthew Hodgson
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
Matthew Hodgson
6879f7ee6f
add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720
2017-05-15 02:43:23 +01:00
Matthew Hodgson
fe61a7eefd
fix off-by-one pixel errors in login field heights - fixes https://github.com/vector-im/riot-web/issues/3738
2017-05-15 02:32:25 +01:00
Matthew Hodgson
582a34c937
cursor pointer for avatar upload in user settings
2017-05-15 02:24:34 +01:00
