Commit Graph

394 Commits

Author SHA1 Message Date
Aidan Gauland c863dbfc76 Use DialogButtons in CreateRoomDialog
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland 0f6125e749 Use DialogButtons in AddressSelector
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland 3b2c61e456 Use DialogButtons in QuestionDialog
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland 9ebd58852c Rebase DeactivateAccountDialog on BaseDialog 2017-12-23 17:02:19 +13:00
Aidan Gauland c5284eb070 Allow BaseDialog to take a class for the title <div>
Some dialogs need to set additional classes on the `mx_Dialog_title` `div`
element (for example `danger`).
2017-12-23 17:02:19 +13:00
Aidan Gauland 8bb16466d6 Rebase AddressSelector on BaseDialog 2017-12-23 17:02:19 +13:00
David Baker 0d38e7510d Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
David Baker 2a01985076 better proptypes 2017-12-06 19:07:12 +00:00
David Baker 0deed4bb88 null guard 2017-12-06 19:05:25 +00:00
Luke Barnard fe81fcb8c6 Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
Luke Barnard 7ec4010881 Make GroupStore use MatrixClientPeg
To avoid weirdness with using a cached matrix client
2017-11-28 11:54:05 +00:00
Aidan Gauland 3358fdc906 Address eslint errors
* Remove space before curly brace.
* Remove unused import.
2017-11-26 16:04:24 +13:00
Aidan Gauland aaf8106e9e Rebase ConfirmRedactDialog on QuestionDialog
Rewrite the ConfirmRedactDialog component to derive from the QuestionDialog component.
2017-11-26 15:46:24 +13:00
David Baker 65e1d49f37 More sensible buttons in UnknownDeviceDialog
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
2017-11-16 17:59:42 +00:00
David Baker 196eafdc7f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 15:59:16 +00:00
David Baker 6f8427a5af Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584
Because apparently the revert did not revert this part
2017-11-16 15:11:47 +00:00
Luke Barnard dad797d4a2 Run linting --fix 2017-11-16 13:19:36 +00:00
Stefan Parviainen 2c1618bc10 Fix conflict and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
David Baker b0027525f3 Wire up Unknown Devices popup for outbound calls 2017-11-15 17:21:04 +00:00
David Baker 93800be742 Factor out showing UnknownDeviceDialog
So we can re-use it for calls that fail due to unknwon devices
2017-11-15 15:15:21 +00:00
David Baker f8fc6dc83e Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-15 12:11:33 +00:00
Stefan Parviainen df6d5cc2b4 Pass plain components, rather than functions returning them 2017-11-14 20:09:52 +01:00
Stefan Parviainen 3afbaf61e7 Refactor i18n stuff a bit 2017-11-13 20:19:33 +01:00
Travis Ralston c5c346f0b7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:18:41 -07:00
David Baker 0659ac1ccb Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-13 17:45:57 +00:00
Luke Barnard d179267714 Add prop type 2017-11-10 11:41:36 +00:00
David Baker 820d9c1c25 Show staus bar on Unknown Device Error
Don't pop up the dialog as soon as we can't send a message.

Also removes dispatches used to keep the RoomStatusBar up to date.
We can get the same events straight from the js-sdk via the
pending events event.
2017-11-09 15:58:15 +00:00
Luke Barnard 6eeb91ee2e Display group member profile (avatar/displayname) in ConfirmUserActionDialog
Fixes https://github.com/vector-im/riot-web/issues/5486
2017-11-09 12:24:20 +00:00
Travis Ralston 030633fa90 Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings 2017-11-08 17:43:38 -07:00
Travis Ralston 2711da28b4 Use the SettingsStore in the UnknownDeviceDialog 2017-11-08 17:43:06 -07:00
Travis Ralston f7da5836e1 Make blacklistUnverifiedDevices override the level order
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:41:32 -07:00
David Baker 7b243bf64d Revert "UnknownDeviceDialog: get devices from SDK" 2017-11-08 18:49:50 +00:00
Luke Barnard 077ca36b05 Rank rooms with shorter matching aliases first 2017-11-08 10:47:45 +00:00
Luke Barnard b3674f503d Do not search through room topics 2017-11-08 10:32:48 +00:00
Luke Barnard 4c47f75918 Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-08 10:04:41 +00:00
Luke Barnard 8fbe50a1cf Merge pull request #1580 from matrix-org/luke/groups-new-group-settings
Improve group creation UX
2017-11-07 18:55:34 +00:00
Luke Barnard edc744067f Add checkbox to GroupAddressPicker for determining visibility of group rooms 2017-11-07 18:51:41 +00:00
David Baker 10f15dfc56 Unmounted guard 2017-11-07 17:10:40 +00:00
David Baker ec560345c7 UnknownDeviceDialog: get devices from SDK
rather than having to have the error message passed in.

This is in preparation for not having the dialog pop up straight
away when a message isn't sent so we don't have to keep the error
object knocking around somewhere.
2017-11-07 16:37:43 +00:00
Luke Barnard 36cd22663a Open group settings when the group is created 2017-11-06 18:02:50 +00:00
Luke Barnard b88c13d527 Use prefixed class names to avoid collisions with other libraries 2017-11-03 16:02:41 +00:00
Luke Barnard e84e4ed5f5 Add CSS classes to group ID input in CreateGroupDialog 2017-11-03 15:38:12 +00:00
Stefan Parviainen d6f1e12bee Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
Luke Barnard 302bd6c3e9 Escape dash in regex 2017-10-31 11:48:56 +00:00
Luke Barnard 53938f7998 Change client-side validation of group IDs to match synapse 2017-10-31 10:25:06 +00:00
Stefan Parviainen 53e983f9c7 Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
Luke Barnard 27f845a7aa Match on any alias 2017-10-25 12:42:58 +01:00
Luke Barnard 7029ab07fc If no canonical alias, use first alias (and fallback to Unnamed) 2017-10-25 12:38:39 +01:00
Stefan Parviainen 115772d526 Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:57:52 +02:00
Luke Barnard a133fd1cf4 Fix "failed to create community" message 2017-10-23 14:57:40 +01:00