Luke Barnard
2ebd9b6290
Merge pull request #899 from matrix-org/luke/improve-country-dd-3
...
Swap to new flag files (which are stored as GB.png)
2017-05-18 13:37:28 +01:00
Luke Barnard
c991b52d2c
Swap to new flag files (which are stored as GB.png)
...
Requires https://github.com/vector-im/riot-web/pull/3953
2017-05-18 11:45:23 +01:00
Luke Barnard
e38437e6ce
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-18 11:14:56 +01:00
Luke Barnard
a44fcd6425
Merge pull request #897 from matrix-org/luke/improve-country-dd-2
...
Improve phone number country dropdown for registration and login (Act. 2, Return of the Prefix)
2017-05-17 14:29:39 +01:00
Luke Barnard
c44d7b6c44
Improve phone number country dropdown for registration and login
...
This implements https://github.com/vector-im/riot-web/issues/3895
2017-05-17 13:09:32 +01:00
David Baker
8ce6da1b16
Merge branch 'new_release_process_stable' into develop
...
This reverts all PRs currently marked notready, changing develop into
a branch that should be more stable.
2017-05-17 10:38:09 +01:00
Luke Barnard
818f21c248
Merge pull request #893 from matrix-org/luke/unit-test-rts-reg
...
Write some tests for the RTS UI
2017-05-17 10:33:26 +01:00
Richard van der Hoff
696234694c
Merge pull request #892 from matrix-org/rav/pastefiles
...
Support for pasting files into normal composer
2017-05-17 09:59:23 +01:00
Luke Barnard
e1089574ae
Write some tests for the RTS UI
...
Add tests that make assertions about the UI during registration when registration is done with a user recognised as a team member (by the mock rtsClient).
2017-05-17 09:46:17 +01:00
Richard van der Hoff
8695397abb
Support for pasting files into normal composer
...
We don't seem to be in any danger of getting a working RTE any time soon, so
implement file pasting in the normal composer too.
2017-05-17 01:43:13 +01:00
David Baker
75eea89c08
Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings"
...
This reverts commit a29d8c2af21d836c7d02
2017-05-16 16:12:57 +01:00
David Baker
ebfafb3639
Revert "Merge pull request #807 from matrix-org/matthew/quick-search"
...
This reverts commit 0ad1d8caf31189368aab
2017-05-16 16:11:01 +01:00
David Baker
67c6a8b81d
Revert "unbreak stack overflow which fires on tests due to mocked timers"
...
This reverts commit e69ea68133
2017-05-16 16:02:13 +01:00
David Baker
eddc2af92d
Revert "HOW DID THIS EVER WORK?"
...
This reverts commit 0d8d3c6710
2017-05-16 16:01:54 +01:00
David Baker
7a949b6a45
Revert "oops, actually refresh roomlist when its state changes!"
...
This reverts commit 35a16edccc
2017-05-16 16:01:32 +01:00
David Baker
b063c605a8
Revert "fix stupid typos in RoomList's shouldComponentUpdate"
...
This reverts commit b0288ebd89
2017-05-16 16:01:14 +01:00
David Baker
714cd6a10f
Revert "recalculate roomlist when your invites change"
...
This reverts commit ec6a1c4c75
2017-05-16 16:00:34 +01:00
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
2c5fb01f03
Fix bugs introduced by dodgy merge
2017-05-16 14:13:22 +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
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
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
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
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
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
