Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wmwragg/one to one chat #2110

Merged
merged 39 commits into from
Sep 9, 2016
+455 −63
Merged

Wmwragg/one to one chat #2110

Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
bf8d705
New People icon in place of Directory icon, and placeholder functiona…
wmwragg Sep 1, 2016
d2e2c72
Refactor of the RoomTooltip, so that it is easier to use, and also wo…
wmwragg Sep 2, 2016
bf4e336
Tweak of the RoomTooltip to use DOM element for the parent rather tha…
wmwragg Sep 2, 2016
cb101b0
Allow better updating if the tooltip is designed to stick around, rat…
wmwragg Sep 2, 2016
80e6cd6
Further tweaks to the tooltip to better handle its position, and simp…
wmwragg Sep 3, 2016
ab9f48c
Restyled tooltip to better match the design
wmwragg Sep 3, 2016
d1dd4bd
Updated tooltip styling to be better inline with the design
wmwragg Sep 3, 2016
7f52fa7
Better comments, and syntax tweak
wmwragg Sep 3, 2016
aee56a5
z-index tweak for badge, so it does sit aboce the header
wmwragg Sep 3, 2016
52bd61a
When collapsed a long hover on the header now shows the full tag name…
wmwragg Sep 3, 2016
c2d8067
Testing to see if having the header badges when collapsed is usable
wmwragg Sep 3, 2016
5417385
Tolltip thweak to not require the passing in of the parent
wmwragg Sep 4, 2016
cb98e24
Removed the nolonger required methods
wmwragg Sep 4, 2016
7ae821e
Removed nolonger needed conditional test, as the parent will always e…
wmwragg Sep 4, 2016
fd81ce1
Code tidy up
wmwragg Sep 4, 2016
e52f5b5
Removed unrequired positional tweak props
wmwragg Sep 4, 2016
50bb4ed
Small refactor, to make it clearer whats happening
wmwragg Sep 4, 2016
2d827a7
Sending the top and left position tweaks with the action
wmwragg Sep 4, 2016
fb103cb
Rename the action to make it clearer what it is doing
wmwragg Sep 5, 2016
519dd16
Added the correct styling back for the dialog buttons, that got regre…
wmwragg Sep 5, 2016
2acbad3
Initial commit of the new ChatInviteDialog
wmwragg Sep 5, 2016
059f519
Merge branch 'develop' into wmwragg/one-to-one-chat
wmwragg Sep 5, 2016
7378904
Adding back the BottomLeftMenuTile component, as it turns out it's st…
wmwragg Sep 5, 2016
f6f68bc
Initial AddressTile added
wmwragg Sep 5, 2016
6153e79
Correct AddressTile and ChatInviteDialog styling
wmwragg Sep 6, 2016
a41a8d3
Basic address list created, and UX tweaks for interaction
wmwragg Sep 6, 2016
1fb5356
Added scrolling to queryList
wmwragg Sep 6, 2016
e3d5ca3
Circumventing autofill by using a textarea rather than an input type=…
wmwragg Sep 6, 2016
c0ce766
Initial highlighting selected address - styling not final
wmwragg Sep 6, 2016
ace0e01
Tweak on the textarea to prevent the input area jumping a couple of p…
wmwragg Sep 6, 2016
48501d9
Added justification for the AddressTile, when requested
wmwragg Sep 7, 2016
75c81b3
Mouse actions on the queryList added, as well as better queryListElem…
wmwragg Sep 7, 2016
cc720b9
Design tweaks for alignment
wmwragg Sep 7, 2016
7615524
Dialog buttons have a pointer cursor now
wmwragg Sep 7, 2016
a3b7747
Merge branch 'develop' into wmwragg/one-to-one-chat
wmwragg Sep 7, 2016
1d32dd7
Fixed typing error
wmwragg Sep 7, 2016
38ac520
Fixed name vertical overflow
wmwragg Sep 8, 2016
7cb48e0
Refactor so that the tooltip positional tweaks can be done in CSS rat…
wmwragg Sep 9, 2016
ac36562
Align the RoomTile tooltips with the BottomLeftMenu tooltips
wmwragg Sep 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into wmwragg/one-to-one-chat
@wmwragg
wmwragg committed Sep 5, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 059f5198e59bc8cd3016825f2ab5dde04c21453f

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.