Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Wmwragg/chat multi invite #469

Merged
merged 29 commits into from
Sep 13, 2016
Merged

Wmwragg/chat multi invite #469

merged 29 commits into from
Sep 13, 2016

Commits on Sep 12, 2016

  1. Refactored the queryList into seperate AddressSelector component

    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    28dcbb2 View commit details
    Browse the repository at this point in the history

  2. Correctly positioning the selected element if list shrinks in size

    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    7d58968 View commit details
    Browse the repository at this point in the history

  3. Added an inviteList state to hold all the users to invite, but curren… 

    …tly pretend it only has one users (the first one)
    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    d538377 View commit details
    Browse the repository at this point in the history

  4. The dismiss function now correctly deletes the dismissed element. Als… 

    …o the query render, will now render all invitees
    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    5acdb82 View commit details
    Browse the repository at this point in the history

  5. First pass at adding multiple addresses, can only add from AddressSel… 

    …ector at the moment
    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    4836025 View commit details
    Browse the repository at this point in the history

  6. Don't allow someone who is already on the invite list to appear in th… 

    …e AddressSelector
    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    e28a3f1 View commit details
    Browse the repository at this point in the history

  7. Refactored AddressTile to use string address rather than user object,… 

    … so it can user email as well mx userId
    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    5b2cc55 View commit details
    Browse the repository at this point in the history

  8. Allow addresses to be added as text when space or comma are pressed

    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    44b8c29 View commit details
    Browse the repository at this point in the history

  9. Make an invalid mx user an unknown user AddressTile

    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    95d9df7 View commit details
    Browse the repository at this point in the history

  10. Added styling for unknown addresses

    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    5a0a72e View commit details
    Browse the repository at this point in the history

  11. Need cto push the actual userId not the toLowerCase version, as userI… 

    …d's are case sensitive
    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    96299e8 View commit details
    Browse the repository at this point in the history

  12. Oops, toLowerCase call in wrong place

    @wmwragg
    wmwragg committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    0f720dd View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. A supplied roomId property, will make the dialog use that room for th… 

    …e invites, rather than creating a new one
    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    a7ea193 View commit details
    Browse the repository at this point in the history

  2. It's no longer a onde to one chat dialog, as you can invite multiple … 

    …people
    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    99dfcb4 View commit details
    Browse the repository at this point in the history

  3. Added error checking, and UI

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    ca2ba55 View commit details
    Browse the repository at this point in the history

  4. Small refactor to handle Direct Message chat as well as multi invite … 

    …chat
    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    0b26776 View commit details
    Browse the repository at this point in the history

  5. Moved the isValidAddress method to the Invite utilty object

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    cba76d6 View commit details
    Browse the repository at this point in the history

  6. Merge up from develop

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    524eeaa View commit details
    Browse the repository at this point in the history

  7. Updated with the new createRoom DM stuff

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    538b68a View commit details
    Browse the repository at this point in the history

  8. Added new Invite button in the RHS footer which calls the new 'view_i… 

    …nvite' action
    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    ca1bb0f View commit details
    Browse the repository at this point in the history

  9. Added pass through of roomId

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    2db8f4a View commit details
    Browse the repository at this point in the history

  10. Pull out multi-inviting from MultiInviteDialog 

    MultiInviteDialog would otherwise use this, but is about to go away, so it has been left.
    @dbkr
    dbkr committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    2fd9e2a View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/wmwragg/chat-multi-invite' into … 

    …dbkr/wmwragg/chat-multi-invite
    @dbkr
    dbkr committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    e95a622 View commit details
    Browse the repository at this point in the history

  12. Missed a brace

    @dbkr
    dbkr committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    a53e009 View commit details
    Browse the repository at this point in the history

  13. Correct path for MultiInviter

    @dbkr
    dbkr committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    4067715 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #467 from matrix-org/dbkr/wmwragg/chat-multi-invite 

    Pull multi-inviting functionality out of MultiInviteDialog
    @wmwragg
    wmwragg authored Sep 13, 2016
    Configuration menu
    Copy the full SHA
    f7f907a View commit details
    Browse the repository at this point in the history

  15. Added multi invite functionality

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    272dd82 View commit details
    Browse the repository at this point in the history

  16. Silly mistake fixed, spotted by Dave (cheers)

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    890100a View commit details
    Browse the repository at this point in the history

  17. Added valid but unknown mx user

    @wmwragg
    wmwragg committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    7fa1029 View commit details
    Browse the repository at this point in the history