OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,653 Commits
203 Branches
553 Tags
427 MiB
Commit Graph

3653 Commits (b58d8bffe1c784485f529525020a2582fc5db6df)

Author SHA1 Message Date
David Baker b58d8bffe1 More PR feedback 
Unmounted guards, extra semicolon, return early to lose indent
level, add keys.
 2017-03-22 16:41:08 +00:00
David Baker 6b78440466 Unmounted guard 2017-03-22 16:36:42 +00:00
David Baker e39979a61f Convert to old style react class 2017-03-22 16:15:45 +00:00
David Baker cca607d469 Make phone number form a bit more semantic 2017-03-22 15:39:09 +00:00
David Baker 4cd24d15d4 Factor out AddPhoneNumber to a separate component 2017-03-22 15:18:27 +00:00
David Baker 6a37fc4325 Comment typos 2017-03-22 12:00:16 +00:00
David Baker d5f7b3983b Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn 2017-03-21 13:44:55 +00:00
David Baker 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
David Baker fefaf66a81 Merge pull request #758 from matrix-org/dbkr/threepid_display 
Display threepids slightly prettier
 2017-03-21 11:22:56 +00:00
David Baker 9ccda7ed81 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display 2017-03-21 11:11:45 +00:00
Matthew Hodgson 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
Matthew Hodgson bf8973ad33 avoid leading space in HTML /me too 2017-03-19 21:33:18 +00:00
Lieuwe Rooijakkers c697b48f99 fix leading extraneous space in emotes 2017-03-19 21:52:24 +01:00
Aviral Dasgupta 7891f9b246
UnknownBody: add explanatory title 2017-03-19 15:21:12 +05:30
Matthew Hodgson 68f66e9425 Merge pull request #763 from kfatehi/277-confirmredact 
Add ConfirmRedactDialog component
 2017-03-19 02:35:01 +00:00
Matthew Hodgson df63c779dd clarify that redact === delete 2017-03-19 02:34:25 +00:00
Keyvan Fatehi 25a4f4e3b6 Add ConfirmRedactDialog component 
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
 2017-03-18 18:58:28 -07:00
David Baker 92d5f55a46 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display 2017-03-17 13:55:07 +00:00
David Baker 33f5c286bb Merge pull request #760 from matrix-org/dbkr/fix_test_waitforcomponent 
Fix password UI auth test
 2017-03-17 13:54:34 +00:00
David Baker 23c38bd8a3 Put back both done's 
mocha takes the exception arg and does the right thing
 2017-03-16 17:47:15 +00:00
David Baker 375ae8fb04 Fix password UI auth test 
By adding a way to wait a short time for a component to appear in
the DOM, so we don't get flakey failures like this when we change
something to returning a promise that needs to resolve before the
component actually appears.
 2017-03-16 17:26:42 +00:00
David Baker 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
Luke Barnard 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
Luke Barnard 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
David Baker b06111202d Display threepids slightly prettier 
ie. Put a + on the front of msisdns.
 2017-03-16 15:16:24 +00:00
Luke Barnard 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
David Baker af8c3edba6 Support adding phone numbers in UserSettings 2017-03-16 14:56:26 +00:00
Luke Barnard 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
Luke Barnard 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
David Baker f51a022be3 Merge pull request #754 from matrix-org/luke/fix-room-list-people 
Fix People section a bit
 2017-03-16 13:22:40 +00:00
David Baker 67757a16f3 Don't remove the line that gets the error message 2017-03-16 12:54:18 +00:00
Luke Barnard 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
David Baker d292a627d8 Handle no-auth-flow error from js-sdk 2017-03-15 16:44:56 +00:00
David Baker 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
Luke Barnard 5330e47b3f Add null check 2017-03-15 13:05:03 +00:00
Luke Barnard 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
Richard van der Hoff 3325dd6ede Merge pull request #747 from matrix-org/luke/increase-scrollback-window 
Double UNPAGINATION_PADDING again
 2017-03-15 11:46:34 +00:00
Luke Barnard 1cb653ac16 Merge pull request #751 from matrix-org/luke/fix-start-login 
Add null check to start_login
 2017-03-14 15:19:30 +00:00
Luke Barnard 47958180a6 Add null check to start_login 2017-03-14 15:13:36 +00:00
David Baker 2c1ac29d30 Send legacy parameters on login call 
To support login on old HSes
 2017-03-14 14:37:18 +00:00
Luke Barnard 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
David Baker 0e95926925 Merge pull request #748 from matrix-org/luke/logout-after-deactivate 
Fix import for Lifecycle
 2017-03-14 14:13:08 +00:00
Luke Barnard c717dc02ab Merge pull request #745 from matrix-org/luke/UDE-file-upload 
Make UDD appear when UDE on uploading a file
 2017-03-14 14:11:11 +00:00
Luke Barnard 17c9fcbb85 Merge branch 'develop' into luke/UDE-file-upload 2017-03-14 13:59:04 +00:00
David Baker 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
David Baker 878413f6a4 Support msisdn signin 
Changes from https://github.com/matrix-org/matrix-react-sdk/pull/742
 2017-03-14 11:50:13 +00:00
Luke Barnard 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
Luke Barnard d8a30aa848 Double UNPAGINATION_PADDING again 2017-03-13 13:48:15 +00:00
Matthew Hodgson 925bbb79ad fix kick dialog CSS 2017-03-13 00:47:33 +00:00
Matthew Hodgson 8a0b08e7f6 fix CSS for ChatCreateOrReuseDialog.js 2017-03-13 00:03:33 +00:00