Matthew Hodgson
695930efa5
e2e icons
2016-09-12 16:50:53 +01:00
wmwragg
2bf177dbcc
Refactored the queryList into seperate AddressSelector component
2016-09-12 13:01:08 +01:00
Matthew Hodgson
5775552bab
css for e2e look & feel
2016-09-12 01:38:03 +01:00
Matthew Hodgson
dd4617a7c6
bring back small avatars for info msgs otherwise the design breaks
2016-09-11 23:01:28 +01:00
Matthew Hodgson
64dedef2c7
fix wordwrap on new panels
2016-09-11 21:55:57 +01:00
Matthew Hodgson
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:37:30 +01:00
Matthew Hodgson
3a8c94de5a
CSS for notif & file panel
2016-09-11 02:15:03 +01:00
Matthew Hodgson
dd39813cc2
show context menus on hoverover
2016-09-11 02:14:52 +01:00
David Baker
e1c32536ff
Cursor: pointer on member info create room button
2016-09-09 19:23:12 +01:00
David Baker
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:27:00 +01:00
David Baker
57804f4e02
Support for common rooms in MemberInfo
...
Renames RoomDNDView to DNDRoomTile which now provides a separate DNDRoomTile component rather than
clobberring RoomTile, so we can use a draggable one where we want a draggable one and a non-draggable
one where we don't want it to be draggable. RoomTile main is still polluted with DND stuff, but is
now optional.
Remove BottomLeftMenuTile because it was no longer used in the bottom left menu. Just include
the equivalent markup directly in the one place we now use it (in MemberTile in react-sdk).
2016-09-09 16:15:45 +01:00
Matthew Hodgson
c4421f6bc7
Merge pull request #2139 from vector-im/wmwragg/one-to-one-indicators
...
Wmwragg/one to one indicators
2016-09-09 15:08:20 +01:00
wmwragg
965d9aaf47
Lowered the Avatar menu background, so the Direct Message indicator is in front of it
2016-09-09 14:56:20 +01:00
wmwragg
2476f87e1d
Positional tweaks for the new Direct Message indicator
2016-09-09 14:47:26 +01:00
wmwragg
cd36800426
New direct message indicator CSS
2016-09-09 14:42:11 +01:00
wmwragg
18eb9d9330
Made sure the z-index was correct for the new little green men
2016-09-09 14:36:21 +01:00
Matthew Hodgson
7e379e9877
Merge pull request #2136 from vector-im/wmwragg/room-directory-back
...
Added back the Directory listing button, with new tootlip
2016-09-09 14:08:19 +01:00
wmwragg
09ce3a79ec
Added back the Directory listing button, with new tootlip
2016-09-09 12:23:50 +01:00
wmwragg
bfa59c6c04
Increased the width of the query list container to take account of scrollbars
2016-09-09 11:42:57 +01:00
Matthew Hodgson
e75148e799
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:20:10 +01:00
Matthew Hodgson
8376f0d75a
Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat
...
Wmwragg/one to one chat
2016-09-09 10:46:01 +01:00
David Baker
bf02a21c7d
Re-add icons-people (I accidentally deleted it)
2016-09-09 10:30:17 +01:00
wmwragg
ac365622b8
Align the RoomTile tooltips with the BottomLeftMenu tooltips
2016-09-09 07:10:12 +01:00
wmwragg
7cb48e0d2d
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
2016-09-09 06:56:54 +01:00
wmwragg
38ac520e1e
Fixed name vertical overflow
2016-09-08 17:19:59 +01:00
Matthew Hodgson
6182ce48c9
fix (c)
2016-09-08 15:27:55 +01:00
David Baker
9e771ddd07
Merge pull request #2111 from vector-im/dbkr/toggle_dm_room
...
Support toggling DM status of rooms
2016-09-08 14:11:30 +01:00
David Baker
74aef1fdad
Comment delay
2016-09-08 13:58:53 +01:00
Matthew Hodgson
8860c9c7fd
Merge pull request #2082 from aviraldg/feature-rte-formatbar
...
Formatting toolbar for RTE message composer.
2016-09-08 13:54:39 +01:00
Matthew Hodgson
a8d7d23dd6
implement NotifPanel css
2016-09-08 03:03:10 +01:00
Matthew Hodgson
f5ce053f42
hook up the NotifPanel button
2016-09-08 03:02:50 +01:00
Aviral Dasgupta
d833c7632d
Add strikethrough and <hr> styles
2016-09-08 02:47:31 +05:30
Aviral Dasgupta
22bf6e7969
RTE format bar enhancements
2016-09-07 22:52:37 +05:30
David Baker
a1f8116e3b
Support toggling DM status of rooms
...
on context menu
2016-09-07 17:47:47 +01:00
wmwragg
1d32dd72ed
Fixed typing error
2016-09-07 17:30:53 +01:00
wmwragg
761552430c
Dialog buttons have a pointer cursor now
2016-09-07 17:14:27 +01:00
wmwragg
cc720b9797
Design tweaks for alignment
2016-09-07 17:08:24 +01:00
wmwragg
75c81b369f
Mouse actions on the queryList added, as well as better queryListElement styling
2016-09-07 16:19:30 +01:00
Matthew Hodgson
7c74b0124b
explicit props for RightPanel at last
2016-09-07 15:43:29 +01:00
wmwragg
48501d91d2
Added justification for the AddressTile, when requested
2016-09-07 10:55:31 +01:00
Matthew Hodgson
aefef2ba56
FilePanel css
2016-09-07 02:16:09 +01:00
wmwragg
ace0e01d86
Tweak on the textarea to prevent the input area jumping a couple of pixels in size between textarea and AddressTile
2016-09-06 17:21:28 +01:00
wmwragg
c0ce7663a9
Initial highlighting selected address - styling not final
2016-09-06 16:39:38 +01:00
wmwragg
e3d5ca34c8
Circumventing autofill by using a textarea rather than an input type=text
2016-09-06 16:15:36 +01:00
wmwragg
1fb53565ef
Added scrolling to queryList
2016-09-06 15:46:09 +01:00
wmwragg
a41a8d32b8
Basic address list created, and UX tweaks for interaction
2016-09-06 15:24:37 +01:00
wmwragg
6153e795bf
Correct AddressTile and ChatInviteDialog styling
2016-09-06 11:33:56 +01:00
Matthew Hodgson
d12498f418
right cursor for roomsettings colours
2016-09-06 11:29:50 +01:00
Matthew Hodgson
1f19ee88c6
make FilePanel work, superficially at least
2016-09-06 01:45:12 +01:00
Matthew Hodgson
24351537d2
we have nothing to hide
2016-09-06 01:19:48 +01:00
wmwragg
f6f68bc348
Initial AddressTile added
2016-09-05 17:28:23 +01:00
Aviral Dasgupta
d6a324ede7
Formatting toggle, markdown indicator, quoting
2016-09-05 17:39:32 +05:30
wmwragg
7378904f00
Adding back the BottomLeftMenuTile component, as it turns out it's still used in the RightPanel
2016-09-05 12:43:04 +01:00
wmwragg
059f5198e5
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-05 12:07:21 +01:00
wmwragg
2acbad36a6
Initial commit of the new ChatInviteDialog
2016-09-05 12:03:43 +01:00
wmwragg
519dd16135
Added the correct styling back for the dialog buttons, that got regressed somewhere
2016-09-05 10:50:58 +01:00
wmwragg
fb103cb9e1
Rename the action to make it clearer what it is doing
2016-09-05 10:27:54 +01:00
Richard van der Hoff
5e9a95fdfe
Merge pull request #2085 from vector-im/rav/e2e_devices
...
e2e device CSS
2016-09-05 00:43:52 +01:00
Aviral Dasgupta
b8610ab466
RTE formatbar (wip)
2016-09-04 21:03:00 +05:30
Richard van der Hoff
ee3fdbee5b
e2e device CSS
...
CSS to make the deviceinfo stuff a little bit closer to the designs
2016-09-04 13:42:33 +01:00
wmwragg
2d827a75a6
Sending the top and left position tweaks with the action
2016-09-04 12:16:01 +01:00
wmwragg
50bb4edd1c
Small refactor, to make it clearer whats happening
2016-09-04 08:54:15 +01:00
wmwragg
e52f5b5d08
Removed unrequired positional tweak props
2016-09-04 08:49:43 +01:00
wmwragg
fd81ce126b
Code tidy up
2016-09-04 08:40:43 +01:00
wmwragg
7ae821e2b5
Removed nolonger needed conditional test, as the parent will always exist
2016-09-04 08:39:32 +01:00
wmwragg
cb98e2421e
Removed the nolonger required methods
2016-09-04 07:56:32 +01:00
wmwragg
5417385c83
Tolltip thweak to not require the passing in of the parent
2016-09-04 07:41:48 +01:00
wmwragg
c2d8067523
Testing to see if having the header badges when collapsed is usable
2016-09-03 14:55:35 +01:00
wmwragg
52bd61a2f0
When collapsed a long hover on the header now shows the full tag name and room count
2016-09-03 14:48:10 +01:00
wmwragg
aee56a5bd1
z-index tweak for badge, so it does sit aboce the header
2016-09-03 14:47:36 +01:00
wmwragg
7f52fa74a4
Better comments, and syntax tweak
2016-09-03 14:14:11 +01:00
wmwragg
d1dd4bd3d8
Updated tooltip styling to be better inline with the design
2016-09-03 13:57:49 +01:00
wmwragg
ab9f48cd47
Restyled tooltip to better match the design
2016-09-03 13:44:00 +01:00
Matthew Hodgson
c597f05e71
Merge branch 'develop' into matthew/notif-panel
2016-09-03 13:33:37 +01:00
wmwragg
80e6cd6d7c
Further tweaks to the tooltip to better handle its position, and simplify it's use
2016-09-03 12:44:09 +01:00
wmwragg
cb101b0a3b
Allow better updating if the tooltip is designed to stick around, rather than just appearing on hover
2016-09-02 18:50:47 +01:00
wmwragg
bf4e3364b4
Tweak of the RoomTooltip to use DOM element for the parent rather than a React component
2016-09-02 18:41:27 +01:00
Remi Rampin
d5865421bd
Open commits in new window/tab from changelog
2016-09-02 12:22:51 -04:00
Remi Rampin
8578203073
Open HTML commit page for changelog entries
2016-09-02 12:22:15 -04:00
wmwragg
d2e2c726eb
Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari
2016-09-02 15:45:43 +01:00
Matthew Hodgson
00d53e4824
css for conf join
2016-09-02 15:38:40 +01:00
Matthew Hodgson
4ce80a0837
fix dialog css
2016-09-02 14:39:44 +01:00
Matthew Hodgson
b4cf86a362
fix padding-top for unread msgs
2016-09-01 17:00:52 +01:00
wmwragg
bf8d7050cc
New People icon in place of Directory icon, and placeholder functionality
2016-09-01 16:46:51 +01:00
Matthew Hodgson
49e5fa41ad
fix overscroll on view source
2016-09-01 16:06:50 +01:00
Jan Solanti
e85674711c
Improve readability of the changelog dialog
2016-09-01 15:13:09 +03:00
Matthew Hodgson
7a89328ccb
file upload when on call
2016-09-01 00:38:37 +01:00
Matthew Hodgson
e77e6c2af0
fix typing notif layout
2016-09-01 00:35:07 +01:00
Matthew Hodgson
ad26631874
fix icon layout
2016-09-01 00:33:45 +01:00
Matthew Hodgson
cc75eb8b0e
fix statusbar height and behaviour during voip calls
2016-09-01 00:14:51 +01:00
Matthew Hodgson
735da3c15e
show ongoing audio call in LeftPanel CSS
2016-09-01 00:14:32 +01:00
Matthew Hodgson
56dfdbeb6b
call noisy notifs... noisy
2016-09-01 00:14:01 +01:00
Matthew Hodgson
eaf47ea05c
show ongoing audio call in LeftPanel
2016-09-01 00:13:49 +01:00
Matthew Hodgson
9d72a7cb35
get adding FilePanel
2016-08-31 11:57:45 +01:00
Matthew Hodgson
a047f81b84
Merge branch 'develop' into matthew/notif-panel
2016-08-30 23:39:00 +01:00
wmwragg
b91a0dd7a5
Increased truncation limit to 10
2016-08-30 12:14:32 +01:00
wmwragg
45a813b795
Fixed historical scetion not scrolling up when clicked if not hidden and stuck
2016-08-30 11:56:16 +01:00
wmwragg
7b7a77bad0
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-30 11:22:31 +01:00
wmwragg
ff3ad47be7
Code clean up, and better comments, along with z-index fixes for scrollbar and avatar menu
2016-08-30 10:45:59 +01:00
wmwragg
f2e8607433
Over scroll of bottom sticky headers should be fixed, and expansion of hidden stuck headers should now work
2016-08-28 19:14:54 +01:00
Matthew Hodgson
b96ab58eb3
merge develop
2016-08-28 18:49:49 +01:00
wmwragg
93fff53e29
Added back the border spacing, as it wasn't the issue
2016-08-28 16:22:56 +01:00
wmwragg
4ae424f37a
Removed the 2px border at top of labels to see if that has any effect on bottom stickies overscroll on matthews machine
2016-08-28 14:48:29 +01:00
Matthew Hodgson
36a608952d
make /user URLs work
2016-08-28 14:04:25 +01:00
wmwragg
900b4b4cf8
Added a border to the top of the sections to better seperate them when they are stuck together
2016-08-28 13:44:52 +01:00
wmwragg
b782e7b9ad
Bottom line of the scroll area (well the top line of the bottom left menu) is now tinted same colour as the section headers
2016-08-28 13:22:14 +01:00
wmwragg
8d4268754e
Fixed the stickies notification count to limit it to 99+
2016-08-28 12:03:05 +01:00
Matthew Hodgson
9b8e127e23
switch to using matrix.to for permalinks
2016-08-28 02:11:57 +01:00
Matthew Hodgson
88dba1bf6c
CSS for room settings leave button
2016-08-27 23:59:26 +01:00
Matthew Hodgson
8d7daf61b9
fix CSS namespacing
2016-08-27 23:59:15 +01:00
Matthew Hodgson
ee1fae8ced
fix RoomTagContextMenu so it works on historical rooms
2016-08-27 23:58:35 +01:00
Matthew Hodgson
2199fe5cbf
unbreak changelog
2016-08-27 00:06:00 +01:00
Matthew Hodgson
30f774cf9c
add whitespace padding to composer RHS
2016-08-27 00:00:09 +01:00
Matthew Hodgson
be9aa44ca8
fix NPE checking tag order
2016-08-26 23:49:07 +01:00
wmwragg
dc4459083f
Fixed the LHS panel not collapsing but most of the content doing so
2016-08-26 16:22:59 +01:00
Matthew Hodgson
2f375e4f67
DIE ZALGO
2016-08-26 16:08:56 +01:00
Matthew Hodgson
879c325b83
DIE ZALGO
2016-08-26 16:08:15 +01:00
wmwragg
7ad3f4a577
Better comments
2016-08-26 15:53:31 +01:00
wmwragg
5b9d3b119f
Click on stuck header scrolls to that header, collapses expands for none stuck header
2016-08-26 15:08:47 +01:00
wmwragg
5467fd89d8
Getting click to not collapse expand when header stuck
2016-08-26 14:35:40 +01:00
wmwragg
d2937c2aed
Setting correct heights and widths for label and container
2016-08-26 11:02:12 +01:00
wmwragg
a0236a9b76
Code tidy-up and better name for label container class
2016-08-26 09:57:02 +01:00
Matthew Hodgson
c6d4eb7fd3
try to make the changelog commit links suck less
2016-08-26 00:40:21 +01:00
wmwragg
4cb1f8a226
Initial pass at sticky headers for the LHS panel section labels
2016-08-25 19:46:15 +01:00
Richard van der Hoff
042a6b58c4
Remove redundant whatwg import
...
This has been rewritten to use browser-request rather than whatwg, so remove
the import, which was causing the build to fail on npm 2. (It worked, for the
wrong reasons, on npm 3.)
2016-08-25 12:14:49 +01:00
Matthew Hodgson
3934e37f77
Merge pull request #1972 from aviraldg/feature-changelog
...
add fancy changelog dialog
2016-08-24 18:02:00 +01:00
Matthew Hodgson
2ee4fa484e
Merge pull request #1978 from aviraldg/feature-autocomplete-improvements
...
Update autocomplete design
2016-08-24 14:48:06 +01:00
wmwragg
3ea62eb73a
Added event/info message avatars back in
2016-08-23 15:57:53 +01:00
Matthew Hodgson
2fae966884
notification panel WIP
2016-08-23 14:28:10 +01:00
Matthew Hodgson
f888ec6e81
notification panel WIP
2016-08-23 14:27:58 +01:00
wmwragg
d2e8201d79
Making sure that the sub list count always stays up to date, including when people read the outstanding notifications
2016-08-23 13:24:02 +01:00
wmwragg
65d7d01dfa
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 12:49:43 +01:00
wmwragg
2cf2df20f6
Added updating of count when room tile notification state changed
2016-08-23 12:40:15 +01:00
wmwragg
ee73bc3aa4
Refactor of the badge logic, and also added no badges when zero notifications
2016-08-23 11:35:03 +01:00
wmwragg
d3fa680373
Added all the notification states to the sub list count logic
2016-08-23 11:14:45 +01:00
wmwragg
ef9d6d45b6
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 10:54:05 +01:00
wmwragg
a980864886
Initial sub list notifications count. Still needs propagation of muting/unmuting etc. events from room tile up to sub list
2016-08-23 10:47:17 +01:00
wmwragg
ca4d506391
Header wording for capped truncation count updated
2016-08-22 22:47:00 +01:00
Aviral Dasgupta
554c33a883
Extract autocomplete styling to CSS
2016-08-23 00:36:01 +05:30
Aviral Dasgupta
56813eb11e
remove whatwg-fetch and use browser-request
2016-08-22 23:59:32 +05:30
wmwragg
4d5e3bc22b
Initial tag section header badge
2016-08-22 17:25:43 +01:00
wmwragg
ff55a951c9
Number of rooms added to header of sections
2016-08-22 17:02:52 +01:00
wmwragg
895172d498
Added catch to help get the Historical and any other weird sections into a sound state, so the states can then change correctly from then on
2016-08-22 16:42:08 +01:00
wmwragg
71f73d8df2
Collapsing and truncation initial state and onClick event logic
2016-08-22 15:50:36 +01:00
wmwragg
97daca4b31
Initial restyle of the sub lists and room lists
2016-08-22 14:10:06 +01:00
wmwragg
e9eafc3380
Further tweak
2016-08-22 11:15:49 +01:00
wmwragg
600a1cae79
Read avatars position tweaked, now that the spacing has changed
2016-08-22 11:13:42 +01:00
wmwragg
0b1fc1b925
Avatar and Sender Profile alignment, along with reducing the distance between initial messages and the previous one
2016-08-22 10:45:00 +01:00
wmwragg
bdaa9faea0
Added the font-size back in, as the textarea gets overidden otherwise
2016-08-19 18:03:12 +01:00
wmwragg
dbadb07adf
Moved the font-size into the .mx_MessageComposer_input so that it sets the size for RTE as well as normal composer
2016-08-19 17:57:24 +01:00
wmwragg
4a2c899d05
Merge branch 'develop' into wmwragg/chat-message-presentation
2016-08-19 17:22:26 +01:00
wmwragg
85084f5fd7
Fixed spacing on multiline messages
2016-08-19 16:46:15 +01:00
wmwragg
78692c83a6
Removal of the mini avatars for action (info) messages
2016-08-19 16:37:45 +01:00
wmwragg
173e6011e8
Alignment tweak to the readAvatars
2016-08-19 11:12:06 +01:00
wmwragg
9e542ba232
Alignment adjustment so that the readAvatars sit in the center of the top line in a new message
2016-08-19 10:58:51 +01:00
wmwragg
5005675561
Some CSS tidy-up, and fix for readAvatars when the message is not classed as a continuation, but is an info message
2016-08-18 22:50:40 +01:00
wmwragg
29759ca71e
Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message
2016-08-18 21:54:07 +01:00
Aviral Dasgupta
be28a96d8d
add fancy changelog dialog
2016-08-18 22:53:47 +05:30
Matthew Hodgson
9b5e5c9acb
squidge video icon a bit
2016-08-18 16:48:28 +01:00
David Baker
fbbbd44dc3
Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work
...
Make the notification slider work
2016-08-18 15:24:14 +01:00
David Baker
0bb3eaaf67
Use constants
2016-08-18 13:46:47 +01:00
David Baker
e48d68a449
PR feedback
2016-08-18 13:11:57 +01:00
wmwragg
67175c5a72
Positional tweaks, and font standardisation, so all browser now use ttf, so sizing is the same across all browsers
2016-08-18 11:15:42 +01:00
David Baker
6b0aeefc66
RoomNotifs.js moved to react-sdk
...
Since it's now used in RoomTile. Remove the vector prefix since it's no longer really a 'vector' thing
2016-08-17 18:29:38 +01:00
Aviral Dasgupta
9a7f5388d9
Update autocomplete design
2016-08-17 17:27:01 +05:30
wmwragg
d1649771cc
Images now slighlty set in so they don't appear under the context button, and give a margin to the right of the image
2016-08-16 17:41:54 +01:00
wmwragg
08e5f61b10
Image button now has cursor set to pointer
2016-08-16 17:41:09 +01:00
wmwragg
012f085f33
alignment tweaks and persistent highlight when meni clicked, plus menu button no longer an input item
2016-08-16 17:33:37 +01:00
wmwragg
9f570152e5
Altered message composer size to match that of the message timeline messages
2016-08-16 16:20:38 +01:00
wmwragg
3099ef68a9
Added linked message styling
2016-08-16 16:17:15 +01:00
wmwragg
f0bac3a3b0
Design tweaks
2016-08-16 16:03:10 +01:00
David Baker
cd0ed879e3
Make the slider work
...
Still WIP though: need to make vector work with the 'contains display name' rule being an override
2016-08-16 15:54:28 +01:00
wmwragg
95418089f3
Updating timestamp format
2016-08-16 15:01:25 +01:00
wmwragg
650a0f1c1f
Added context button, and initial highlighting and readReceipts positioning
2016-08-16 11:58:52 +01:00
wmwragg
757e885abc
Initial reposition of the read avatars
2016-08-16 10:59:04 +01:00
wmwragg
2c8e7782c5
Initial reposition of the timestamp
2016-08-16 10:26:14 +01:00
Matthew Hodgson
d3eccc1d6f
add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/
2016-08-15 21:38:21 +01:00
David Baker
a17df609f3
Read all 4 different notif states
...
Can't yet set loud / mute
2016-08-12 15:19:34 +01:00
David Baker
0afdf5d8e4
Merge pull request #1959 from vector-im/rav/device_display_name
...
Make up a device display name
2016-08-12 11:48:12 +01:00
Richard van der Hoff
17733a66f9
rename MatrixChat defaultDeviceDisplayName prop
2016-08-12 11:40:25 +01:00
Richard van der Hoff
3a819a29b7
Make up a device display name
...
Pass a default device name into react-sdk
2016-08-12 11:01:39 +01:00
David Baker
5e43f2752a
Don't show border on composer when not in RTE mode
...
This breaks the opacity animation (so remove the transition) but the extra border was making the border on the composer too thick.
2016-08-11 16:30:53 +01:00
David Baker
0cb14ba5ec
Don't force scrollbar on multi-invite
2016-08-11 15:11:31 +01:00
Matthew Hodgson
d65477891e
Merge pull request #1941 from vector-im/wmwragg/room-tag-menu
...
Wmwragg/room tag menu
2016-08-11 09:00:48 -05:00
Richard van der Hoff
bb1854814c
Merge pull request #1951 from vector-im/dbkr/dont_redirect_email_verify
...
Don't redirect to mobile app if verifying 3pid
2016-08-11 12:50:06 +01:00
Richard van der Hoff
9e15bda803
comment typo
2016-08-11 12:49:57 +01:00
David Baker
e7ac66ad04
Don't redirect to mobile app if verifying 3pid
...
Fixes https://github.com/vector-im/vector-web/issues/1933
2016-08-11 12:44:49 +01:00
David Baker
7286aeb013
Merge pull request #1942 from vector-im/dbkr/multi_invite
...
Basic CSS for multi-invite dialog
2016-08-11 12:34:13 +01:00
David Baker
5a17d8b450
Merge pull request #1946 from vector-im/rav/rav/refactor_token_login
...
Support for refactored login token handling
2016-08-11 10:52:32 +01:00
David Baker
43e3662e60
Merge pull request #1935 from aviraldg/fix-emoji
...
Various fixes and improvements to emojification.
2016-08-11 10:22:46 +01:00
Aviral Dasgupta
19d5063814
Merge branch 'develop' into fix-emoji
2016-08-11 14:51:17 +05:30
Richard van der Hoff
c2cb4dff4c
Support for refactored login token handling
...
loginToken handling is now done by the session loader, so we need to pass in
the queryparams to MatrixChat.
Also, MatrixChat no longer automatically reloads the page to drop the
querystring, so we have to do that ourselves (doing it in index.js allows
tokenlogin to be tested).
2016-08-11 01:55:51 +01:00
wmwragg
28343aaa33
Aignment tweak for the room tag menu so the icons better align
2016-08-10 17:44:49 +01:00
David Baker
3f615c6664
Basic CSS for multi-invite dialog
2016-08-10 17:12:20 +01:00
wmwragg
804b17fbf1
Teaks to the CSS for the new ellipsis icon, and resizing the avatar back to 24px from 25px, as needs to be even number for the Text letter to align vertically
2016-08-10 17:00:06 +01:00
wmwragg
9798e14733
Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes
2016-08-10 16:35:22 +01:00
wmwragg
f8fa19ed47
Room tag menu dohickey on the avatar on hover
2016-08-10 15:04:02 +01:00
wmwragg
ff13782ab5
Added set icons
2016-08-10 12:06:03 +01:00
wmwragg
b1dd7efed8
Fixed weird lightening of fonts on a refresh of page on safari
2016-08-10 11:51:23 +01:00
wmwragg
699a58e0b3
Fix for historic and new undefined order issues
2016-08-10 11:39:10 +01:00
