Commit Graph

3783 Commits (0d8d3c67106a3e84fd30de4016b9c852870f99b3)

Author SHA1 Message Date
Luke Barnard b7f1b1a424 Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog
Allow user to choose from existing DMs on new chat
2017-03-07 16:22:52 +00:00
David Baker 65ce8c2113 Merge pull request #741 from matrix-org/dbkr/fix_teamserver_2
Fix the team server registration
2017-03-06 17:57:42 +00:00
David Baker 87a5db65d5 Merge pull request #740 from matrix-org/luke/clarify-no-devices
Clarify "No devices" message
2017-03-06 17:54:23 +00:00
Luke Barnard 391886cac4 Remove dis as a dep in RoomTile 2017-03-06 17:45:25 +00:00
Luke Barnard bf348a0f78 Instead of listening for view_room, use a callback
But make sure that nothing other than the callback is done when RoomTile is clicked.
2017-03-06 17:44:29 +00:00
David Baker 341f978743 Fix the team server registration
Pass extra info from the UI auth process as a second parameter to
onAuthFinished. Allows the email sid & client secret to be used
outside of the UI auth process.
2017-03-06 17:31:21 +00:00
Luke Barnard 04510da057 Clarify "No devices" message 2017-03-06 16:01:22 +00:00
Luke Barnard 20fa36325f Remember to unregister on unmoun 2017-03-06 15:01:46 +00:00
Luke Barnard 4548d1b824 Use dispatch instead of passing `onClick`, adjust dialog wording. 2017-03-06 14:51:01 +00:00
Luke Barnard a122b5d88e Style 2017-03-06 14:22:12 +00:00
Luke Barnard c0fc3ba3fe Make redactions appear when the event has been redacted (on Room.redaction) 2017-03-06 14:20:24 +00:00
David Baker 49c66d8645 Merge pull request #735 from matrix-org/luke/matrix-to-timestamp-permalink
Change timestamp permalinks to matrix.to
2017-03-06 11:07:50 +00:00
David Baker 30eddf9fda Merge pull request #734 from matrix-org/luke/fix-resend
Fix resend bar and "send anyway" in UDD
2017-03-06 11:06:52 +00:00
Luke Barnard edccfeb20b No text required, do not continuate after redacted even
It's curious, however, that a continuation occured after a redacted event, given that the event shouldn't have a sender
2017-03-06 10:26:26 +00:00
Luke Barnard abd71cd2ac No need for "redactor" as we dont currently show it 2017-03-03 17:57:13 +00:00
Luke Barnard 9f6a5d11ae Merge pull request #737 from matrix-org/luke/fix-color-regex-strictness
Make COLOR_REGEX stricter
2017-03-03 17:49:12 +00:00
Luke Barnard 9bae936816 Add the redacter display name to the redaction text 2017-03-03 17:35:42 +00:00
Luke Barnard 5ef61b7c35 Only show a redaction tile for messages 2017-03-03 16:45:29 +00:00
Luke Barnard 6c32e3720b Remove seemingly unused "bounce" 2017-03-03 15:51:14 +00:00
Luke Barnard fa2cf41039 Make COLOR_REGEX stricter 2017-03-03 15:46:13 +00:00
Luke Barnard 2bd9885288 Start to show redacted events 2017-03-03 15:42:24 +00:00
David Baker 62d9439530 Remove old import & pass through result
in InteractiveAuthDialog
2017-03-03 14:31:52 +00:00
Luke Barnard ca5c2fb82e Allow user to choose from existing DMs on new chat
When creating a new chat with one person, show a dialog that asks the user whether they'd like to use an existing chat or actually create a new room.

Fixes https://github.com/vector-im/riot-web/issues/2760
2017-03-03 13:48:37 +00:00
David Baker 1bdf213d67 Merge pull request #729 from matrix-org/dbkr/register_ui_auth
Port registration over to use InteractiveAuth
2017-03-03 13:37:41 +00:00
David Baker 977b8a7379 Make UIAuth Dialog show an error
when auth fails
2017-03-03 12:08:26 +00:00
Luke Barnard ab9aaa9174 Merge pull request #732 from matrix-org/luke/fuse-test
Test to see how fuse feels
2017-03-03 10:46:41 +00:00
Luke Barnard 923ea9c6aa Change timestamp permalinks to matrix.to 2017-03-03 10:42:44 +00:00
David Baker 8522231d4f Revery unintentional change
to when teamToken was returned
2017-03-03 10:28:10 +00:00
Luke Barnard b822bc66ee Remove redundant null check 2017-03-03 10:22:02 +00:00
Luke Barnard 7be55ce65c Merge pull request #733 from matrix-org/luke/display-name-blur-to-submit
Submit a new display name on blur of input field
2017-03-03 10:03:21 +00:00
Luke Barnard 4fff383de5 Fix resend bar and "send anyway" in UDD 2017-03-03 10:02:08 +00:00
Luke Barnard 6a007d01a1 Merge pull request #610 from matrix-org/luke/feature-css-msg-colors
Allow [bf]g colors for <font> style attrib
2017-03-03 08:35:32 +00:00
Luke Barnard f4278b61ea Update comment 2017-03-02 18:13:01 +00:00
Luke Barnard 1d5e47cd70 On cancel, blur. Only onValueChanged when the value has changed... 2017-03-02 18:07:24 +00:00
Luke Barnard 7a092e4ac7 Submit a new display name on blur of input field 2017-03-02 17:29:06 +00:00
Luke Barnard 0f8ab99158 Have COLOR_REGEX constant 2017-03-02 17:02:00 +00:00
David Baker 9c6782af6f Oops, lost trackPromise 2017-03-02 15:08:15 +00:00
David Baker 91ef26a7f8 makeRegistrationUrl is required 2017-03-02 15:04:10 +00:00
David Baker 51b2001f70 Remove todo which is now done! 2017-03-02 15:03:24 +00:00
David Baker 88586a0823 Oops, lost defaultDeviceDisplayName 2017-03-02 15:01:56 +00:00
David Baker 0914226327 Actuall pass our proxy makeRegistrationUrl 2017-03-02 14:47:47 +00:00
David Baker 3028b335a4 Oops, re-add referrer param
as Registration was still using it
2017-03-02 14:46:18 +00:00
David Baker dd762cc835 Add makeRegistrationUrl to proptypes 2017-03-02 14:40:55 +00:00
David Baker a5cf3a964b doc 2017-03-02 14:39:25 +00:00
David Baker 518a749d90 Add proptypes / isRequired 2017-03-02 14:36:54 +00:00
David Baker 770c1ce11f Remove redundant prop 2017-03-02 14:35:08 +00:00
Luke Barnard e75c21e9f9 Merge pull request #683 from matrix-org/luke/mels-xor
MELS: either expanded or summary, not both
2017-03-02 14:08:06 +00:00
David Baker 8be66d0f04 Merge pull request #730 from Half-Shot/hs/video-gif-autoplay
Autoplay videos and GIFs if enabled by the user.
2017-03-02 13:41:30 +00:00
Will Hunt 4b5e8d66b8 Fixed styling + removed log line 2017-03-02 13:39:56 +00:00
David Baker 0035a91596 Merge pull request #731 from matrix-org/luke/warn-users-e2e-first-time
Warn users about using e2e for the first time
2017-03-02 13:28:15 +00:00