Commit graph

3581 commits

Author SHA1 Message Date
David Baker
3818a89ca3 Comment guestCreds 2016-08-02 18:46:43 +01:00
David Baker
54c10a5d89 Get name of section right 2016-08-02 18:42:02 +01:00
David Baker
aafec49abf WIP for deactivaing account UI
https://github.com/vector-im/vector-web/issues/1775
2016-08-02 18:40:12 +01:00
David Baker
f431e62e6b Merge pull request #379 from matrix-org/dbkr/direct_chat_include_invited
Include rooms with 1 person invited
2016-08-02 16:11:00 +01:00
David Baker
a0b973ffad Syntax fail 2016-08-02 16:07:07 +01:00
David Baker
10f6ecfe5f Include rooms with 1 person invited
If we can't find one with both people joined.
2016-08-02 15:59:28 +01:00
David Baker
3000fae5d8 Oops, uncommit 61e0258 2016-08-02 15:58:21 +01:00
David Baker
61e0258b6f Include rooms with 1 person invited
If we can't find one with both people joined.
2016-08-02 15:55:18 +01:00
Matthew Hodgson
3fc4e92a78 Merge pull request #378 from matrix-org/dbkr/fix_new-direct_chat
Fix 'start new direct chat'
2016-08-02 15:05:11 +01:00
David Baker
05f0d4d166 Fix 'start new direct chat' 2016-08-02 14:55:29 +01:00
wmwragg
2c2f689361 New design for long names 2016-08-02 14:46:47 +01:00
David Baker
db9750a7e3 Call the logout API when we log out
Also try to refactor some of the login/logout code out of MatrixChat and into a separate Lifecycle.js. This still isn't great, but it at least gets some code out of MatrixClient.
2016-08-02 14:04:20 +01:00
David Baker
f393811171 Merge pull request #376 from matrix-org/rav/messagecomposer_warnings
Fix warnings from MessageComposer
2016-08-02 11:32:00 +01:00
Richard van der Hoff
e63a32dc10 Fix warnings from MessageComposer
Fix a couple of warnings from React about required properties not being set.
2016-08-02 11:00:00 +01:00
Matthew Hodgson
1b38398156 Merge pull request #371 from matrix-org/wmwragg/button-updates
New voice and video call buttons
2016-08-01 20:36:56 +01:00
David Baker
89d2a56584 Merge pull request #373 from matrix-org/rav/more_react_warnings
Silence some more react warnings
2016-08-01 17:23:08 +01:00
David Baker
0ad23fa9ed Merge pull request #372 from matrix-org/rav/velociraptor_warnings
Fix warnings emanating from Velociraptor elements
2016-08-01 17:22:29 +01:00
Richard van der Hoff
124a816751 Silence some more react warnings
Remove some spurious props which were causing react warnings
2016-08-01 17:10:46 +01:00
Richard van der Hoff
94a44bfec3 Fix warnings emanating from Velociraptor elements
We are no longer allowed to stick random properties on child properties, and
the Velociraptor animations were causing some React warnings.

Move the startStyles and enterTransitionOpts properties up to the Velociraptor
node, and avoid setting arbitrary props on the created children. This is less
flexible, as it assumes that all children will have the same start style;
however, we weren't using the flexibility, and we can always replace the array
with a map or a function or something if we need it in the future.
2016-08-01 16:56:25 +01:00
wmwragg
84583b25e6 New voice and video call buttons 2016-08-01 16:45:27 +01:00
Matthew Hodgson
5b100eeff3 Merge pull request #353 from matrix-org/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 15:42:46 +01:00
David Baker
215b32b377 Merge pull request #370 from matrix-org/rav/devices_panel
Implement device management UI
2016-08-01 14:27:12 +01:00
Richard van der Hoff
c071bc54f9 Implement device management UI
View/rename/delete.
2016-08-01 13:42:29 +01:00
Richard van der Hoff
9333793a7c Fix code style 2016-08-01 10:49:51 +01:00
wmwragg
d16aa276e2 Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states 2016-07-30 12:52:39 +01:00
wmwragg
398e56c9f9 Fixed bug where the long hover tooltip for a room name show an object rather than the name 2016-07-30 12:28:10 +01:00
wmwragg
cf22a5fecc Merge up from develop 2016-07-30 12:10:43 +01:00
wmwragg
1487c600ee Revert so that the 2016-07-29 17:53:18 +01:00
wmwragg
229664a624 first pass on css re-write 2016-07-29 17:49:42 +01:00
Richard van der Hoff
3194c5c61d Factor EditableTextContainer out of ChangeDisplayName
Take the non-displayname-specific bits out of ChangeDisplayName into a new
EditableTextContainer, so that we can reuse the logic elsewhere.
2016-07-29 17:40:13 +01:00
wmwragg
38f504bdcb Hide tooltip when badge clicked and collapsed 2016-07-29 11:10:16 +01:00
wmwragg
5889beacf3 Mute state now handled correctly 2016-07-28 17:24:58 +01:00
wmwragg
94350bc780 Fixed spelling mistake 2016-07-28 15:51:46 +01:00
wmwragg
bc902a9741 Tidy up of the contextual menu refactor 2016-07-28 14:32:59 +01:00
wmwragg
867b14d2ca Reposition context menu now that the styling is final 2016-07-27 18:14:46 +01:00
wmwragg
46a643ac38 Now the text spaceing is correct need to align cheveron 2016-07-27 18:10:45 +01:00
wmwragg
8246d9148c Initial context menu with all it's elements 2016-07-27 17:43:48 +01:00
Richard van der Hoff
88be2827fd Merge pull request #367 from matrix-org/rav/remove_bad_props
Stop the Avatar classes setting properties on <span>s
2016-07-27 16:22:31 +01:00
wmwragg
6e7e091117 Refactor so that chevron and menu can be positioned independantly 2016-07-27 16:09:07 +01:00
Richard van der Hoff
39ae8c6e46 formatting
PR feedback
2016-07-27 15:41:24 +01:00
David Baker
cf3cd69f37 Merge pull request #366 from matrix-org/rav/remove_relayoutonupdate
Remove relayoutOnUpdate prop on gemini-scrollbar
2016-07-27 15:21:46 +01:00
wmwragg
0660b9feff Fixes to properly point to the moved components 2016-07-27 14:49:10 +01:00
wmwragg
3cb3dd96a6 Added the moved ContextualMenu to the components list 2016-07-27 14:23:37 +01:00
wmwragg
3df746ef14 Revert merge up from develop 2016-07-27 14:16:17 +01:00
David Baker
3308842121 Fix up reskindex.js path
Since npm does not put our *own* 'binaries' on the path, we need to use the full path to it
2016-07-27 13:28:23 +01:00
wmwragg
6d141d1a7b Only allow none guests to access the context menu 2016-07-27 11:58:40 +01:00
Richard van der Hoff
1a600b0674 Stop the Avatar classes setting properties on <span>s
React apparently now checks the properties which are set on DOM elements, and
grumbles noisily about unexpected ones. Update BaseAvatar and RoomAvatar so
that they don't set unrelated properties on the DOM elements.
2016-07-27 11:38:04 +01:00
Richard van der Hoff
c8df9148b3 Remove relayoutOnUpdate prop on gemini-scrollbar
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:35:48 +01:00
wmwragg
4b26ac58af Re-modularised the context menus 2016-07-27 10:41:24 +01:00
wmwragg
dca4702b7b Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage 2016-07-27 09:51:50 +01:00