63695 Commits

Author SHA1 Message Date
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 9c0f51fb82 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:06:31 +01:00
wmwragg 2acbad36a6 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:43 +01:00
wmwragg ca443e01d8 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:16 +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
Richard van der Hoff 31e09e6137 Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user
Make MemberInfo to use client.getStoredDevicesForUser
2016-09-05 10:38:24 +01:00
wmwragg 67c623d410 Rename the action to make it clearer what it is doing 2016-09-05 10:29:03 +01:00
wmwragg fb103cb9e1 Rename the action to make it clearer what it is doing 2016-09-05 10:27:54 +01:00
Kegsay 6e2fd85760 Merge pull request #437 from matrix-org/kegan/starter-links
Implement starter link support
2016-09-05 09:10:39 +01:00
Kegan Dougal 56ac0004e5 Use href='#' hack to make link text look like a link 2016-09-05 09:10:15 +01:00
Richard van der Hoff 922fb448c5 Merge pull request #442 from matrix-org/rav/e2e_devices
Convert MemberDeviceInfo to ES6 class
2016-09-05 00:53:47 +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
Richard van der Hoff fc40bdcbfc Make MemberInfo to use client.getStoredDevicesForUser
It's more powerful than listDeviceKeys, and isn't deprecated.
2016-09-05 00:08:16 +01:00
Richard van der Hoff a316c652b7 Convert MemberDeviceInfo to ES6 class 2016-09-04 21:49:06 +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 f9ab2fa957 When zoomed in, the sticky headers should correctly position themselves 2016-09-04 08:01:04 +01:00
wmwragg cb98e2421e Removed the nolonger required methods 2016-09-04 07:56:32 +01:00
wmwragg 721baf8d42 Tolltip tweak to not require the passing in of the parent 2016-09-04 07:42:09 +01:00
wmwragg 5417385c83 Tolltip thweak to not require the passing in of the parent 2016-09-04 07:41:48 +01:00
Richard van der Hoff 941dcc7e87 Merge pull request #439 from matrix-org/rav/enable_megolm_encryption
Make the 'encrypt this room' knob be megolm
2016-09-03 18:50:28 +01:00
Richard van der Hoff bc8e7724e8 Make the 'encrypt this room' knob be megolm 2016-09-03 18:42:54 +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 03e74f48f8 Positioned Tooltip better 2016-09-03 13:44:44 +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
Matthew Hodgson fdfd6ecfd9 let users join confs as voice or video 2016-09-03 13:27:46 +01:00
wmwragg 405dcf76eb Further tweaks to the tooltip to better handle its position, and simplify it's use 2016-09-03 12:44:55 +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 bffefd9261 Tweak of the RoomTooltip to use DOM element for the parent rather than a React component 2016-09-02 18:41:44 +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
Matthew Hodgson dbd17ea953 improve e2e warning a bit 2016-09-02 17:37:16 +01:00
Matthew Hodgson 0494dff545 Merge branch 'master' into develop 2016-09-02 17:23:02 +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
Matthew Hodgson e63e6e7016 0.7.5-r3 v0.7.5-r3 2016-09-02 17:21:30 +01:00
Matthew Hodgson dec62ab92c bump react-sdk 2016-09-02 17:20:23 +01:00
Matthew Hodgson 67d38bfab8 Prepare changelog for v0.7.5-r3 2016-09-02 17:20:08 +01:00