Commit Graph

3508 Commits

Author SHA1 Message Date
wmwragg 906be376c9 Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId 2016-09-12 16:51:42 +01:00
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
Richard van der Hoff afc889ff4d Some tests of the application load process 2016-08-10 00:15:04 +01:00
wmwragg 1c812b340d Initial pass at handling room tags that don't have an order element, but need one manual ordering 2016-08-09 19:20:27 +01:00
Aviral Dasgupta bd9f5d3e06 Various fixes and improvements to emojification.
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
wmwragg cf8164bcc3 New icons 2016-08-08 18:11:18 +01:00
wmwragg 33612b7076 New dekete icon and ignoring olm.js 2016-08-08 17:11:08 +01:00
wmwragg 5a97786cc6 Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now 2016-08-08 16:55:02 +01:00
Matthew Hodgson ee2329d236 make scrollbars bigger on hoverover 2016-08-07 21:35:41 +01:00
Matthew Hodgson 66f80b2239 let MemberInfo scroll if you have loads of E2E devices 2016-08-07 20:50:56 +01:00
wmwragg 72ba708bfe Menu separator styling 2016-08-05 16:35:59 +01:00
wmwragg b3459be707 Initial RoomTagContextMenu wired in 2016-08-05 15:49:03 +01:00
David Baker bf46c3cfab Merge remote-tracking branch 'origin/develop' into matthew/scalar 2016-08-05 15:37:38 +01:00
wmwragg 7880734d77 Merge branch 'develop' into wmwragg/room-tag-menu 2016-08-05 15:26:42 +01:00
wmwragg 5ce1aba493 Created initial RoomTagContextMenu component 2016-08-05 15:23:07 +01:00
wmwragg b99e7598f9 notification menu now has cickable radio buttons 2016-08-04 17:05:19 +01:00
wmwragg b9e06bcf66 Moved mute state to mentions only 2016-08-04 16:17:47 +01:00
Matthew Hodgson eb108c7866 Merge branch 'develop' into matthew/scalar 2016-08-04 13:41:04 +01:00
Richard van der Hoff a190862ed3 Merge pull request #1919 from vector-im/dbkr/deactivate_account
CSS for deactivate account dialog
2016-08-04 10:32:41 +01:00
Matthew Hodgson 34a31a71fd increase weight of unread rooms as it's the only way to tell if you have unread messages, and the weight difference is currently too subtle 2016-08-03 22:54:01 +01:00
Matthew Hodgson 7774756ed1 fix lightbox on chrome 52: https://github.com/vector-im/vector-web/issues/1706 2016-08-03 17:19:36 +01:00
Matthew Hodgson ee9f78d156 slightly better volume labels 2016-08-03 15:49:32 +01:00
Matthew Hodgson 70754db27a Merge pull request #1900 from vector-im/wmwragg/mention-state-menu
Wmwragg/mention state menu
2016-08-03 15:22:49 +01:00
wmwragg 16f8143f3e synced prefix flex with flex 2016-08-03 14:45:31 +01:00
wmwragg be1f014294 Speech bubble tail shifted slightly, as the badge is now larger 2016-08-03 14:22:47 +01:00
wmwragg f53f9af1c5 Badge width fixed, and hover state for badge now only on badge itself. 2016-08-03 14:11:17 +01:00
David Baker 58b1d62976 CSS for deactivate account dialog
(Inc some generic CSS for error & danger fields)
2016-08-03 11:38:19 +01:00
wmwragg 8e0f7f18a0 Design update to match the new Zeplin designs 2016-08-03 11:21:00 +01:00
wmwragg ee8572559f Fixed small collapsed state hover issue with badges 2016-08-02 15:45:11 +01:00
wmwragg f640be90ad Container height shrunk, so it doesn't bump the avatars when collapsed. Also search box gutters fixed 2016-08-02 15:00:47 +01:00
wmwragg 472acd4792 New design for long names 2016-08-02 14:46:31 +01:00
Will Hunt 8c7aede0cc Style UnknownBody with ``white-space: pre-wrap;`` 2016-08-02 11:13:46 +01:00
Matthew Hodgson 2829d95705 Merge pull request #1912 from vector-im/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 20:37:15 +01:00
Matthew Hodgson 28057fd086 improve upgrade-to-app warning on mobile app 2016-08-01 18:36:08 +01:00
wmwragg 2e3ad3206c New video call icon 2016-08-01 16:46:13 +01:00
wmwragg 4f94cf5dfb New voice and video call icons 2016-08-01 16:44:58 +01:00
Matthew Hodgson 51e8c28ab6 Merge pull request #1828 from vector-im/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 15:42:33 +01:00
David Baker 0f73228d55 Merge pull request #1909 from vector-im/rav/devices_panel
CSS for device management UI
2016-08-01 14:28:08 +01:00
Richard van der Hoff 645db7fa2f CSS for device management UI 2016-08-01 13:46:14 +01:00
Richard van der Hoff 0d4f35bed1 Fix a warning from RoomSubList
`selectedRoom` is *not* required, and we often don't have one, so get warnings.
2016-08-01 13:44:04 +01:00
Richard van der Hoff 3860488bb5 Fix notifications warning layout
For some reason, Chrome doesn't seem to make the central div in the
notifications warning wide enough, so it ends up wrapping. Fix this by making
the central div expand across the available space, instead of letting the
container for the close button do it.

Fixes https://github.com/vector-im/vector-web/issues/1687
2016-08-01 10:31:58 +01:00
wmwragg ef5ea46830 Consistent collapsed height across browsers 2016-08-01 09:53:57 +01:00
wmwragg 4a7d2901ac Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states 2016-07-30 12:52:14 +01:00
wmwragg f382946138 Merge up from develop 2016-07-30 12:07:34 +01:00
wmwragg bb93a59cfb fixed unread hightlight font weight for room name 2016-07-29 13:49:28 +01:00
wmwragg 0ad84fd7b0 Better comments 2016-07-29 10:59:54 +01:00
wmwragg 87bddcd8ce Preliminary fix for showing muted state when collapsed - keep faded avatar, but don't show the mute icon 2016-07-29 10:50:50 +01:00
wmwragg 18701a2dae CSS tweaks to get the collapsed mute state properly working 2016-07-29 10:01:42 +01:00
wmwragg 2f65064688 CSS bugfix to stop incorrect letter spaceing on room names 2016-07-28 17:44:17 +01:00
wmwragg 2f08f2441f CSS tweaks for muted dohickey positioning 2016-07-28 17:41:01 +01:00
wmwragg 6c4c0bf57a Initial feature set complete, but the state and CSS need to be simplified 2016-07-28 17:35:25 +01:00
wmwragg 55a10ee275 Mute state handled corrcectly 2016-07-28 17:25:28 +01:00
wmwragg 49545ce0c2 Leaving the fail promise section blank as a todo, with explanitary comment 2016-07-28 15:29:57 +01:00
wmwragg b87058508e When a use clicks the state they want, after the change has been made it pasues breifly before closing, so that the user can see their state change has taken place. 2016-07-28 15:28:05 +01:00
wmwragg 6329e274ab Extra polish to get styling looking like the design 2016-07-28 14:20:24 +01:00
wmwragg b5fdaac947 Final spacing tweaks to get it aligned with the design 2016-07-27 18:06:47 +01:00
wmwragg 22bf74dc65 Tweaks to get icons to line up better, still need to space labels correctly 2016-07-27 18:01:43 +01:00
wmwragg d376df478a Initial context menu with all it's elements 2016-07-27 17:43:35 +01:00
wmwragg 53f4da1d30 Refactor so that chevron and menu can be positioned independantly 2016-07-27 16:09:26 +01:00
wmwragg 074bbc7149 Added the two additiona states that don't yet exist on the backend, as faded and disabled options 2016-07-27 12:25:44 +01:00
Richard van der Hoff 4b33164ab6 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:41:27 +01:00
wmwragg dab707a893 Additional refactor to further modularise the context menus 2016-07-27 11:26:36 +01:00
wmwragg 5cf164fcc1 Re-modularised the context menus 2016-07-27 10:40:57 +01:00
wmwragg 37a7ce809a Added two new icons for notifications states 2016-07-27 10:40:19 +01:00
wmwragg 15f9f5dbe8 Doing the state change via onClick events rather than radio buttons, as they were causeing untraceable react errros for some reason 2016-07-26 17:24:45 +01:00
wmwragg 187818aaa0 Radio buttons now added, and only none guests can modify notfication state 2016-07-26 10:34:03 +01:00
wmwragg 30b1e7078f Contextual menu restyling 2016-07-25 18:04:16 +01:00
wmwragg 791980cd1f Menu context dohickey now sticks when menu shown 2016-07-25 17:19:06 +01:00
wmwragg 6c19504c8b Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu
# resolved Conflicts:
#	src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css
2016-07-25 16:45:25 +01:00
wmwragg 497ebce88a Corrected vertical alignment of membership button 2016-07-25 13:16:51 +01:00
wmwragg 2768cd2010 Initial unstyled mentions state notifier context menu 2016-07-22 17:30:09 +01:00
wmwragg 204e42494a The default props doesn't seem to be working, hardcoded 'LABEL' for now. OnClick closes menu 2016-07-22 16:11:42 +01:00
wmwragg 72b4a86eed Tweaked the tooltip to be better aligned. Also added the fading of the room name if too long 2016-07-22 14:59:02 +01:00
wmwragg ce5311191f Tweaked tooltip z-index 2016-07-22 11:30:41 +01:00
wmwragg 7eff6d968e Tweak to z-index as the tooltip was occasionally getting occluded. 2016-07-22 11:16:04 +01:00
wmwragg 24e021b91f Badge dohickey shown on name hover and badge hover 2016-07-21 18:19:52 +01:00
wmwragg e988f5ca3b Badge visual tweaks 2016-07-21 17:54:33 +01:00
wmwragg 633a3f4867 New component for testing 2016-07-21 17:44:05 +01:00
wmwragg df163d8cb7 Clean up of the CSS, and refactor to better match current code 2016-07-21 14:33:27 +01:00
wmwragg 73bb317925 Slight tweak to the name padding so there is a little less space above and below the name 2016-07-21 12:19:11 +01:00
wmwragg ad74d264a3 Selected room highlight teaked to better fit previous design 2016-07-21 11:37:40 +01:00
wmwragg e9db975d7d Redone assets, with lighter weight to match design 2016-07-21 10:25:42 +01:00
wmwragg f3586a79c2 Final CSS tweaks for the hover and collapsed states 2016-07-20 17:10:23 +01:00
wmwragg 882d09bf85 Initial reworking of the RoomTile CSS 2016-07-20 12:46:44 +01:00
Matthew Hodgson 25eb2e2daf Merge pull request #1822 from vector-im/wmwragg/spinner-fix
Wmwragg/spinner fix
2016-07-19 12:54:15 +01:00
Matthew Hodgson d8d9912f2d Merge pull request #1823 from vector-im/wmwragg/mention-state-indicator
Wmwragg/mention state indicator
2016-07-19 12:19:36 +01:00
wmwragg 8a28da1986 Fixed white space issues 2016-07-19 12:13:29 +01:00
wmwragg 384425582a Fixed wonky white space 2016-07-19 11:47:32 +01:00
wmwragg b87b356722 Added fixed SCG assets 2016-07-19 11:43:15 +01:00
Matthew Hodgson 6ae0dda9d3 give FF higher billing 2016-07-18 18:26:03 +01:00
Matthew Hodgson 6c680ff424 improve spacing 2016-07-18 18:25:50 +01:00
Matthew Hodgson c6b455f470 improve spacing 2016-07-18 18:24:30 +01:00
wmwragg f6d7052928 Oixel tweak so that it work properly in firefox 2016-07-18 16:38:29 +01:00
wmwragg 2ee1a9c440 Explanatory text about specificity 2016-07-18 16:20:44 +01:00
wmwragg 8fd12d530d Added the hightlight badge restyling 2016-07-18 14:57:03 +01:00
wmwragg 3f7bd48c0a Made the collapsed badge smaller than the uncollapsed one, basically the same size as it was originally 2016-07-18 14:27:14 +01:00
wmwragg 28108476bd Added an overide for the view source so that it behaves correctly with the new Modal. Also tweaked the spinner overide 2016-07-18 10:31:17 +01:00
Matthew Hodgson 722cedc92e CSS for generic user settings at last 2016-07-18 01:33:43 +01:00
Matthew Hodgson f182e32e3d typo 2016-07-18 01:33:36 +01:00
wmwragg 3cfcc13387 Initial fix for Dialog Spinners 2016-07-17 21:20:11 +01:00
wmwragg 953bb64e0b Some quick initial tweaks to the badge icon 2016-07-17 21:18:47 +01:00
Matthew Hodgson 54f4443428 fix single emoji sizing 2016-07-17 18:30:06 +01:00
Matthew Hodgson 1e963a6c3a Revert "Presentation for inline link" 2016-07-15 16:54:27 +01:00
Matthew Hodgson 348f133e77 add mx_EventTile_body class for the body span in events, and fix the naming scheme of '.emoji-body' 2016-07-15 15:03:42 +01:00
Matthew Hodgson cd865bbe8f Merge pull request #1806 from vector-im/wmwragg/modal-restyle
Wmwragg/modal restyle
2016-07-15 15:01:01 +01:00
wmwragg e668d7685d Fixed light box colour, reset back to black. 2016-07-15 14:54:15 +01:00
Matthew Hodgson 6607bee91a Merge pull request #1799 from ribot/feature-inline-link-preview
Presentation for inline link
2016-07-15 13:51:54 +01:00
wmwragg 3a89a5af0b Increasing the specificity of the CSS so that primary input submit buttons are styled correctly 2016-07-15 12:33:56 +01:00
Stefan Pearson 35e3621ae7 removes overflow comments 2016-07-15 12:21:05 +01:00
wmwragg 040ef73886 Simple refactor of the primary indicator, now it's a class. Also added a global selector to remove the ugly firefox dotted line highlight 2016-07-15 11:22:10 +01:00
David Baker 74c9ac0872 Merge pull request #1798 from vector-im/dbkr/offline_user_colour
CSS for offline user colours
2016-07-14 18:29:28 +01:00
wmwragg adbad509f4 Updated to highlight the primary button in the dialog, i.e. the first one 2016-07-14 17:59:06 +01:00
David Baker 15a97a653f CSS for offline user colours 2016-07-14 17:43:43 +01:00
Stefan Pearson 9fb97a6b10 presentation for inline link 2016-07-14 17:08:25 +01:00
wmwragg 579f210cfc Initial Modal dialog restyling 2016-07-14 16:55:41 +01:00
wmwragg 2fb1e156ed Modal background restyled 2016-07-14 15:41:23 +01:00
wmwragg 707ddc61bf Mergeing up from develop 2016-07-14 12:43:25 +01:00
wmwragg 09e861637f Simplification of the css 2016-07-14 12:04:31 +01:00
wmwragg 1f43f904d5 Search icon updated in header, and all icons spacing and positioning teaked 2016-07-14 11:33:07 +01:00
wmwragg e1779ca8bc Deleteing .DS_Store files before adding to gitignore 2016-07-14 10:41:41 +01:00
wmwragg a4dc844338 Added truetype font fallback for browsers that don't support WOFF2 format, i.e. safari 2016-07-14 10:24:16 +01:00
wmwragg 0a4af647c8 Header and footer buttons updated to new versions 2016-07-13 17:46:07 +01:00
wmwragg 503bf541c7 Tweak to the close button css to keep the close button inline with the search box 2016-07-13 14:34:20 +01:00
wmwragg 1fbc249de5 Updated Filter room icon 2016-07-13 14:23:46 +01:00
wmwragg 959dcd0c49 Updated BottomLeftMenu buttons to the new ones 2016-07-13 14:10:44 +01:00
wmwragg ef4f2f10d9 Updated that RightPanel members icon, highlight and numbers 2016-07-13 13:56:59 +01:00
Aviral Dasgupta 74f459f8a4 feat: bump emoji-body font-size down to 48px 2016-07-12 20:37:51 +05:30
Aviral Dasgupta 49dd93ffab feat: large emoji support 2016-07-05 04:04:34 +05:30
David Baker 7174879ac9 Merge pull request #1717 from aviraldg/feature-autocomplete
Autocomplete
2016-07-04 18:16:22 +01:00
Matthew Hodgson 486adb717b Merge pull request #1670 from Half-Shot/patch-1
#1664 Set a maximum height for codeblocks
2016-06-24 19:16:50 +01:00
Richard van der Hoff 2ca9d87b95 CSS for device blocking
A bunch of updates to the device info:

* format as a table
* make the buttons green, because the old way was super confusing
* instead make the status indicator red/orange/green.
2016-06-23 17:32:33 +01:00
David Baker 4bc4292ceb Rooms may not have aliases 2016-06-23 11:12:25 +01:00
David Baker 5f477b313b Unused variable 2016-06-23 10:20:11 +01:00
David Baker d45e44d01c Fix joining rooms by typing the alias
Fixes regression introduced by https://github.com/vector-im/vector-web/pull/1680
2016-06-23 10:11:46 +01:00
Richard van der Hoff c12839dc7b Merge pull request #1680 from vector-im/dbkr/delete_alias
Add ability to delete an alias from room directory
2016-06-22 17:25:27 +01:00
David Baker c35c9f7c3a PR feedback 2016-06-22 16:20:06 +01:00
David Baker ff5c7072d7 Mark the room as private (unlisted) too
Also clean up RoomDirectory a bit and just pass the room object around rather than the name / alias, so now we don't have to look up the room by ID again.
2016-06-22 14:52:55 +01:00
Matthew Hodgson eca453ee5a reposition Login spinner 2016-06-21 19:49:55 +01:00
David Baker ad2541299f Add ability to delete an alias from room directory
Hidden behind shift-click for now, but we're going to need to do this a lot to moderate the public room list.
2016-06-21 16:47:40 +01:00
Aviral Dasgupta dc840fdf48 updated selection styling 2016-06-21 19:02:18 +05:30
Aviral Dasgupta 510bb5785e Merge branch 'develop' into feature-autocomplete 2016-06-21 04:09:23 +05:30
Aviral Dasgupta 034c045b37 Styling for autocomplete 2016-06-20 13:53:18 +05:30
Matthew Hodgson 4dfb0e9a90 Merge branch 'develop' into matthew/scalar 2016-06-19 22:40:58 +01:00
Matthew Hodgson 654429dbdb improve wording on 'search room names' 2016-06-18 21:12:32 +01:00
Will Hunt c7d0214aaa #1664 Set a maximum height for codeblocks 2016-06-18 12:21:34 +01:00
David Baker 895fb63d5d Merge pull request #1661 from vector-im/rav/unverify_device
CSS for unverify button
2016-06-17 17:00:26 +01:00
Richard van der Hoff 95a0bc92d6 CSS for unverify button
(supports change in react-sdk)
2016-06-17 16:25:39 +01:00
Matthew Hodgson a90492e393 fix CSS 2016-06-17 16:14:14 +01:00
Aviral Dasgupta ec7067e7bd Autocomplete style 2016-06-17 04:58:39 +05:30
Richard van der Hoff 4cfcdfa040 Merge pull request #1639 from vector-im/dbkr/fix_peeking
Update for react-sdk dbkr/fix_peeking branch
2016-06-16 11:13:29 +01:00
David Baker e507339324 Merge pull request #1553 from aviraldg/feature-rte
Rich Text Editor
2016-06-14 15:27:35 +01:00
David Baker 3547bd8d00 Update for react-sdk dbkr/fix_peeking branch
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
2016-06-14 13:02:34 +01:00
Pedro Ferreira eb37032d8a Markdown: styles for bold/italics 2016-06-12 01:04:22 +02:00
Aviral Dasgupta f6ed21559a RTE mode switch styling & cleanup 2016-06-11 15:54:43 +05:30
David Baker d7504aeda5 Switch to new view_room 2016-06-10 15:13:41 +01:00
Aviral Dasgupta b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte 2016-06-10 04:43:06 +05:30
Aviral Dasgupta 819e06e2cd MessageComposer styling for Draft 2016-06-10 04:41:59 +05:30
David Baker a030e46c69 Use join_room_by_alias in RoomDirectory
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
David Baker f61cfbc542 Fix RoomDirectory to join by alias whenever possible. 2016-06-09 16:41:01 +01:00
Richard van der Hoff c4b7571c45 Merge pull request #1612 from vector-im/dbkr/optional_config
Make the config optional
2016-06-09 10:40:58 +01:00
Richard van der Hoff 4dd477e064 index.js: fix comment typo
Fix dave's typo for him
2016-06-09 10:38:51 +01:00
David Baker f595f6f141 This check shouldn't be here with the || 2016-06-09 10:25:49 +01:00
David Baker 24602119c5 This doesn't actually need to be global
(because the rendering isn't in a render method here)
2016-06-09 09:59:37 +01:00
David Baker 3040d0a474 Comment typo 2016-06-09 09:57:44 +01:00
David Baker e4ea00ca23 Return here, else we'll call resolve too 2016-06-09 09:56:57 +01:00
David Baker 4fc311da90 Style fix 2016-06-09 09:56:11 +01:00
Richard van der Hoff 7894e52529 Merge pull request #1610 from vector-im/rav/device_verification
CSS support for device verification
2016-06-08 21:37:35 +01:00
David Baker f6aa9a7ea4 Make the config optional
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
Richard van der Hoff 5f29729e82 Make unverified encrypted events red and verified ones green 2016-06-08 17:03:54 +01:00
Richard van der Hoff e24851456a CSS for the MemberDeviceInfo view 2016-06-08 17:03:28 +01:00
David Baker 1e40fd750f Don't use SdkConfig
instead take brand from a prop
2016-06-08 14:55:47 +01:00
Richard van der Hoff ed1554f4af index.js: fix wording in android popup 2016-06-07 22:01:56 +01:00
David Baker c6cf5febd5 Merge pull request #1516 from vith/static-config-json
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
David Baker f9aaf7d903 Use the SdkConfig interface
rather than pulling in config.json directly.

json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
Matthew Hodgson a2e73cceee Merge branch 'develop' into matthew/scalar 2016-06-06 10:24:39 +01:00
Matthew Hodgson d976046e6a set email branding whenever emails are added from vector 2016-06-02 13:15:13 +01:00
Aviral Dasgupta 12157edd62 Style selection color 2016-05-28 12:20:21 +05:30
Aviral Dasgupta 7e563b89c7 initial version of rich text editor 2016-05-27 10:17:01 +05:30
Jason Papakostas 6a6118e136 serve config.json statically instead of bundling it
issue #1344
2016-05-24 19:08:09 -05:00
Matthew Hodgson bede9a814b remove spurious top border; fix #1472 2016-05-24 00:30:36 +01:00
Matthew Hodgson d70842c3c7 fix padding of badges 2016-05-24 00:29:48 +01:00
Matthew Hodgson a288c5b85d fix padding of badges 2016-05-20 12:21:45 +01:00
Matthew Hodgson c4d408d095 CSS for IntegrationsManager 2016-05-18 17:02:39 +01:00
Matthew Hodgson ac24d6707f Add integs mgt 2016-05-18 15:02:03 +01:00
Matthew Hodgson e5835d2731 typo 2016-05-18 15:01:36 +01:00
Matthew Hodgson d8c32db14b typos 2016-05-17 20:24:01 +01:00
Matthew Hodgson 2b3606d44d switch to lozenges, and improve overlap behaviour 2016-05-17 19:52:56 +01:00
Matthew Hodgson 5feb31911a better collapsed look & feel 2016-05-17 11:19:04 +01:00
Matthew Hodgson 9483e42508 switch from dots to per-room badges 2016-05-17 11:14:30 +01:00
Matthew Hodgson e640f65640 add close button to room search filter 2016-05-16 23:36:52 +01:00
Matthew Hodgson 8a9c85c97d fix wording 2016-05-16 23:00:17 +01:00
Kegan Dougal bc166f19b7 Fix NPE when loading the Settings page which infini-spinnered 2016-05-16 16:04:06 +01:00
Matthew Hodgson 8fb521c83c 302 android to play store 2016-05-13 17:14:01 +01:00
Matthew Hodgson d9077584cd Merge branch 'dbkr/email_notifs' into develop 2016-05-13 15:16:35 +01:00
Matthew Hodgson 8467d5d760 302 to iTunes if you don't have the app installed 2016-05-11 01:48:02 +02:00
Matthew Hodgson 9cd8f7c7f3 Merge pull request #1469 from vector-im/dbkr/email_notifs
Add option to enable email notifications
2016-05-10 16:39:50 +02:00
Matthew Hodgson c64f71a3cb refine memberlist cosmetics 2016-05-05 00:35:47 +01:00
Matthew Hodgson af9838408b s/devices/notification targets/ 2016-05-04 11:58:37 +01:00
Matthew Hodgson 974a187e74 fix annoying bug where URL previews with very long lines (e.g. vector permalinks) would get clipped 2016-05-03 17:49:42 +01:00
David Baker efe1c767f0 Un-inline onChange 2016-05-03 11:36:44 +01:00
David Baker a72d0c5b7f Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-21 10:17:15 +01:00
David Baker 3cb092051e Merge branch 'develop' into dbkr/email_notifs 2016-04-21 10:11:55 +01:00
Richard van der Hoff 02f58ef9e3 Don't relayout scrollpanels every time something changes
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:29:32 +01:00
Richard van der Hoff a0b460b084 Include react-addons-perf for non-production builds
This makes it possible to gather a few performance stats
2016-04-19 15:01:24 +01:00
Matthew Hodgson aeb438dc62 fix tbody & keying warnings 2016-04-17 17:44:04 +01:00
Matthew Hodgson 10a053019d fix thinkos - thanks @richvdh for posthoc review 2016-04-17 17:35:17 +01:00
Matthew Hodgson 58c431abc2 fix spinner layout bouncing when changing notifs
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
2016-04-17 14:00:20 +01:00
Matthew Hodgson d512e25cca persist search filter over being hidden 2016-04-17 00:28:33 +01:00
Matthew Hodgson 65d9333104 pointer on roomsublist 2016-04-16 23:49:21 +01:00
Matthew Hodgson fbd974df55 fix bottomleft bug in chrome canary 2016-04-16 23:49:16 +01:00
Matthew Hodgson fdf83a5ad5 fix tooltip offset 2016-04-15 22:24:20 +01:00
Matthew Hodgson c98e06e1aa add cancelButton to simpleHeader 2016-04-15 22:16:06 +01:00
Matthew Hodgson b58265a69c fix comedy FontAwesome bug 2016-04-15 21:48:09 +01:00
Matthew Hodgson 37fbad0dbe fix LeftPanel width in FF 2016-04-15 21:37:52 +01:00
Matthew Hodgson 756da03b9a fix wrapping of RoomTile when selected 2016-04-15 20:50:22 +01:00
Matthew Hodgson 48e082e124 Merge pull request #1402 from vector-im/matthew/design_tweaks
Matthew/design tweaks
2016-04-15 18:48:30 +01:00
Matthew Hodgson c606912a8d fix topic font size 2016-04-15 18:45:52 +01:00
Matthew Hodgson 7cd24e7dbd commented out fading for RoomDirectory 2016-04-15 18:29:57 +01:00
Matthew Hodgson c7d717f0a4 fix RightPanel 2016-04-15 18:29:49 +01:00
Matthew Hodgson cf3cdaccf3 fix up UserSettings a bit 2016-04-15 18:23:47 +01:00
Matthew Hodgson d0d4760ddc align highlight with droptarget RHS 2016-04-15 18:09:10 +01:00
Matthew Hodgson 51bc18aef0 prettier icon 2016-04-15 18:05:57 +01:00
Matthew Hodgson 26d12bebe4 wire up searchbox filtering, and some minor overall tweaks 2016-04-15 17:54:48 +01:00
Matthew Hodgson 90ae024a4e tidy up rightpanel and searchbox 2016-04-15 15:53:27 +01:00
Richard van der Hoff eab206c3bd Improve handling of notification rules we can't parse
* An absent rule is the same as a rule with 'enabled == false', and is not
necessarily 'OFF' (particularly in the case of the bot rule, which is
inverted).

* If we don't understand the rule, then don't tick any of the radio buttons,
and instead show it in the 'external' section.
2016-04-15 12:42:03 +01:00
Matthew Hodgson 72745b05dc forgotten CSS 2016-04-15 10:49:25 +01:00
Matthew Hodgson f8d5101dbc add lost SVGs and implement SearchBox skeleton 2016-04-15 02:23:12 +01:00
Matthew Hodgson cc1e30c963 dinkier topic 2016-04-15 01:42:44 +01:00
Richard van der Hoff 121fe34180 Improve parsing of keyword notification rules
For notification rules, the absence of a value on a 'highlight' tweak means
that the highlight should happen; this was previously confusing us.

Use the action parser from NotificationUtils to simplify the code.

Fixes https://github.com/vector-im/vector-web/issues/1330
2016-04-14 22:45:00 +01:00
Richard van der Hoff 5450223cc7 More notifications fixes
Fix another thing I broke during the refactor
2016-04-14 22:31:40 +01:00
Matthew Hodgson 25b5c14527 fix new bottomleft menu 2016-04-14 22:26:48 +01:00
Matthew Hodgson 6bc4c87ce4 update to new bottomleftmenu. update header and composer heights 2016-04-14 21:43:49 +01:00
Richard van der Hoff 0f0c3d0ca1 Merge branch 'rav/more_refactor_notifications' into develop 2016-04-14 21:27:34 +01:00
Matthew Hodgson 96c4a24d3d skin RoomSubList chevrons, horizontal rules and selected room 2016-04-14 21:10:55 +01:00
Richard van der Hoff c6b501811f Move more stuff out of Notifications.js 2016-04-14 19:54:03 +01:00
Richard van der Hoff 0996a0b140 Fixes to refactored notifications
A few things I managed to break in the recent refactor
2016-04-14 19:54:03 +01:00
Matthew Hodgson 8557a3b70e fix vertical alignment within status bar 2016-04-14 19:15:35 +01:00
Matthew Hodgson 8b6cf1fc41 change badge look & feel; change status bar sizing 2016-04-14 19:11:58 +01:00
Matthew Hodgson 4eb762d52b spell out that images are clickable 2016-04-14 18:16:03 +01:00
Matthew Hodgson 4d221c6099 spell out that images are clickable 2016-04-14 18:15:51 +01:00
Richard van der Hoff b6d5849bec Merge pull request #1386 from vector-im/rav/refactor_notifications
Start Notifications component refactor
2016-04-14 14:29:11 +01:00
Richard van der Hoff 035b15f330 Moar debug for ff session restore issue 2016-04-13 22:18:26 +01:00
Richard van der Hoff 77355cbeb4 Add some debug to help with FF restore bug
(https://github.com/vector-im/vector-web/issues/1354)
2016-04-13 21:01:24 +01:00
Richard van der Hoff ff5dff45f5 Start Notifications component refactor
Factor some things out of the mega Notifications component, and add a dummy
unit test to show willing
2016-04-13 18:44:41 +01:00
Matthew Hodgson 50f94eb040 stop guests rom trying to blunder into non-guest rooms 2016-04-13 13:33:23 +01:00
David Baker 5794c30def Devices should be below 'advanced' 2016-04-13 11:35:53 +01:00
Matthew Hodgson b5248c06a7 fix https://github.com/vector-im/vector-web/issues/987 for once and for all 2016-04-13 00:34:32 +01:00
Matthew Hodgson 18bd1058d3 Merge pull request #1376 from vector-im/matthew/fadable
make the UI fadable to help with decluttering
2016-04-12 18:04:47 +01:00
Matthew Hodgson b18fcf7f9e spinner on saving room settings 2016-04-12 18:02:31 +01:00
Matthew Hodgson 05e963d1e2 make the UI fadable to help with decluttering 2016-04-12 17:17:08 +01:00
David Baker 5d9c8f3726 Support config for email notifs
Add support to notif settings for adding an email pusher, only for the first email address for now.
2016-04-12 16:19:20 +01:00
David Baker be55882f46 Merge pull request #1374 from vector-im/dbkr/get_pushers
Get and display a user's pushers in settings
2016-04-12 14:41:45 +01:00
David Baker 356a4a4392 Typo and use CSS rather than <i> 2016-04-12 14:10:17 +01:00
Matthew Hodgson 34bdd40953 timestamps are permalinks 2016-04-12 13:34:10 +01:00
David Baker c5524851f3 Comment future possibility for deleting pushers 2016-04-12 13:22:58 +01:00
David Baker cff1c3010b Get & display pushers in settings
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
2016-04-12 13:18:57 +01:00
Matthew Hodgson 46572ae793 click on group call thumbnail should return you to the group call, not the 1:1 2016-04-12 02:27:35 +01:00
Matthew Hodgson b1ba69fd00 fix lightbox overscroll 2016-04-12 00:35:00 +01:00
Matthew Hodgson 8c619fedeb Merge pull request #1343 from vector-im/matthew/preview_urls
URL previewing support
2016-04-11 23:55:18 +01:00
Matthew Hodgson efd01d6929 move localstorage crap entirely to TextualBody 2016-04-11 23:54:00 +01:00
Matthew Hodgson a1b78f93fe Fix wrap on view source 2016-04-10 14:18:57 +01:00
Matthew Hodgson cdc89c0623 add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback 2016-04-08 21:42:42 +01:00
Matthew Hodgson d107151f8a rename `size` prop as `fileSize`, add comments, and honour explicit properties rather than mxEvent fields 2016-04-07 18:10:15 +01:00
Matthew Hodgson 41373f30f7 oops, name LinkPreviewWidget correctly 2016-04-04 00:33:15 +01:00
Matthew Hodgson ad9d032f82 fix typo introduced in #1340 2016-04-04 00:17:50 +01:00
Matthew Hodgson d7eb23db53 specify sizes and hyperlinks for non-event images 2016-04-04 00:16:52 +01:00
Matthew Hodgson 333f1e46ca document properties and remove spurious 'view full screen' button 2016-04-03 23:57:44 +01:00
Matthew Hodgson d414127f80 track whether widget should be hidden on the event, as well as persisting it in localStorage 2016-04-03 23:31:42 +01:00
Matthew Hodgson ff2885087d support cancelling and uncancelling previews 2016-04-03 02:50:51 +01:00
Matthew Hodgson a5258978d6 Merge branch 'develop' into matthew/preview_urls 2016-04-03 02:07:03 +01:00
Matthew Hodgson 8c0a23dd8b fix widget layout 2016-04-03 02:06:24 +01:00
Matthew Hodgson d434ea55a8 Merge pull request #1332 from aviraldg/feature-emoji
😄 Emoji autocomplete and unicode emoji to image conversion using emojione.
2016-04-02 23:21:31 +01:00
Aviral Dasgupta cf17ea6254 Show full-size avatar on MemberInfo avatar click
fixes vector-im/vector-web#65
2016-04-03 00:53:17 +05:30
Matthew Hodgson 8247bb4a76 match style for markdown quotes 2016-04-02 00:36:53 +01:00
Matthew Hodgson 08a41bf093 improve layout for LinkPreviewWidget 2016-04-01 02:16:29 +01:00
Aviral Dasgupta d7157696f4 styling for emojione emojis 😄 2016-04-01 06:22:13 +05:30
Matthew Hodgson 512a9125bf fix zalgos in SenderProfile again, whilst maintaining limited-width name via inline-block. and without doubling emote vertical space... 2016-03-30 19:47:06 +01:00
Matthew Hodgson bdf8f655fb tweak animation and comment it out for now as it maxes out a whole core on my top-of-the-line MBP... 2016-03-30 01:36:44 +01:00
Matthew Hodgson 8603dd4bb4 Merge pull request #1292 from aviraldg/feature-pretty-placeholder
Prettier, animated placeholder :D
2016-03-30 01:28:34 +01:00
Richard van der Hoff e15358f77e Merge pull request #1307 from vector-im/rav/SimpleRoomHeader
RoomDirectory: use SimpleRoomHeader instead of RoomHeader
2016-03-29 23:26:09 +01:00
Richard van der Hoff 851b601d2c Pass SimpleRoomHeader topic in as a named prop 2016-03-29 23:25:26 +01:00
Matthew Hodgson 0ddb2cf183 fix action vertical spacing 2016-03-29 17:10:11 +01:00
Richard van der Hoff cf0340c1c7 RoomDirectory: use SimpleRoomHeader instead of RoomHeader
SimpleRoomHeader and RoomHeader are now separate things
(https://github.com/matrix-org/matrix-react-sdk/pull/252), so update Vector
accordingly.
2016-03-29 16:45:24 +01:00
Aviral Dasgupta 6c5b4a298b Prettier, animated placeholder :D 2016-03-28 19:32:04 +05:30
Richard van der Hoff b6e4c59877 Merge pull request #1249 from vector-im/dbkr/disable_composer_if_no_permission
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/247
2016-03-24 11:44:16 +00:00
Matthew Hodgson 0bc1624d4e make senderprofile smaller 2016-03-24 01:19:55 +00:00
Matthew Hodgson f81f7db6cd fix layout problems exposed by #cats 2016-03-24 01:12:27 +00:00
Matthew Hodgson 9e95d2e4ac make image event bodies display as blocks to avoid auto sizing, so we can measure their width to explicitly set their height 2016-03-24 00:13:03 +00:00
Richard van der Hoff 090db5490b URI-decode the hash-fragment
It looks like % characters in the hash-fragment are meant to be interpreted as
a URI-encoding, so we should decode them.
2016-03-23 15:58:00 +00:00
David Baker cfcb050822 Add composer controls wrapper to set correct width on the composer controls wrapper div 2016-03-23 15:21:37 +00:00
David Baker 66e36e9d40 CSS for https://github.com/matrix-org/matrix-react-sdk/pull/247 2016-03-23 15:15:38 +00:00
Matthew Hodgson a3a4ff569e stop scrollbars overlaying on the count 2016-03-23 13:51:38 +00:00
Matthew Hodgson 27ab79fd38 handle unaliased room naming more sanely 2016-03-23 11:50:38 +00:00
Matthew Hodgson 8cbc8db1cb oops 2016-03-23 11:38:17 +00:00
Matthew Hodgson e32299a50c fix enable notifs text 2016-03-23 11:32:47 +00:00
Matthew Hodgson c843ee3157 handle canonical aliases correctly; search on names; support rooms with no aliases 2016-03-23 11:26:18 +00:00
Matthew Hodgson 490cbbd05f fix horiz pre scrollbars https://github.com/vector-im/vector-web/issues/754 2016-03-22 15:13:36 +00:00
Matthew Hodgson e4aa43944f crude lipstick for warnings 2016-03-22 12:11:19 +00:00
Matthew Hodgson 827f891ae7 warning prompt for roomsettings 2016-03-22 00:56:38 +00:00
Matthew Hodgson 54c34ab8d5 improve previewbar look & feel 2016-03-21 22:06:06 +00:00
Matthew Hodgson d4a36f5081 permalink button 2016-03-19 23:26:04 +00:00
Matthew Hodgson 19cb06d040 prop fix 2016-03-18 20:08:31 +00:00
Matthew Hodgson a1e3cf76e1 top-align search results 2016-03-18 16:24:48 +00:00
Matthew Hodgson 866bd55bc3 give notif bar a pointer cursor 2016-03-18 16:16:13 +00:00
Matthew Hodgson a6257a1148 show right panel if needed when viewing users 2016-03-18 16:09:00 +00:00
Matthew Hodgson 92e187da64 fix ugly spinner on MemberList 2016-03-17 18:44:53 +00:00
Matthew Hodgson f950b675bd workaround to avoid accidental click-throughs on narrow vertical scrollbars 2016-03-17 18:26:00 +00:00
Matthew Hodgson aca4457a89 apparently we don't need a default onClick 2016-03-17 17:00:58 +00:00
Matthew Hodgson d7a851a353 make senderprofiles clickable 2016-03-17 16:28:49 +00:00
Matthew Hodgson c6f95dfb3b Merge pull request #1180 from vector-im/matthew/fix-notif-spam
fix notif spam when logging in from a guest session by correctly logging out first.
2016-03-17 14:37:21 +00:00
Matthew Hodgson 4164688c24 add pointer to EventTile 2016-03-17 13:09:28 +00:00
Matthew Hodgson cddfa62e27 reorder the push settings as off, on, loud - fixes https://github.com/vector-im/vector-web/issues/1117 2016-03-17 02:24:48 +00:00
Matthew Hodgson a6e3b39f16 fix notif spam on launch by correctly logging out again. reverts start_login_from_guest stuff 2016-03-17 02:08:05 +00:00
Matthew Hodgson f8fb3a7fe1 fix aspect ratio of roomavatar preview 2016-03-16 20:00:50 +00:00
Matthew Hodgson 50d18ac771 Merge pull request #1165 from vector-im/matthew/cancellable-upgrade
use new start_login_from_guest dispatch for cancellable logins from guest accounts
2016-03-16 14:37:50 +00:00
Mark Haines 05e479a76c Use then() chaining rather than manual callbacks 2016-03-16 10:59:40 +00:00
Matthew Hodgson cb45db36c2 use new start_login_from_guest dispatch for cancellable logins from guest accounts 2016-03-15 21:02:25 +00:00
Mark Haines 31915db6f6 Remove trailing whitespace 2016-03-15 18:38:24 +00:00
Mark Haines eb01cb9cba Merge pull request #1037 from vector-im/markjh/change_push_actions
Update the actions of default rules instead of overriding.
2016-03-15 18:10:04 +00:00
Matthew Hodgson 2a8afd49fb mx_Login_fieldLabel CSS 2016-03-15 18:09:54 +00:00
Mark Haines 9b85d88036 s/somme/some/ 2016-03-15 15:23:18 +00:00
Matthew Hodgson c2049e991b padding for radio buttons on login pages 2016-03-15 13:37:07 +00:00
Mark Haines 3224a4e49e Add helper functions for decoding and encoding lists of push actions 2016-03-15 11:26:32 +00:00
Matthew Hodgson cfc4b89225 fix https://github.com/vector-im/vector-web/issues/1154 2016-03-15 10:56:54 +00:00
Mark Haines 8b1444c954 Port the legacy im.vector rules to the new format on startup 2016-03-15 10:49:10 +00:00
Richard van der Hoff e777db3fc4 Add setting for audio notifications
Expose the enableAudioNotifications setting in the user settings panel.
2016-03-10 11:01:29 +00:00
Matthew Hodgson a4d22ffe8c improve IS warning 2016-03-06 17:11:08 -05:00
Matthew Hodgson 622a4b0e4c improve cosmetics of login prompts slightly 2016-03-06 13:46:27 -05:00
Matthew Hodgson 7433f50c8c make settings button always visible 2016-03-04 23:16:36 +00:00
David Baker d732927dba Re-enable upgrade registration.
Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.
2016-03-04 15:42:22 +00:00
Matthew Hodgson 2586280f2c add opera 2016-03-03 15:31:08 +00:00
Matthew Hodgson 516647ad04 fix placeholder opacity on moz 2016-03-03 15:31:02 +00:00
Matthew Hodgson 04fb8f9a81 de-kegan the CompatibilityPage :( 2016-03-03 15:22:12 +00:00
Matthew Hodgson 52f259ccfa explicit fg color for MessageComposer 2016-03-03 15:08:13 +00:00
Matthew Hodgson f89fe4fff8 when we set an explicit form foreground colour, set an explicit background one too to prevent system-level dark themes on Linux etc making the foreground text unreadable 2016-03-03 14:37:11 +00:00
David Baker b03e6a8d73 add comment explaining data passing hack 2016-03-02 14:34:31 +00:00
David Baker 2271ec7634 Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) 2016-03-02 14:24:00 +00:00
David Baker 332354e5b6 Uncommit 71cb04c50a (I failed to branch) 2016-03-02 14:23:20 +00:00
David Baker 71cb04c50a Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) 2016-03-02 14:21:32 +00:00
Mark Haines 3b2d0a6c01 Fix up reading the push rules 2016-02-29 16:56:33 +00:00
Mark Haines 731d94eea4 Update the actions of default rules instead of overriding.
The Matrix CS API, and synapse now supports setting the actions for default
rules. Doing that makes managing the rules much simpler from a vector
persepctive since the ON/LOUD/OFF toggle buttons can be implemented by
setting the actions and enabling/disabling the default rules rather than
overidding them.

Overriding the default rules was difficult because it was not possible
to intermingle the evaluation of user-specified rules with the default
rules. So even though you could add a rule with the same conditions as a
default rule, it would evaluate before *all* the other default rules.

Also creating new rules under a im.vector namespace creates challenges
if we want vector to cooperate with other matrix clients that want to
provide a similar set of toggle switches for the push rules.
2016-02-26 20:51:16 +00:00
David Baker acb443537a Merge pull request #997 from vector-im/dbkr/fix_new_room_crash
Sender can be null, so null check.
2016-02-23 18:12:42 +00:00
David Baker 55c7c08ac2 Sender can be null, so null check. 2016-02-23 17:59:13 +00:00
Richard van der Hoff 72393bf75f Merge branch 'rav/read_marker' into develop 2016-02-23 17:57:50 +00:00
David Baker a063efe250 Remove no-longer accurate comment. 2016-02-23 10:57:50 +00:00
David Baker 45c8500f28 Pass through params for other URLs (in this case, for keypair invite signing urls) 2016-02-23 10:22:22 +00:00
Matthew Hodgson f2fc4a88ae gemini up roomdirectory 2016-02-22 09:35:11 +00:00
Matthew Hodgson 77b45e7231 oooooooops - remember opensans v13 2016-02-22 09:18:56 +00:00
Matthew Hodgson 2ca5529faa support hyperlinked topics 2016-02-20 23:54:47 +00:00
Matthew Hodgson a35ab6bcef tart up room directory 2016-02-20 13:36:48 +00:00
Matthew Hodgson e33e9b5d4a upgrade OpenSans and add semibold 2016-02-20 13:36:33 +00:00
Matthew Hodgson 3910877f8f ensure local activity bumps rooms up the roomlist 2016-02-19 02:09:04 +00:00
Matthew Hodgson f538a0d5de scale local video feed to fit on the page properly 2016-02-19 01:16:55 +00:00
Matthew Hodgson 4e5b971d3a accomodate 800px wide thumbs 2016-02-18 19:09:32 +00:00
Matthew Hodgson ffb1584e10 horizontally scale images properly 2016-02-18 18:59:45 +00:00
Matthew Hodgson dbf3439e35 fix statusbar layout some more 2016-02-18 18:13:23 +00:00
Matthew Hodgson 11ac6defed tint searchbar 2016-02-18 17:32:15 +00:00
Matthew Hodgson 27222a54c7 somewhat cryptic hack to make empty RoomStatusBars not take up 41px rather than 36px of height 2016-02-17 18:54:46 +00:00
Matthew Hodgson 3263076ea6 Merge branch 'develop' into rav/update_status_bar 2016-02-17 18:37:40 +00:00
Matthew Hodgson 3c659dcf57 experimental fix for https://github.com/vector-im/vector-web/issues/947 and https://github.com/vector-im/vector-web/issues/946. may well introduce more problems 2016-02-17 12:43:42 +00:00
Matthew Hodgson 2cd3150c56 tart up mx_EventTile_selected 2016-02-15 20:22:45 +00:00
Matthew Hodgson cdc1447804 fix search highlight css 2016-02-15 20:19:30 +00:00
Matthew Hodgson 11c9aff69a fix radiobutton css 2016-02-15 22:06:16 +02:00
Matthew Hodgson 58959d014a show vaguely accurate default avatar 2016-02-15 22:01:30 +02:00
Richard van der Hoff 1a9125a886 Fix horizontal alignment of top unread-messages bar 2016-02-15 18:10:11 +00:00
Matthew Hodgson 8e008572e5 CSS for setting display name prompt 2016-02-15 19:37:19 +02:00
Richard van der Hoff 18c6aa38e4 Styling and imgs to support new read_marker semantics
Support for adding a new 'Scroll up' bar in react-sdk
2016-02-15 17:22:55 +00:00
Matthew Hodgson 177fba360d shrink 3pid invite placeholder text 2016-02-15 11:13:24 +02:00
Matthew Hodgson ad9935739c proper fix for https://github.com/vector-im/vector-web/issues/917 and resolve https://github.com/vector-im/vector-web/issues/928 2016-02-15 09:56:52 +02:00
Matthew Hodgson a2193d61b0 show the leave button by default for now as it causes too much pain otherwise 2016-02-14 21:34:32 +02:00
Matthew Hodgson 0ca6efdfca fix the nightmarish https://github.com/vector-im/vector-web/issues/917 2016-02-14 21:28:01 +02:00
Matthew Hodgson f3df0d07f8 filter room directory case insensitively 2016-02-14 13:32:15 +02:00
Matthew Hodgson 155728b136 make babel actually do full ES6 emulation for Safari 8 2016-02-10 14:54:55 +00:00
David Baker 1732805f31 Always parse the hash of a URL as we do elsewhere by looking for a query string part, otherwise we end up passing the query into showscreen which then spreads havok. 2016-02-10 13:45:24 +00:00
Richard van der Hoff bab9de1899 CSS fixes to match matrix-org/matrix-react-sdk#30b4b91.
This mostly works, but there is some weirdness with the status bar being too
high by default, and getting smaller when it has content in it.
2016-02-09 14:44:59 +00:00
Kegan Dougal 27791c06ee Cache-bust on /version request 2016-02-05 15:53:33 +00:00
David Baker 485343864c semicolon 2016-02-05 10:57:49 +00:00
David Baker f035b8c50e Rate limit UI updates to avoid browser death 2016-02-04 18:09:24 +00:00
David Baker 15fec7f27c Merge pull request #862 from vector-im/dbkr/style_dialog_submit_button
Style submit input controls in dialogs the way we style buttons.
2016-02-04 15:07:44 +00:00
David Baker c0c7ae1596 Style submit input controls in dialogs the way we style buttons. 2016-02-04 11:50:29 +00:00
Kegsay 6c5a00162c Merge pull request #856 from vector-im/kegan/version-stamp
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 17:09:24 +00:00
Kegan Dougal b307a6d64e Invoke onVersion when we know the current version even if there is no new version (for settings) 2016-02-03 16:50:05 +00:00
Kegan Dougal 4628cf82a7 Split out response text to its own var to prevent trim() messing up comparisons 2016-02-03 16:23:17 +00:00
Kegan Dougal 5eed734325 Add a version update checker and NewVersionBar to show on the UI. 2016-02-03 16:16:14 +00:00
David Baker d132c75263 Remove the autoPeek stuff and always either peek or show the join prompt bar 2016-02-02 15:51:23 +00:00
David Baker d1dc082489 Remove empty if block 2016-02-01 18:02:52 +00:00
Richard van der Hoff f94272c539 Add some crude CSS for highlighting the selected event
(To be useful, this needs functionality which hasn't yet landed in react-sdk).
2016-01-30 00:43:47 +00:00
David Baker 3b18b9b54b Fix connection lost bar CSS 2016-01-29 10:07:22 +00:00
David Baker 6a36b022e4 New style guest warning bar 2016-01-28 13:00:44 +00:00
David Baker 35600f11ad CSS that changes the connection lost bar into a more general 'warning bar' so we can use it for a guest access warning 2016-01-28 09:19:28 +00:00
Matthew Hodgson 75886c4143 make badges scale with size of RoomTile 2016-01-24 14:50:24 -05:00
Matthew Hodgson cd853ab5b4 try for a simpler invite placeholder look & feel 2016-01-24 19:02:49 +00:00
Matthew Hodgson 292af1e59c improve settings layout and fix FF bugs 2016-01-24 18:14:52 +00:00
Matthew Hodgson d3bc0feb83 fix ugly wrapping bug 2016-01-24 17:54:01 +00:00
Matthew Hodgson 19bfd829d0 add scrollToBottomBar and fix spacing for status bars in general 2016-01-24 01:52:21 +00:00
Matthew Hodgson 759b318bb5 fix safari 2016-01-23 01:24:04 +00:00
Matthew Hodgson dd19d2aaee red bar for highlights even if there's a unreadNotify too 2016-01-22 18:04:54 +00:00
Matthew Hodgson e0ecde6760 put a black badge on unread notifications, and a red one for unread highlights 2016-01-22 17:23:04 +00:00
Matthew Hodgson 5e21059144 Merge pull request #729 from vector-im/matthew/truncateroomlist
truncate room list
2016-01-22 16:09:28 +00:00
Matthew Hodgson 0a32874b39 oops, reset truncate state on hide, not collapse 2016-01-22 16:09:06 +00:00
Kegan Dougal 302c63058b Invoke onShowMoreRooms to allow parents to kick their scrollbars.. 2016-01-22 15:46:58 +00:00
Matthew Hodgson 0ee1892a0b truncate room list 2016-01-22 15:31:42 +00:00
David Baker e11ae99a9f Add vector rules with the appropriate kind, otherwise the room_message rule takes precedence over content / display name rules etc and prevents bings. 2016-01-22 14:12:29 +00:00
manuroe ce45f0b1e6 Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF 2016-01-22 09:30:31 +01:00
Matthew Hodgson a76167d175 correct layout for truncated lists 2016-01-21 17:38:46 +00:00
manuroe f3064a2994 Put back removing of "When people join or leave a room" settings push rule 2016-01-21 16:37:17 +01:00
manuroe 029cf754ee Added notif settings for "Messages sent by bot" (https://github.com/vector-im/vector-web/issues/692)
In order to do that, the rules definitions have been update to support "dont_notify" hs default push rules
2016-01-21 16:16:44 +01:00
David Baker 1a248c8e5c Merge pull request #710 from vector-im/unread_sync
Use read receipts to calculate unread room status
2016-01-21 13:29:49 +00:00
David Baker b913e72735 Remove member event rule as per SYN-607 2016-01-21 12:01:28 +00:00
David Baker 4d4c6e06ec Merge remote-tracking branch 'origin/develop' into unread_sync 2016-01-21 10:39:35 +00:00
David Baker 2d917910da Merge pull request #556 from vector-im/notif_sync
Use unread count for room highlight state
2016-01-21 10:31:46 +00:00
David Baker a08d00c672 Apply patch to the right branch: update for new count format 2016-01-21 10:20:45 +00:00
Matthew Hodgson bd75234a2f make CSS work on FF 2016-01-21 00:39:26 +00:00
Matthew Hodgson 6573ba8c20 fix up Start Chat behaviour as per Amandine's feedback 2016-01-21 00:16:26 +00:00
Matthew Hodgson f4a2b6ab7e Merge pull request #697 from vector-im/matthew/roompreview
Lots of CSS bugfixes and polishing
2016-01-20 22:32:08 +00:00
Matthew Hodgson 6117e09a3f implement the correct design for memberlist 2016-01-20 22:04:32 +00:00
Matthew Hodgson 1fd60f1e44 revert read marker css 2016-01-20 17:23:33 +00:00
David Baker ac2e69ba28 Use new unread count methods 2016-01-20 17:20:19 +00:00
Matthew Hodgson 48052415b7 usersettings button layout 2016-01-20 17:09:53 +00:00
Matthew Hodgson e87e22a438 rhsbutton 2016-01-20 17:06:13 +00:00
Matthew Hodgson 5b2f921190 Fix bold avatar letters 2016-01-20 17:01:19 +00:00
Matthew Hodgson b830f43371 remove RoomAvatar; stale border-radius; fix aliases table 2016-01-20 16:59:53 +00:00
Matthew Hodgson 6332e3908e roomsettings css fixes 2016-01-20 16:39:14 +00:00
Matthew Hodgson 82742f9f13 oops, fix tinted read up to marker correctly 2016-01-20 16:06:35 +00:00
manuroe 888fde0f53 Fixed call push notifications settings that always stayed OFF 2016-01-20 17:01:09 +01:00
David Baker eb62456007 Update for new unread count format 2016-01-20 15:58:21 +00:00
Matthew Hodgson 60d2d45255 readd in the .mx_EntityTile_power class. don't understand why it was killed :'( 2016-01-20 15:39:42 +00:00
Matthew Hodgson 6ecdb02e81 sanitize avatar border radii 2016-01-20 15:26:48 +00:00
Matthew Hodgson 4d3918109a skin new invite UI CSS 2016-01-20 14:58:27 +00:00
Matthew Hodgson 9a9db53e0a fix tinting of read marker again 2016-01-20 14:58:17 +00:00
Matthew Hodgson 3e8c6a42d3 roomsettings layout tweaks 2016-01-18 19:58:02 +00:00
Matthew Hodgson 3b8e5073b5 improve layout 2016-01-18 19:57:32 +00:00
Matthew Hodgson a775086e81 wording from amandine 2016-01-18 19:57:17 +00:00
Matthew Hodgson d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-18 18:00:58 +00:00
Matthew Hodgson d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now 2016-01-18 17:37:13 +00:00
Kegan Dougal 317e1fb9cd Merge branch 'develop' into kegan/invite-search 2016-01-18 17:33:26 +00:00
manuroe 6182c983ab PushRules settings: Applied review remarks (2/2) 2016-01-18 18:24:53 +01:00
Kegan Dougal ac4b221690 More CSS fun for border bottom 2016-01-18 17:22:02 +00:00
manuroe fdf5b0a4fc Merge branch 'develop' into push-rules-settings
# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
manuroe 7c0fffa79b PushRules settings: Applied easy review remarks 2016-01-18 18:07:33 +01:00
Kegan Dougal fef02f2fd1 s/MemberTile/EntityTile/ 2016-01-18 16:43:00 +00:00
manuroe bdcf683942 PushRules settings: Create a dedicated rule for "Messages sent to group".
The default fallback rule cannot be used because it matches with too much events.
2016-01-18 16:41:48 +01:00
manuroe ae14210763 PushRules settings: Put keywords in the right position 2016-01-18 16:31:18 +01:00
manuroe 830160f074 PushRules settings: Enabled all radio buttons of the table.
Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one.
2016-01-18 16:24:06 +01:00
Matthew Hodgson 0ef03c5ca4 Merge pull request #653 from vector-im/matthew/roomsettings2
Finish off RoomSettings (part 2)
2016-01-18 13:39:55 +00:00
Matthew Hodgson 5a1b0a1dab Merge pull request #657 from vector-im/matthew/memberlist
Fix up MemberList and MemberInfo cosmetics a bit
2016-01-18 13:39:42 +00:00
Kegan Dougal 77621fe035 Add missing CSS from #638 2016-01-18 12:06:46 +00:00
Matthew Hodgson 8792be4db2 moar space 2016-01-18 01:25:57 +00:00
Matthew Hodgson 1fef91b82c MemberInfo lipstick 2016-01-18 01:18:11 +00:00
Matthew Hodgson b2a1c89e83 bring back power badges 2016-01-18 00:16:04 +00:00
Matthew Hodgson 40d2018c17 fix checkbox css 2016-01-17 12:26:54 +00:00
Matthew Hodgson a61afa0f31 fix css thinko 2016-01-17 02:46:22 +00:00
Matthew Hodgson 4e7c58e242 fix broken icon 2016-01-17 02:46:15 +00:00
Matthew Hodgson 8771369937 more layout 2016-01-15 20:29:44 +00:00
Matthew Hodgson 394fb2373b more layout tweaks for RoomSettings 2016-01-15 16:50:12 +00:00
Matthew Hodgson eb8064f961 fix cursors for changeavatar 2016-01-15 16:32:39 +00:00
Matthew Hodgson 531aa153bb no more textarea in roomsettings 2016-01-15 16:32:23 +00:00
manuroe d7ffe70d44 PushRules settings: Applied Amandine's review comments 2016-01-15 17:28:57 +01:00
Kegan Dougal 17489ae350 s/MemberAvatar/BaseAvatar/ and rename classes 2016-01-15 16:12:28 +00:00
Matthew Hodgson 762dd69f0a more bottom margin on editable roomheader 2016-01-15 15:48:29 +00:00
manuroe cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" 2016-01-15 16:45:27 +01:00
Matthew Hodgson 1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks 2016-01-15 15:26:00 +00:00
manuroe 2dd2acd4e0 PushRules settings: BF adding a keyword when the keywords rule is OFF 2016-01-15 14:28:50 +01:00
Matthew Hodgson 41ae851df4 fix up user settings CSS somewhat 2016-01-15 12:34:01 +00:00
manuroe c3469b5b51 PushRules settings: coding: separate UI and data management 2016-01-15 11:33:54 +01:00
manuroe 7412fc7f97 PushRules settings: changed wordings 2016-01-15 10:51:42 +01:00
Matthew Hodgson d1f26e3911 camera icon 2016-01-14 17:26:16 +00:00
Matthew Hodgson c1aac1aaca roomsetting icons 2016-01-14 17:25:21 +00:00
Matthew Hodgson f2fa9fe398 Merge branch 'develop' into matthew/roomsettings2 2016-01-14 16:49:48 +00:00
David Baker a65a15e9bb Shift read marker down by 5px 2016-01-14 16:45:13 +00:00
Matthew Hodgson 9ada5f7ddd CSS for tab complete slashcommands 2016-01-14 16:29:03 +00:00
Matthew Hodgson 17e540d372 fix line wrapping of code blocks in multiline msgs 2016-01-14 11:57:07 +00:00
Kegsay db2d7fdbff Merge pull request #622 from vector-im/kegan/3pid-invite-memberlist
CSS for email invite memberlist fix
2016-01-14 10:45:50 +00:00
Kegan Dougal 927ac5fe64 2016 only 2016-01-14 10:45:38 +00:00
manuroe 378f4bb85c PushRules settings: Display keywords in alphabetical order 2016-01-14 11:15:59 +01:00
manuroe 0577edb055 PushRules settings: Added master push rule 2016-01-14 11:03:51 +01:00
Matthew Hodgson 56718650b9 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:57 +00:00
Matthew Hodgson e3eef45684 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:49 +00:00
Matthew Hodgson 68f846e129 Merge branch 'develop' into matthew/roomsettings2 2016-01-13 17:33:32 +00:00
Matthew Hodgson f2171c11f0 uncommitted WIP roomsetting CSS 2016-01-13 17:33:03 +00:00
manuroe 629883731e PushRules settings: BF when adding a new keyword with the keywords rule in Off 2016-01-13 17:56:59 +01:00
manuroe 0475bcd9de PushRules settings: BF when changing state of the keywords rule with such a sequence: on -> off -> loud. 2016-01-13 17:10:26 +01:00
Kegan Dougal 1d5e661bd0 Split out css for new PresenceLabel 2016-01-13 15:56:44 +00:00
manuroe ac87830e4e PushRules settings: Applied new wordings: On, Loud, Off 2016-01-13 16:48:22 +01:00
manuroe 7fc5ab3c6e PushRules settings: Use the new TextInputDialog to display keywords list. We earn the focus at the end of the keywords list and the management of enter and esc keys 2016-01-13 16:36:57 +01:00
manuroe c4cb37606b PushRules settings: Added sanity checks on new keywords 2016-01-13 15:47:00 +01:00
manuroe e5b7a47fee PushRules settings: if a newly typed keyword was part of a push rule not managed by the Vector UI, delete the rule and create it compliant with Vector parameters 2016-01-13 12:00:04 +01:00
manuroe 1c03c208e1 PushRules settings: update keywords list hs side 2016-01-13 11:46:13 +01:00
Kegsay 7232659195 Merge pull request #612 from vector-im/kegan/guest-peek-then-join
Add css for room preview bar.
2016-01-13 10:37:13 +00:00
manuroe 10d3076d6b PushRules settings: Display keywords modal dialog 2016-01-13 09:11:56 +01:00
David Baker cae3ab410f Merge pull request #603 from vector-im/read_marker_animate
New CSS for read markers
2016-01-12 17:58:36 +00:00
Kegan Dougal 2bada93fdc CSS for forgot password link 2016-01-12 16:39:29 +00:00
manuroe 9fb8c9f67a PushRules settings: Use a workaround for SYN-590 (Push rule update fails) 2016-01-12 17:33:57 +01:00
manuroe b9080c770d PushRules settings: Fixed triage of matrix content rules into the unique Vector rule 2016-01-12 16:46:27 +01:00
David Baker 977b223929 Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears. 2016-01-12 14:20:05 +00:00
manuroe 7f95362dd2 PushRules settings: Translate matrix per-word rules into the global Vector rule for a list of keywords 2016-01-12 15:12:58 +01:00
Kegan Dougal f706f75a6e Add css for room preview bar. 2016-01-12 14:11:00 +00:00
Matthew Hodgson fc3f356dc0 GA 2016-01-12 01:23:39 +00:00
manuroe 6d510db2db PPushRules settings: Fixed React warnings 2016-01-11 17:32:37 +01:00
manuroe ee13dd7b6c PushRules settings: Added a dedicated component to display them 2016-01-11 17:24:04 +01:00
Kegsay f898986c73 Merge pull request #594 from vector-im/kegan/guest-access
Enable guest access
2016-01-11 15:21:57 +00:00
David Baker 6cd0aeb607 Revert 4px offset: it ends up in the middle of the line above 2016-01-11 10:56:08 +00:00
David Baker 1e57aa8c78 Make read up to line 2px and position relative so we can shift it up a little 2016-01-11 10:52:29 +00:00
Matthew Hodgson 93c4fc8785 switch EditableText to contentEditable; fix auxPanel layout bug in the general case (not just for video) 2016-01-10 13:04:15 +00:00
Matthew Hodgson d49f8721ce fix leave.svg so that it can be tinted 2016-01-09 00:56:10 +00:00
David Baker c02d9890c5 New CSS for read markers 2016-01-09 00:09:11 +00:00
Matthew Hodgson ccd518cc4c CSS and imagery for fixed up RoomSettings 2016-01-08 03:26:07 +00:00
Kegan Dougal a369c862a0 Hit MatrixClient.peekInRoom on rooms we can only peek into. 2016-01-07 14:57:26 +00:00
Kegan Dougal 1a8a4728cd Enable guest access. Show r/w icons on room directory. 2016-01-07 14:43:12 +00:00
Matthew Hodgson d2635373f0 Merge pull request #585 from vector-im/matthew/dynamic-svg
Make SVGs and CSS dynamically recolourable
2016-01-07 11:41:46 +00:00
David Baker 36e5ac3d7f Add CSS for the green read-up-to marker. 2016-01-07 11:22:41 +00:00
Matthew Hodgson df111223fc copyrights for 2016 2016-01-07 04:17:56 +00:00
David Baker c0f1ae0133 Use Unread to compute unread status of a room (which uses read receipts). 2016-01-06 18:29:27 +00:00
Matthew Hodgson eacadbff40 remove stale onSvgLoad 2016-01-06 02:29:20 +00:00
Matthew Hodgson cb29a04674 use factored out TintableSvg component for dynamic SVGs 2016-01-06 02:11:34 +00:00
Matthew Hodgson bb313d1f3c vertical-align room messages to the bottom of the page 2016-01-05 18:49:47 +00:00
Matthew Hodgson a1bdfaa8a2 vertical-align room messages to the bottom of the page 2016-01-05 18:49:21 +00:00
Matthew Hodgson 1df4f2d556 fix hyperlink position for image downloads 2016-01-05 03:38:53 +00:00
Matthew Hodgson b996022db2 fix up dynamically loaded svgs, and fix bottomleftmenu 2016-01-05 03:34:25 +00:00
Matthew Hodgson bbf08d99cc tinterize more svg 2016-01-05 00:47:26 +00:00
Matthew Hodgson 17b8982c75 move title attributes to the div 2016-01-03 22:35:07 +00:00
Matthew Hodgson 3abdcbf806 switch SVGs from imgs to objects, fixing CSS to make onClicks work 2016-01-03 22:30:14 +00:00
Matthew Hodgson b9a0b82537 shuffle around all the CSS to de-atomify it and make it match the react components 2016-01-03 00:10:17 +00:00
Matthew Hodgson fa4bd09f0c fix room header height 2015-12-28 02:27:47 +00:00
Matthew Hodgson 8dd90980d8 add cancel button for lightbox and pare down pointer-events stuff a bit 2015-12-28 02:15:23 +00:00
Matthew Hodgson e9db7b1dcc doh 2015-12-28 01:41:51 +00:00
Matthew Hodgson 388eb1ff4c use Open Sans, and fix duplication 2015-12-28 01:38:14 +00:00
Matthew Hodgson 0ab8466a3b make tabcomplete items clickable 2015-12-24 15:12:24 +00:00
Kegan Dougal 94609db3a6 Wrangle CSS to get avatar on UserSettings in the right place 2015-12-24 09:21:02 +00:00
Kegan Dougal f9f85ec542 More user settings CSS 2015-12-23 16:53:19 +00:00
Kegan Dougal d3938220cf Duplicate css for applying to mx_EditableText classes so it works with ChangeDisplayName 2015-12-23 14:13:24 +00:00
Kegsay 73d9ef54c3 Merge pull request #384 from vector-im/matthew/settings
WIP experiment of turning UserSettings into a controller-less component
2015-12-23 10:23:39 +00:00
David Baker 755ea0dfb8 Merge remote-tracking branch 'origin/develop' into notif_sync 2015-12-22 14:46:57 +00:00
Matthew Hodgson f681ce5cdb add CSS for TabCompleteBar 2015-12-22 00:47:33 +00:00
Matthew Hodgson ceadfef942 fix missing webkit prefixes for flexbox 2015-12-21 23:20:44 +00:00
Matthew Hodgson f665848c5e speed up search anim 2015-12-21 23:20:10 +00:00
Matthew Hodgson 031b048c07 fix missing webkit prefixes for flexbox 2015-12-21 23:19:53 +00:00
Matthew Hodgson d82c4c5ef3 fix safari flexbox bug 2015-12-21 23:16:44 +00:00
Matthew Hodgson ae02d8d30a Merge branch 'develop' into matthew/settings 2015-12-21 13:10:34 +00:00
Matthew Hodgson 67aff6b9f2 adopt MacOS style chevrons 2015-12-21 12:37:51 +00:00
Matthew Hodgson 50aa988a34 fix layout 2015-12-21 12:37:50 +00:00
Matthew Hodgson fdc94ccf98 ensure even hyperlinks are highlighted 2015-12-21 12:37:50 +00:00
David Baker cb1fabc578 Highlight status is now the room's unread notif count 2015-12-18 17:53:31 +00:00
Kegan Dougal dcea0dd601 Move min-height to RoomList; remove bottommost prop 2015-12-18 17:13:57 +00:00
Kegan Dougal dc1e2010a6 Merge branch 'develop' into kegan/archived-rooms 2015-12-18 17:00:20 +00:00
Matthew Hodgson d7b87743f3 Merge pull request #533 from vector-im/matthew/inbound-calls
position the inbound call box correctly
2015-12-18 15:59:05 +00:00
Kegan Dougal 7cc1573f33 Add startAsHidden and showSpinner props to RoomSubList
startAsHidden: Previously we never started in the hidden state and all was well.
But with archived rooms you DO want to start hidden as you haven't fetched the
room list yet. Without this, you need to click twice (close/open) before the
archived room list will load.

showSpinner: If true, will show a spinner iff there are 0 elements being displayed.
Used when fetching the archived room list in RoomList.
2015-12-18 15:17:18 +00:00
Kegan Dougal f7c4cca675 Add TODO after spending 15 mins trying to figure out the difference between props.collapsed and state.hidden 2015-12-18 13:32:22 +00:00
Kegan Dougal 869c08a790 Add onHeaderClick and alwaysShowHeader props to RoomSubList for archived room clicking 2015-12-18 11:56:22 +00:00
Matthew Hodgson a7b9e54594 Merge branch 'develop' into matthew/settings 2015-12-18 00:36:46 +00:00
Kegan Dougal 63d0477223 Pass through the starting query params from the URL 2015-12-17 15:01:07 +00:00
Matthew Hodgson 1a90a2c426 position the inbound call box correctly, and fix various issues with when the video preview and callview are shown 2015-12-17 02:53:53 +00:00
Kegsay 856156ef5c Merge pull request #527 from vector-im/kegan/hide-fs-user
Pass a userId rather than a RoomMember to isConferenceUser
2015-12-16 13:56:50 +00:00
Kegan Dougal c8ca1dd8d0 Pass a userId rather than a RoomMember to isConferenceUser
Because invites do not have RoomMembers because we don't have an m.room.member
event for them, just a user ID, and we want to detect conf users at invite
time.
2015-12-16 11:55:13 +00:00
Matthew Hodgson d945050de6 fix typing notifs 2015-12-15 15:59:40 +00:00
Matthew Hodgson d3ecce2d2e add fullscreen button 2015-12-15 00:01:32 +00:00
Matthew Hodgson a495aecdd8 assets for VoIP and DnD file upload 2015-12-14 23:38:24 +00:00
Matthew Hodgson c553258aff add dedicated leave button to header 2015-12-13 13:49:54 +00:00
Matthew Hodgson 9c8984b308 fix vertical alignment of voip buttons 2015-12-13 04:14:20 +00:00
Matthew Hodgson c2061ed439 revert dd08f53756 - do this in JS instead 2015-12-13 04:08:35 +00:00
Matthew Hodgson 96cddc5ca8 fix layout for long room names & topics 2015-12-12 17:30:08 +00:00
Matthew Hodgson dd08f53756 don't let auxpanel push out the height of the roomview 2015-12-12 17:15:45 +00:00
Matthew Hodgson 056017007a improve look and feel of upload cancel 2015-12-12 16:41:32 +00:00
Richard van der Hoff c36d1df417 Add a 'muted' icon for voip calls
... because even a crappy one is better than nothing
2015-12-11 15:00:25 +00:00
Matthew Hodgson 762281cd96 fix vertical spacing of roomheader 2015-12-11 03:39:13 +00:00
Matthew Hodgson 898cb399a3 show results 2015-12-11 02:58:47 +00:00
Matthew Hodgson 3fb0c9883b escape key to cancel search box 2015-12-11 02:32:30 +00:00
Matthew Hodgson f2fb1836df only flash whilst searching 2015-12-11 02:25:51 +00:00
Matthew Hodgson fea3fed460 animate the search button whilst searching 2015-12-11 02:24:58 +00:00
Matthew Hodgson 4c82d86092 nice green highlights 2015-12-11 01:35:05 +00:00
Matthew Hodgson 1c9d61d731 dedicated search button 2015-12-11 01:19:48 +00:00
Matthew Hodgson 7b702c4594 don't grey out invites randomly 2015-12-11 00:40:40 +00:00
Matthew Hodgson d6bcf80431 make the settings button more discoverable by having the whole leftRow be a hover target 2015-12-10 19:48:05 +00:00
Matthew Hodgson 8ecf70dda0 show images with unknown height - fixes issue 475 hopefully 2015-12-09 13:24:15 +00:00
Matthew Hodgson 4b8d7a612a make the mx_RoomView_statusAreaBox_line full width as per the ribot design 2015-12-08 19:45:30 +00:00
Matthew Hodgson b532fd046a actually use SVGs - oops 2015-12-08 10:28:00 +00:00
Kegan Dougal 2f905e13e1 Invoke onFinished so the context menu doesn't hang around 2015-12-07 16:04:46 +00:00
Kegan Dougal 39778330b5 Also allow not_sent messages to be cancelled entirely. 2015-12-07 13:55:10 +00:00
Kegan Dougal 1af1297afc Allow queued events to be cancelled. Make not sent events appear differently to sending events. 2015-12-07 11:38:34 +00:00
Matthew Hodgson da5c687320 svgize coloured icons 2015-12-06 22:06:21 +00:00
David Baker 25eeaaf1e5 Use UnreadStatus to determine whether an event affects a room;s unread status. Unify rooms going bold with their sort order and don't go bold for m.notify. 2015-12-04 16:24:17 +00:00
Kegan Dougal ac8fcbb264 Force update the RightPanel when the member in MemberInfo is updated. 2015-12-04 16:16:41 +00:00
David Baker db5d9e2f6e Merge pull request #465 from vector-im/file_uploads
Move upload bar CSS to new classes
2015-12-03 10:58:03 +00:00
David Baker 547f59b1bc Oops, don't re-add these. 2015-12-03 10:00:29 +00:00
David Baker 2d2386ace5 Move upload bar CSS to new classes, and move into new, temporary place (since there is no new-style structure yet). 2015-12-02 18:19:03 +00:00
Matthew Hodgson c603c1e37f dezalgo typing notigs on chrome 2015-12-02 17:37:19 +00:00
David Baker 939733b736 Merge branch 'develop' into require-css 2015-12-02 10:26:26 +00:00
Kegan Dougal 0210670e91 Merge branch 'develop' into kegan/vector-references
Conflicts:
	src/component-index.js
2015-12-02 09:37:28 +00:00
Matthew Hodgson cba27a7488 erm, surely we need to actually run reskindex after all that? 2015-12-02 01:37:26 +00:00
Matthew Hodgson 349a88d640 stop clobbering our font colours 2015-12-01 21:44:22 +00:00
David Baker 95e71a531e Merge branch 'develop' into kegan/vector-references
Update having merged skindexing PR
2015-12-01 18:31:13 +00:00
David Baker d2c6e2195e Merge pull request #447 from vector-im/skindex-nextgen
Update skindexing for new world order
2015-12-01 18:12:47 +00:00
David Baker a63bf7cb35 Merge branch 'develop' into skindex-nextgen 2015-12-01 18:10:57 +00:00
David Baker 7ff5e42f3e Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions. 2015-12-01 18:05:43 +00:00
Matthew Hodgson 2c12b9128b highlight binged rooms more clearly 2015-12-01 16:57:49 +00:00
Kegan Dougal e21d435d84 Remove debug logging 2015-12-01 16:57:40 +00:00
Kegan Dougal a2b28b826c Add CustomServerDialog for vector 2015-12-01 16:48:51 +00:00
Kegan Dougal 8d31f72f83 Add VectorLoginHeader 2015-12-01 16:27:23 +00:00
Kegan Dougal e304a1925d Add VectorLoginFooter with vector references 2015-12-01 16:12:38 +00:00
David Baker c281fe785a Merge branch 'develop' into skindex-nextgen 2015-12-01 15:53:11 +00:00
Kegan Dougal 8083e7f118 Move vector-only components to src/components. 2015-12-01 15:45:38 +00:00
David Baker 5098c7d16f Merge branch 'develop' into skindex-nextgen 2015-12-01 15:44:45 +00:00
Kegan Dougal e07c03a7bb Merge branch 'develop' into kegan/vector-components 2015-12-01 15:39:02 +00:00
Kegsay e7f6e09def Merge pull request #448 from vector-im/kegan/controller-merging4
Phase 4 controller merging
2015-12-01 15:34:25 +00:00
Matthew Hodgson 075d2b508d fix highlights on markdown 2015-12-01 13:13:51 +00:00
Kegan Dougal e55e2bdd0d Remove unused class 2015-12-01 11:22:19 +00:00
Kegan Dougal 2a025201b1 Move remaining vector molecules to be components in vector (for now) 2015-12-01 11:19:54 +00:00
Matthew Hodgson f89dcacf07 fix bottomleftmenu layout a bit 2015-12-01 11:11:32 +00:00
Matthew Hodgson 99f47b8601 match design spacing correctly 2015-12-01 11:07:12 +00:00
Matthew Hodgson 1896ab67d1 fix room avatar offset 2015-12-01 11:05:11 +00:00
Kegan Dougal 8f5f71ec80 Move MatrixChat to react-sdk. Move all login stuff to react SDK.
Removed Modulator stuff.
2015-11-30 18:10:09 +00:00
David Baker 021056cfd1 Move copyright header 2015-11-30 18:00:54 +00:00
David Baker 6a4038daeb Add 'replaces' tag to mark that the RoomDNDView is a RoomTile 2015-11-30 17:56:55 +00:00
David Baker cadfbcbed3 Merge branch 'develop' into skindex-nextgen 2015-11-30 17:56:40 +00:00
David Baker 6f646260aa WIP of component indexing update 2015-11-30 17:31:32 +00:00
Matthew Hodgson badfdb5e3e actually, seems FF is happy with this again now 2015-11-30 17:24:38 +00:00
Matthew Hodgson 2345624d31 switch to Open Sans, juggling font-size appropriately (as Open Sans is physically larger for the same point size as Myriad Pro, irritatingly), and fix some really weird baseline CSS bugs in read receipts that were introduced. Hopefully this doesn't re-introduce the intermittent baseline offset bug for the initials on Chrome & FF 2015-11-30 17:17:09 +00:00
Kegan Dougal ddc4f30bb6 Remove RoomView and port it to react-sdk. Move Resend.js to react-sdk 2015-11-30 17:16:31 +00:00
Kegan Dougal 4e7aa78ed7 Move RoomList to react-sdk. Inject a ConferenceHandler. 2015-11-30 16:56:05 +00:00
Kegan Dougal e792ebb837 Move and merge UserSettings to react-sdk 2015-11-30 15:53:13 +00:00
Matthew Hodgson 4409f07c2e oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar 2015-11-30 15:49:27 +00:00
Kegan Dougal b89bd35cad Merge branch 'develop' into kegan/controller-merging4 2015-11-30 15:42:32 +00:00
Matthew Hodgson 7636645efc rename message components as per RL discussion this morning 2015-11-30 15:25:21 +00:00
Kegan Dougal bd906cbc69 Move and merge LogoutPrompt to react-sdk 2015-11-30 15:23:37 +00:00
Kegan Dougal cb30cbb09a Remove MemberList and put it in react-sdk 2015-11-30 15:14:04 +00:00
Kegan Dougal 2b37e5334a Remove Notifier and put it in react-sdk 2015-11-30 15:05:00 +00:00
Matthew Hodgson f947400131 Open Sans 2015-11-30 14:17:33 +00:00
Kegan Dougal fd4d7eba12 Remove ErrorDialog and QuestionDialog to react-sdk 2015-11-30 14:11:28 +00:00
Matthew Hodgson 8a00e71139 remove spurious Vector layer Avatar helper class 2015-11-30 13:56:53 +00:00
Kegan Dougal 83b3702769 Merge branch 'develop' into kegan/controller-merging4 2015-11-30 10:56:14 +00:00
Kegan Dougal 450b2d4d67 Move CreateRoom to react-sdk 2015-11-30 10:55:52 +00:00
Matthew Hodgson cd040ae0dd fix zalgo properly! remove ugly regexp hacks for detecting combining diacritics and instead set the right font ordering, as Arial combines nicely with Myriad Pro whilst Helvetica doesn't. (Myriad Pro itself has no combining diacritic characters) 2015-11-30 01:13:59 +00:00
Matthew Hodgson 9a64dc27fc improve layout for search results, fix syntax highlighting quirks in sublime, and don't crash on zero results 2015-11-29 13:32:13 +00:00
Matthew Hodgson af6bd53d38 revert 23d45d7f33 and apply a better fix which works for both chrome & FF 2015-11-29 13:18:37 +00:00
Matthew Hodgson 01f0e61d6e fix search ordering; add room labels; hide input areas if searching 2015-11-29 04:41:17 +00:00
Matthew Hodgson fc02331cd3 fix CSS for search timestamps 2015-11-29 03:20:19 +00:00
Matthew Hodgson e43edee9bb call highlighted search terms highlights, and uphold them if provided by synapse 2015-11-29 03:19:51 +00:00
Matthew Hodgson 8de94d45b1 swim like a salmon and manually update skindex for a generic TextualMessage type 2015-11-28 21:11:37 +00:00
Matthew Hodgson 9e97160c85 fix inline <code/> blocks 2015-11-27 16:20:37 +00:00
Kegan Dougal 07001ae35e Remove unused files 2015-11-27 16:11:58 +00:00
Kegan Dougal 0ef7c8d16d Use the right name 2015-11-27 15:43:16 +00:00
Kegan Dougal df86e85492 Move ContextualMenu to React SDK 2015-11-27 15:37:00 +00:00
Kegan Dougal 05c9b44b81 Move velocity stuff to react sdk 2015-11-27 15:34:26 +00:00
Kegan Dougal a5d00c73b2 Move HtmlUtils to react SDK 2015-11-27 15:01:06 +00:00
Kegan Dougal 40b974f22d Move all Event/Message Tiles to React SDK. 2015-11-27 14:35:16 +00:00
Kegan Dougal f969ccb50c Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView. 2015-11-27 11:52:29 +00:00
Kegan Dougal b007edca63 Merge and move RoomHeader/RoomSettings into React SDK 2015-11-27 10:42:25 +00:00
Kegan Dougal 3ce29622ed Move and merge MemberInfo to React SDK 2015-11-26 17:49:55 +00:00
Kegan Dougal 1a6afc2ef0 Move and merge UserSelector 2015-11-26 17:38:01 +00:00
Kegan Dougal 6dea8e7256 Move and merge MessageComposer 2015-11-26 17:31:37 +00:00
Kegan Dougal 7595071e6a Move and merge ProgressBar 2015-11-26 17:21:35 +00:00
Kegan Dougal fdad00790e Move and merge Change* components to React SDK. Update references. 2015-11-26 17:11:26 +00:00
Kegan Dougal 9ecf5bed64 Nuke old CallView controller 2015-11-26 16:48:32 +00:00
Kegan Dougal ff9608c914 Move and merge voip molecules. Inject the ConferenceHandler as a prop
This keeps the vector conf logic munge separate from react SDK.
2015-11-26 16:39:58 +00:00
Kegan Dougal 49e5f18f62 Move and merge create_room atoms to react SDK 2015-11-26 15:43:57 +00:00
Kegan Dougal c5b0ea7e9f Move VideoFeed to React SDK 2015-11-26 15:24:32 +00:00
Kegan Dougal 83eae1b64a Move and merge EditableText into React SDK 2015-11-26 15:15:45 +00:00
Kegan Dougal 35ee9c9ddd Move and merge EnableNotificationsButton to react SDK 2015-11-26 15:10:49 +00:00
Kegan Dougal 0a8f5b6223 Move ImageView 2015-11-26 14:51:30 +00:00
Kegan Dougal 3f120c7027 Nuke LogoutButton; nothing used it. 2015-11-26 14:47:11 +00:00
Kegan Dougal 343670c5c4 Move MessageTimestamp 2015-11-26 14:38:48 +00:00
Kegan Dougal f21b6203ed Merge branch 'kegan/controller-merging' into kegan/controller-merging2 2015-11-26 14:31:31 +00:00
Kegan Dougal 8517f9f2bf Missed one 2015-11-26 14:29:26 +00:00
Kegan Dougal 3c12191cb7 Move Spinner 2015-11-26 14:25:20 +00:00
Kegan Dougal ab22ca6a28 Also move the existing login components to the new structure 2015-11-26 14:11:45 +00:00
Kegan Dougal 8898b444af Point things at the right places 2015-11-26 13:48:37 +00:00
Kegan Dougal d079617ce2 Nuke MemberAvatar/RoomAvatar; moved to react SDK 2015-11-26 13:25:56 +00:00
Matthew Hodgson f9040e08ce fix conflicts 2015-11-24 16:05:58 +00:00
Matthew Hodgson fd8864d528 STOP PEOPLE SHOUTING 2015-11-22 22:35:34 +00:00
Matthew Hodgson 841c790337 naughty override to stop RoomList panel scrolling horizontally 2015-11-22 15:47:50 +00:00
Matthew Hodgson 324c3e7dcf override more GFM css 2015-11-22 15:47:10 +00:00
Matthew Hodgson 01641543da only try to syntax highlight html 2015-11-21 12:33:45 +00:00
Matthew Hodgson 9038b984ff fix css link 2015-11-21 12:15:38 +00:00
Matthew Hodgson da97185fcd highlight <code/> blocks via highlight.js 2015-11-21 12:14:56 +00:00
Matthew Hodgson b6e9c1eaab oops, forgot gfm.css 2015-11-20 20:20:30 +00:00
Matthew Hodgson 76c6d6d4d6 add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown 2015-11-20 20:12:23 +00:00
Matthew Hodgson 4c11de787e make h2 layout specific to the list 2015-11-20 20:11:06 +00:00
Matthew Hodgson 96c825b89f wrap whitespace on notices 2015-11-20 20:10:49 +00:00
Matthew Hodgson 29af81e827 Refactor HTML markup stuff into its own class, and whitelist h1 and h2 2015-11-20 18:58:13 +00:00
David Baker 3cf9f5248b Fix the ref we keep to be the react element and make velociraptor correctly track what nodes it had at the start (c.key not c.props.key) 2015-11-20 18:22:38 +00:00
Kegan Dougal 06427d663d Add support for playing gifs on mouse enter/leave 2015-11-20 16:36:58 +00:00
David Baker 2c51a5c199 Bugfix: don't cache the read avatar rect as it's relative to the viewport and it will move when we scroll! 2015-11-20 16:01:51 +00:00
Kegan Dougal 29ee7d2b13 Remove useless logging 2015-11-20 14:34:26 +00:00
Kegan Dougal 2e376b1eb9 Clear the 'screen' to load the main left/middle/right panels, then show the settings after post-reg is done 2015-11-20 14:27:39 +00:00
Kegan Dougal 37254e6243 Add PostRegistration component 2015-11-20 12:02:37 +00:00
Kegan Dougal 1edea2a62c Add a PostRegistration component; hook it up to MatrixChat. 2015-11-20 12:02:23 +00:00
Kegsay 99ccff098c Merge pull request #399 from vector-im/kegan/reg-refactor
Refactor registration
2015-11-20 10:28:26 +00:00
Kegan Dougal 3075c97bae Set busy Spinner 2015-11-20 10:27:21 +00:00
Kegan Dougal f62312fbf3 Remove old registration files. Move CaptchaForm to React SDK. 2015-11-20 10:18:04 +00:00
Matthew Hodgson 02d5154aaf more alt tags 2015-11-19 17:45:03 +00:00
Matthew Hodgson 41eaf18470 add hoverover test for edit button 2015-11-19 17:43:55 +00:00
Kegan Dougal d372018e61 Minor tweaks 2015-11-19 16:47:14 +00:00
Kegan Dougal bb6eeea0d8 Factor out div ID name to avoid tight coupling with logic class. 2015-11-19 16:08:25 +00:00
Kegan Dougal 3cf9f786aa Instantiate Signup.Register in Registration component
This has to be done rather than in MatrixChat because the render() calls
will create new instances otherwise. Pass in all the strings the logic class
requires to the Registration wire component. This isn't the "best" solution
because unloading/reloading the Registration component will lose registration
state which should be persisted. Ideally we'd DI from the top to ensure this
can't happen (as opposed to relying on module globals...)
2015-11-19 15:44:17 +00:00
Kegan Dougal 2d481a6302 Recheck registration state since we may be able to immediately do an HTTP hit if we've been given good QPs 2015-11-19 14:17:18 +00:00
Kegan Dougal e700a5a219 Add TODO on post register logic 2015-11-19 13:58:52 +00:00
Matthew Hodgson f7127ab701 Merge pull request #397 from vector-im/z_indices
Sort out dialog z index so read receipts avatars are behind the dialog background
2015-11-19 13:53:51 +00:00
Kegan Dougal eaafc11064 Factor out Captcha UI 2015-11-19 13:44:11 +00:00
Richard van der Hoff 3a003341ad Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange
Don't mark rooms as unread on m.room.member changes
2015-11-19 13:22:37 +00:00
David Baker f7fe871fee If read receipts avatar isn't on screen, animate it from the top of the screen. 2015-11-19 11:33:15 +00:00
David Baker 09b0d221df Kill the last getDOMNode() 2015-11-19 11:03:33 +00:00
David Baker ed3d3a9e23 Shift css around a bit so it more closely matches DOM order 2015-11-19 10:49:24 +00:00
David Baker eb1c6b347d Move z-index to the dialog wrapper because that's the shallowest positioned element in the DOM and therefore what creates the first stacking context 2015-11-19 10:46:49 +00:00
Kegan Dougal 5f57cd9559 Merge branch 'develop' into kegan/reg-refactor 2015-11-19 09:50:08 +00:00
David Baker 0dd85d9adf Hidden localstorage option to enable bouncy read receipts :p 2015-11-19 09:44:24 +00:00
Matthew Hodgson 23d45d7f33 fix initials behaviour on FF 2015-11-18 23:46:43 +00:00
Matthew Hodgson 69fdd485e6 general faff to make the new edit button position interact properly with dave's 'click to show all read receipts' 2015-11-18 23:41:38 +00:00
Matthew Hodgson bf3e90bb47 dirty hack to fix the uneven spacing 2015-11-18 23:04:12 +00:00
Matthew Hodgson 68a005bf1f stop edit option from colliding with scrollbar again 2015-11-18 22:24:54 +00:00
Matthew Hodgson 884d0de90b s/React/ReactDOM/ to fix another 0.14 warning 2015-11-18 22:22:19 +00:00
Matthew Hodgson 6e3afcde53 dodgy fudge to put the edit button alongside the read receipts. in future I think we should turn it into a chevron next to the timestamp 2015-11-18 22:19:21 +00:00
Matthew Hodgson d66006893a fix react 0.14 warning from getDOMNode() 2015-11-18 22:10:08 +00:00
Matthew Hodgson 8fed464cf6 and the new voice icon 2015-11-18 21:18:16 +00:00
Matthew Hodgson 08ba0457e8 add a temporary voice call button 2015-11-18 21:17:58 +00:00
Matthew Hodgson 098491e350 avoid hoverover artefacts on avatar initials 2015-11-18 20:56:43 +00:00
Matthew Hodgson 46541a3f2e logout button on splashscreen to avoid wedging users whose server has gone awol 2015-11-18 20:47:14 +00:00
Matthew Hodgson c9fe0b96b7 fix whitespace 2015-11-18 20:46:39 +00:00
Matthew Hodgson 742ae354e5 clicking anywhere in the composer pane should focus on the textarea 2015-11-18 20:15:15 +00:00
Kegan Dougal bc55959fad Load the Recaptcha script if we have a container for it
This is complex enough that the Registration component shouldn't have to
care about it, so it should probably be split into a pure UI component.
2015-11-18 17:46:17 +00:00
Kegan Dougal 5424567a66 Hook up onFormSubmit to make registration (dummy only) work again. 2015-11-18 17:15:20 +00:00
David Baker f0df3f29b9 Show all read avatars on click 2015-11-18 17:12:17 +00:00
Kegan Dougal b4c0625961 Show validation errors 2015-11-18 15:32:44 +00:00
David Baker 1099892784 Merge pull request #379 from vector-im/read_receipts
Read receipts
2015-11-18 14:53:29 +00:00
Richard van der Hoff c42d4f901b Don't mark rooms as unread on m.room.member changes
A quick and hacky fix to issue #169.
2015-11-18 11:01:47 +00:00
Kegan Dougal ed3527e243 Merge branch 'develop' into kegan/reg-refactor 2015-11-17 17:43:22 +00:00
Kegan Dougal 8e8b27c893 Add RegistrationForm UI component and new Registration wire component
Hook it up to MatrixChat instead of the existing logic (this breaks reg). WIP.
2015-11-17 17:40:31 +00:00
David Baker c63dd376d8 Fix member avatar initials (I failed at git conflict merging) 2015-11-17 17:31:03 +00:00
David Baker da55081c68 Add member name to avatars as the title since if displayed without accompanying text (as with read receipts) they can be somewhat unhelpful. May as well have them all the time I think. 2015-11-17 15:59:44 +00:00
David Baker 80c2bd0c7f Remove bouncing, set animation time to be constant (prevents temporary overalpping) and exclude ourselves. 2015-11-17 15:51:00 +00:00
Kegan Dougal 714c96283e Setting defaults from config.json got lost 2015-11-17 15:12:55 +00:00
Kegan Dougal c57fb44c71 Fix path resolution 2015-11-17 13:26:23 +00:00
Kegan Dougal 8602e0665d PR feedback from #355 2015-11-17 10:57:44 +00:00
Kegsay af1e3373ea Merge pull request #355 from vector-im/kegan/login-refactor
Refactor login page
2015-11-17 10:47:56 +00:00
Matthew Hodgson 79e39429b7 add todo 2015-11-17 02:40:19 +00:00
Matthew Hodgson 7b3eea0b58 experiment with trying to turn UserSettings into a controller-less 'wiring component' which wires together a series of smaller components (in this case, so small they're mainly <input/s> 2015-11-17 02:15:55 +00:00
Matthew Hodgson 88c5a5e074 missing copyright 2015-11-17 02:14:06 +00:00
David Baker e23b90abd5 More s/messageWrapper/messagePanel/ 2015-11-16 16:52:07 +00:00
David Baker 7f61a0252f remove logging 2015-11-16 16:45:28 +00:00
David Baker bb59e9276b Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-16 16:33:39 +00:00
David Baker d6b86598e5 Bouncy bouncy! 2015-11-16 16:13:21 +00:00
Matthew Hodgson bf91155e60 implement multiline input 2015-11-15 03:36:10 +00:00
Matthew Hodgson ef181f55d5 make modal dialogs higher in z-index 2015-11-14 00:14:41 +00:00
Matthew Hodgson 1c7e7cd111 kill stale z-index param 2015-11-14 00:13:13 +00:00
Matthew Hodgson 063e387a65 turn off the placeholder drag & drop function to get an opinion from folks 2015-11-13 23:51:48 +00:00
Matthew Hodgson ca07c8f429 Merge pull request #365 from vector-im/avatar_initial_a11y
Mark up the avatar initials so they're not read out by screen readers
2015-11-13 18:37:10 +00:00
Matthew Hodgson 2fd7196cdd also handle a11y on room avatars 2015-11-13 18:36:46 +00:00
Matthew Hodgson ff59fc84c5 don't bold the selected room just because, as it bold = new msgs 2015-11-13 18:25:10 +00:00
David Baker 9d620dfb1d Hopefully now mostly complete animations: we iterate through zero or more start states and then settle on the final place. 2015-11-13 16:43:54 +00:00
David Baker bc2c744bed more bits of read receipt animation implemented 2015-11-13 11:42:51 +00:00
David Baker 2fabf69ce3 Mark up the avatar initials so they're not read out by screen readers 2015-11-13 09:28:56 +00:00
Matthew Hodgson f8d628d336 fix composer avatar 2015-11-13 02:44:46 +00:00
Matthew Hodgson 20f84ce322 override gemini-scrollbar CSS to stop the scrollview from pushing out the container, causing FF's flexbox to adapt and keep growing infinitely 2015-11-13 02:29:59 +00:00
Matthew Hodgson 2cf0ceb260 back out previous bodges to flexbox to make geminiscrollbar work in FF 2015-11-13 02:29:18 +00:00
Matthew Hodgson 36b7deac35 clear unread message count more aggressively (and revert previous thinko) 2015-11-13 01:42:09 +00:00
Matthew Hodgson 04305460db make firefox slightly happier 2015-11-13 01:19:40 +00:00
Matthew Hodgson caa2fd97d1 sacrifice dead goats to make gemini-scrollbars work on firefox 42 and chrome 48 and later. the problem is that flexbox interacts badly with gemini-scrollbars, as gemini looks at the offsetWidth of the container in order to make the width of its enclosed scrollable view = width+scrollbarwidth. The problem is that flexbox then sees that the scrollable view has expanded, and unhelpfully flexes the container to fit it. This fixes the problem by providing more explicit widths for the containers to stop them flexing. I'm not sure I want to know why we don't also see the same problem with heights. 2015-11-13 00:46:50 +00:00
David Baker e0efb6862e Merge pull request #354 from vector-im/ignore-non-mxc
Display some sensible UI for non-mxc content URLs.
2015-11-12 17:43:20 +00:00
David Baker 1ac47f32fe Fix scrolling on browsers where gemini scrollbars don't kick in. 2015-11-12 17:18:22 +00:00
Kegan Dougal b1438355e2 Github and Sublime don't like this not being escaped. Displays fine though in React like this. 2015-11-12 15:58:12 +00:00
Kegan Dougal 021eaf5c29 Vector is the default IS in Vector 2015-11-12 15:54:07 +00:00
Kegan Dougal 726afd30bb Swap old login for new 2015-11-12 15:49:32 +00:00
Kegan Dougal 58472b8251 Move Cas/PasswordLogin to react-sdk. Use them as normal components. 2015-11-12 15:38:04 +00:00
Kegan Dougal 8826eb60cc Call through to password login 2015-11-12 15:16:29 +00:00
David Baker c8a8306165 Display some sensible UI for non-mxc content URLs. 2015-11-12 14:16:57 +00:00
Matthew Hodgson c12c716dc0 fix URLs on image 2015-11-12 13:34:00 +00:00
Kegan Dougal 05eda88ea2 Split out logic/UI for logging in
- Add 'PasswordLogin' UI component
- Add 'LoginPage' wire component which, along with Signup from react SDK,
  replaces the 'Login' page.
- Move UI code (state/props) from ServerConfig which was lobotomoised in the
  React SDK.

Unfinished.
2015-11-12 11:57:33 +00:00
Matthew Hodgson 2cae5e7a00 revert bad fix to managing history 2015-11-11 02:31:37 +01:00
Matthew Hodgson 2fff6f4d5f fix spinner layout yet more 2015-11-11 02:31:17 +01:00
Matthew Hodgson 81128ef06e hopefully fix https://github.com/vector-im/vector-web/issues/226 2015-11-11 02:07:41 +01:00
Matthew Hodgson dd3427d8d0 remove unused component 2015-11-11 02:01:11 +01:00
Matthew Hodgson 2c9273a86c avoid the initial sync from clobbering the location bar 2015-11-11 02:00:51 +01:00
Matthew Hodgson bc3ee949f5 fix warning about missing thead 2015-11-11 02:00:18 +01:00
Matthew Hodgson 5aa468f1e3 skin simpleheader 2015-11-11 01:59:56 +01:00
Matthew Hodgson c2af09fbaa fix Spinner CSS a bit 2015-11-11 00:57:31 +01:00
Matthew Hodgson bbd7124ac7 improve comment on how our dynamic height CSS works 2015-11-11 00:57:16 +01:00
Matthew Hodgson adb7915b3e suppress warning 2015-11-11 00:56:51 +01:00
Matthew Hodgson 5c92b09da1 improve spacing on login screen 2015-11-11 00:56:44 +01:00
Matthew Hodgson 2e9e03bd45 oops, refresh the login options on mount. make autofocus work too. 2015-11-11 00:39:48 +01:00
Matthew Hodgson 19b31ff30d oops, make this actually work. 2015-11-11 00:06:49 +01:00
Matthew Hodgson 801154fd8a apply jsx 2015-11-11 00:05:35 +01:00
Matthew Hodgson f628591e27 fix login page vertical scroll and centering 2015-11-10 19:19:23 +00:00
Matthew Hodgson 9cbd4ae2e4 fix raging typos 2015-11-10 19:15:14 +00:00
Matthew Hodgson 0825e0a2e2 retrieve last used HS/IS URL from local storage, and associated tweaks 2015-11-10 19:09:24 +00:00
Matthew Hodgson 68c1ddd5d2 replace react-loader with Spinner everywhere 2015-11-10 18:12:26 +00:00
David Baker 9a6624d1c7 Do read receipt avatars with absolute positioning: this should be a lot easier to animate. Also mess around with the MemberAvatar a bit so it's easier to style. 2015-11-10 17:44:59 +00:00
David Baker c9823d07fd Limit number of read avatars, lay them out as per the design & order them. 2015-11-10 13:51:11 +00:00
David Baker 450036a6ed Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-10 11:26:42 +00:00
Matthew Hodgson ef7a38e558 gemini scrollbar on the memberlist too 2015-11-10 02:26:46 +00:00
Matthew Hodgson 2ca64d9c15 add gemini-scrollbar to the main roomview 2015-11-10 02:04:21 +00:00
Matthew Hodgson cb887c699e use gemini-scrollbar to provide fake scrollbars for the room list 2015-11-10 01:40:08 +00:00
Matthew Hodgson 2ccd881665 port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components 2015-11-09 23:54:10 +00:00
Matthew Hodgson 87bb7c9b7b upgrade to react 0.14 2015-11-09 23:13:46 +00:00
Matthew Hodgson 6d9817e5e7 Merge pull request #342 from vector-im/matthew/orderable-roomlist
Implement reorderable rooms via room tagging.
2015-11-09 16:05:00 +00:00
Matthew Hodgson 23c93de82e Merge branch 'develop' into matthew/orderable-roomlist 2015-11-09 16:04:20 +00:00
Matthew Hodgson bea64082a9 put the DragDropContext on LeftPanel rather than MatrixChat to allow index.js to continue to abuse MatrixChat by directly invoking the showScreen method on it 2015-11-09 15:44:08 +00:00
Kegsay c3385d597a Merge pull request #332 from vector-im/kegan/syncing
Implement connection lost bar + resend all
2015-11-09 15:35:38 +00:00
Matthew Hodgson 752f8bdbb8 remove random bold initials 2015-11-09 14:04:43 +00:00
Matthew Hodgson 1f69760173 fix comedy scrolling parallax avatar initial bug 2015-11-09 12:41:23 +00:00
Matthew Hodgson 66add5673b de-hash rooms 2015-11-09 11:53:50 +00:00
Matthew Hodgson a3082753ef shove initials onto default room & member avatars as per the design 2015-11-09 02:12:26 +00:00
Matthew Hodgson eaa2f94327 warning png 2015-11-09 00:13:40 +00:00
Matthew Hodgson 615879ffdd skin to match CSS (spacing will need to be fixed once matthew/ordered-roomlist lands) 2015-11-09 00:13:25 +00:00
Matthew Hodgson 05d921256f re-skin the notification bar 2015-11-08 23:37:14 +00:00
Matthew Hodgson 9526deb024 add error dialogs and order search results by recents 2015-11-08 16:19:53 +00:00
Matthew Hodgson 567176ea6c put a load of margin on the bottommost sublist to increase its hit target size and avoid problems when toggling its hiddenness 2015-11-08 14:08:17 +00:00
Matthew Hodgson 5494a4ea6c s/deprioritize/demote/ 2015-11-08 13:50:36 +00:00
Matthew Hodgson 827c0da33c commented out debug 2015-11-08 13:42:45 +00:00
Matthew Hodgson f0dbb422f6 update the actual target list, which may not be the same as the one we dropped on 2015-11-08 13:13:01 +00:00
Matthew Hodgson 5c406856ed adjust column widths to match design 2015-11-08 12:59:19 +00:00
Matthew Hodgson b15def84bc fix spacing of the layout to match latest designs 2015-11-08 12:48:23 +00:00
Matthew Hodgson bbbe074d92 hide all the debugging behind if (debug) 2015-11-08 12:24:32 +00:00
Matthew Hodgson 36da1accca click on CallView preview to jump to call 2015-11-08 12:14:10 +00:00
Matthew Hodgson e289235e17 fix tooltip positioning when collapsed 2015-11-08 12:02:26 +00:00
Matthew Hodgson c60e8736c1 handle collapsed drop-targets better 2015-11-08 11:50:15 +00:00
Matthew Hodgson 69899e3718 position sublist chevron better when collapsed 2015-11-08 11:44:13 +00:00
Matthew Hodgson ed4c5b9f73 switch initial spinner to mx_Spinner 2015-11-07 20:16:44 +00:00
Matthew Hodgson 4e170a2831 fix onRoomTags signature 2015-11-07 20:16:05 +00:00
Matthew Hodgson 07200d7953 Merge branch 'develop' into matthew/orderable-roomlist 2015-11-07 17:29:18 +00:00
Matthew Hodgson 4a195dd3f0 sacrifice a small mountainside of goats to make placeholder-based work correctly 2015-11-07 02:57:56 +00:00
Matthew Hodgson fe442f5c24 fix various edge cases when dragging stuff back to the conversations list 2015-11-06 23:30:57 +01:00
Matthew Hodgson 89327bd38f precedence fail :( 2015-11-06 21:33:28 +01:00
Matthew Hodgson f102e3b3b7 collapsible sublist graphics 2015-11-06 21:25:35 +01:00
Matthew Hodgson 1150e22190 collapsible sublists 2015-11-06 21:25:20 +01:00
Matthew Hodgson 886ffbf158 switch to m.* prefixes for tags before it's too late 2015-11-06 21:00:34 +01:00
Matthew Hodgson c884c5fc33 actually manage manual ordering; support arbitrary tags; bug fixes 2015-11-06 20:54:07 +01:00
Steven Hammerton fdf79d709e Replace CAS login with token login 2015-11-06 11:22:59 +00:00
David Baker e20388388e null check 2015-11-05 17:40:37 +00:00
Kegan Dougal 3a8c263e8e Add resending bar (and resend all option)
Factor out resend logic which was in the context menu into a separate
Resend file (it shouldn't be in the skin, but it also isn't really
suitable for a controller given 2 different views invoke it..)
2015-11-05 15:59:03 +00:00
Kegan Dougal 804af341ac Add a 'connection lost' bar. 2015-11-05 14:52:44 +00:00
David Baker 4bf6992398 Don't send read receipts for our own events and null check in a few places. 2015-11-05 14:16:15 +00:00
Matthew Hodgson 8842147ec3 skin RoomDropTarget correctly 2015-11-05 11:21:45 +00:00
David Baker 942659df0d Work around the bug where some channels have no name from the js sdk which was causing vector to exception and never load. 2015-11-04 14:15:57 +00:00
Matthew Hodgson 61e55b3ca3 implement most of drag & drop. 2015-11-04 02:25:08 +00:00
Matthew Hodgson 7fe7af6026 refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags 2015-11-04 00:19:37 +00:00
Erik Johnston 7dc5f91fad Remove unused code 2015-11-03 18:59:45 +00:00
Erik Johnston 5b773b99c0 Add basic m.video view support 2015-11-03 18:56:55 +00:00
Matthew Hodgson 8b9b268ec0 make our state explicit 2015-11-03 14:35:55 +00:00
Matthew Hodgson 27cf9cf561 put invites above recents 2015-11-03 14:35:48 +00:00
Matthew Hodgson b1b2704bed avoid racey NPE on first login 2015-11-03 14:35:39 +00:00
David Baker 2a4a02f36e More on read receipts: listen for events, add keys & class / very minimal css. 2015-11-03 13:44:40 +00:00
David Baker 11c38014e5 Sort of display read avatars but without live updating 2015-11-02 18:55:28 +00:00
Kegan Dougal 6e63153d83 Add unsupported suffix on Ongoing conf notification if conf calls are unsupported in the browser 2015-11-02 18:01:20 +00:00
David Baker 159f0c9594 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-02 14:29:20 +00:00
David Baker e869814f2d Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom). 2015-11-02 14:14:47 +00:00
Kegan Dougal 38780ad492 Merge branch 'develop' into kegan/reject-invites 2015-11-02 09:47:51 +00:00
Matthew Hodgson e25d31a9fe Merge pull request #296 from vector-im/matthew/redesign
Matthew/redesign
2015-10-30 18:30:13 +00:00
Matthew Hodgson 56d00c2ec7 make onFinished required prop for modal contents 2015-10-30 18:26:22 +00:00
Matthew Hodgson 79af89fd1b fix missing decl 2015-10-30 18:26:05 +00:00
Matthew Hodgson 11e176df66 comment for the hidden collapse button 2015-10-30 18:23:08 +00:00
Matthew Hodgson 75bc878657 comment what a CR is 2015-10-30 18:22:21 +00:00
Matthew Hodgson ddbc8dffb3 switch from enums to string literals for SearchBar.Scope 2015-10-30 18:21:54 +00:00
Matthew Hodgson 6aad99a505 comment \u200b 2015-10-30 18:20:29 +00:00
Matthew Hodgson 35cebc56d3 rewrite the HTML message stuff to fix XSS and improve clarity 2015-10-30 18:19:20 +00:00
Kegan Dougal 668234be4c Add reject button and impl 2015-10-30 17:18:25 +00:00
Kegsay 626e8bab1a Merge pull request #283 from vector-im/kegan/blocking
Add feature-based browser blocking
2015-10-30 14:59:06 +00:00
Kegan Dougal 633bbd8f29 Review comments: add chrome blurb. 2015-10-30 14:58:47 +00:00
David Baker ffb9ce89c7 Merge branch 'develop' into matthew/redesign 2015-10-30 11:50:34 +00:00
Matthew Hodgson fdfa0cbd0e display search results correct; support HTML markup 2015-10-30 04:10:37 +00:00
Matthew Hodgson d315e4afcd show m.room.names 2015-10-30 02:06:34 +00:00
Matthew Hodgson 80c04048d0 cancel viewsource dialog with escape 2015-10-29 21:30:29 +00:00
Matthew Hodgson 05d96f4cfb fix filters, and stop react exploding on unrecognised event tiles 2015-10-29 18:28:30 +00:00
Matthew Hodgson 8239e57fa1 more lightbox tweaks 2015-10-29 18:28:30 +00:00
David Baker f4ca30bb38 Throw exception if EventTile is instantiated with an event type it doesn't support. 2015-10-29 18:12:42 +00:00
Kegan Dougal cc313f350c Merge branch 'develop' into kegan/blocking 2015-10-29 16:03:26 +00:00
Erik Johnston ae2768af9c Remove left/right padding from ongoing call notification, so that we don't get scrollbars in chrome 2015-10-29 15:57:31 +00:00
Kegan Dougal 511b1f409c Add objectfit and localstorage to browser features 2015-10-29 15:56:03 +00:00
David Baker f00ee95563 Merge branch 'develop' of github.com:vector-im/vector-web into read_receipts 2015-10-29 11:27:56 +00:00
Matthew Hodgson 9fd2bf0989 remove transparent background for now; specify image width & height; punt the label over to the far RHS; to get around various layout problems in Chrome 44 and Safari 8 2015-10-29 11:01:23 +00:00
Matthew Hodgson 2c05515141 simplify keys 2015-10-29 02:34:06 +00:00
Matthew Hodgson eb6fbe6a5a theoretically scope the search, but it doesn't work 2015-10-29 02:24:35 +00:00
Matthew Hodgson 2ee840922d basic implementation of search 2015-10-29 02:03:04 +00:00
Matthew Hodgson 0ade5ff640 lightbox buttons 2015-10-29 00:39:12 +00:00
Matthew Hodgson dc401075a7 try to make the edit button more reliable 2015-10-29 00:38:51 +00:00
Matthew Hodgson de1e8e9f93 implement redact and links 2015-10-29 00:38:26 +00:00
Matthew Hodgson dbac2e299e tweak spacing of label on lightbox 2015-10-28 22:49:20 +00:00
Matthew Hodgson 8eaa96b0b3 black magic fixes to the lightbox 2015-10-28 19:41:49 +00:00
Matthew Hodgson cb095ba5a0 WIP search stuff 2015-10-28 19:41:23 +00:00
Matthew Hodgson 0bfb1416c1 WIP search stuff 2015-10-28 19:39:45 +00:00
Kegan Dougal 22369729f9 Remove test feature 2015-10-28 17:42:19 +00:00
Kegan Dougal 59d8cbe742 Use Modernizr to check for browser compatibility
Add a CompatibilityPage which is shown for incompatible clients. If they
continue on regardless, proceed as if it never happened.
2015-10-28 17:39:50 +00:00
Matthew Hodgson 00a7ea994a kill random grey backgrounds for transparent avatars 2015-10-28 16:52:50 +00:00
David Baker 4118c05d15 Unused variables 2015-10-28 16:23:48 +00:00
Matthew Hodgson 7fbe38e74d fix padding feckup 2015-10-28 16:02:59 +00:00
David Baker cee37c4152 Port react-sdk 2365fe8c over to vector's fork of the roomlist controller 2015-10-28 15:17:03 +00:00
Kegsay 4175dcd102 Merge pull request #260 from vector-im/inbound-audio
Fix inbound audio
2015-10-28 11:43:52 +00:00
Kegan Dougal 35862e0c66 Explicitly make React use the same audio element.. Use a 'key' and comment why it is required. 2015-10-28 11:43:13 +00:00
Kegsay 424d1b84db Merge pull request #264 from vector-im/246-start-chat-ui-feedback
Show a spinner if creating a room on "Start chat" click
2015-10-28 11:38:52 +00:00
Matthew Hodgson a25207960c search bar 2015-10-28 01:05:28 +00:00
Matthew Hodgson 04aff6aab7 unhide labels on recents menu for Amandine 2015-10-27 23:51:40 +00:00
Matthew Hodgson cbaf134625 merge develop 2015-10-27 23:28:34 +00:00
Kegan Dougal 731ad26be4 Exit full screen programatically when the remote side hangs up 2015-10-27 17:45:47 +00:00
Kegan Dougal 9dfd0bc3bb Show a spinner if creating a room on "Start chat" click
Use a gif instead of 'orrible CSS spinners which are CPU hungry. Encapsulate
it in a very basic Spinner atom.
2015-10-27 16:56:37 +00:00
David Baker b8fc926255 Send read receipts 2015-10-27 14:38:46 +00:00
Kegan Dougal 05dba9c2d4 Fix inbound audio
This was caused by an <img> being the first thing in the <div> rather than
the <audio>. This caused a conflict because the "not in call" render was just
<div><audio /></div> and "in call" render was <div><img /> <audio /></div>

React can't tell in this case that the <audio> tags are the "same" so was
clobbering it (which meant that on inbound calls we would call play() on an
audio tag which would then immediately be clobbered by another audio tag).
2015-10-27 12:59:04 +00:00
Kegsay ed52bc37b2 Merge pull request #259 from vector-im/linkify-userids
Add linkify handlers
2015-10-27 12:25:26 +00:00
Kegan Dougal 99e8a54a27 Add linkify handlers 2015-10-27 10:46:18 +00:00
Kegan Dougal c98f7f926a Remove stuff that was merged from working space 2015-10-27 10:18:43 +00:00
Kegan Dougal c91b642a8b Merge branch 'develop' into kegan/delete-empty-files
Conflicts:
	src/skins/vector/views/molecules/EventAsTextTile.js
2015-10-27 09:19:08 +00:00
Matthew Hodgson aac00db16b WIP for new lightbox viewer 2015-10-27 01:39:19 +00:00
Matthew Hodgson 7c445cc108 fix error when joining rooms 2015-10-27 01:17:42 +00:00
Kegan Dougal 58bac0fbdc Add a tag to notifications so they can clobber. Fixes #159.
This is the same fix we applied to angular to fix this problem in SYWEB-21.
2015-10-26 16:56:44 +00:00
David Baker 9217ae8fbb Fix event listener leak 2015-10-26 10:30:12 +00:00
Matthew Hodgson 363e3f4e21 image viewing tweaks 2015-10-25 23:33:28 +00:00
Matthew Hodgson 78cff9f20d fix upload drop target 2015-10-25 23:13:03 +00:00
Matthew Hodgson 86fb313b9b fix upload drop target 2015-10-25 23:12:57 +00:00
Matthew Hodgson 8840895e70 fix progressbar 2015-10-25 23:08:21 +00:00
Matthew Hodgson ed76a46739 list power like this for now 2015-10-25 23:01:16 +00:00
Matthew Hodgson 7fdb82d87f memberinfo look & feel 2015-10-25 22:55:30 +00:00
Matthew Hodgson 729babae4f quick implementation of all new MemberInfo 2015-10-25 19:09:38 +00:00
Matthew Hodgson 8257f325c4 s/getMembersWithMemership/getMembersWithMembership/ 2015-10-25 11:51:17 +00:00
Matthew Hodgson 379fed813e actually use the config file for default HS and IS URLs... 2015-10-25 02:44:57 +00:00
Matthew Hodgson 435a9cd9e4 actually use the config file for default HS and IS URLs... 2015-10-25 02:42:41 +00:00
Matthew Hodgson 8cd6d70c0a fix voip buttons header 2015-10-25 02:36:27 +00:00
Matthew Hodgson 1d3c821672 improve spacing a bit 2015-10-25 02:26:24 +00:00
Matthew Hodgson 6d6e1366dc s/Delete/Redact/ 2015-10-25 02:13:01 +00:00
Matthew Hodgson 19d272b171 Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign 2015-10-25 02:12:35 +00:00
Matthew Hodgson 1188c4c69f Merge pull request #243 from vector-im/kegan/reg-errors-176
Fix #176 Password complexity error message
2015-10-25 02:12:21 +00:00
Matthew Hodgson 88dd135b5a Merge pull request #241 from vector-im/kegan/redact-messages
Hook up delete button on contextual menu (#56)
2015-10-25 02:12:11 +00:00
Matthew Hodgson 8ebb8ba427 fix up new message layout 2015-10-25 02:09:16 +00:00
Matthew Hodgson 9c215efcbf fix up header layout some more 2015-10-25 02:09:06 +00:00
Matthew Hodgson 6e3e0a1447 implement new roomheader 2015-10-25 01:52:28 +00:00
Matthew Hodgson d16968d528 update badge count in realtime 2015-10-25 01:16:41 +00:00
Matthew Hodgson 28c3787fb3 implement bottom-right call button 2015-10-25 01:03:22 +00:00
Matthew Hodgson d8bc362a89 fix invites 2015-10-25 00:59:33 +01:00
Matthew Hodgson 13f3548057 fix badge pos 2015-10-24 20:58:00 +01:00
Matthew Hodgson 39871e52df fix NPE 2015-10-24 20:57:05 +01:00
Matthew Hodgson 0cffd8dd84 sort out files button & NPE 2015-10-24 20:56:27 +01:00
Matthew Hodgson f4d21f883a Add on a membership badge 2015-10-24 20:47:48 +01:00
Matthew Hodgson a74cef0d64 fix stupid typing warnings 2015-10-24 20:28:42 +01:00
Matthew Hodgson e59bfe16dc sort out the membership list 2015-10-24 20:19:54 +01:00
Matthew Hodgson e718cad053 invites section 2015-10-24 02:02:33 +01:00
Matthew Hodgson b6cac2bc89 Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign 2015-10-23 18:03:49 +01:00
Matthew Hodgson a86861e9b9 make badges work again 2015-10-23 18:03:35 +01:00
Matthew Hodgson 6e2362e8a9 reskin file upload UI 2015-10-23 17:43:40 +01:00
Matthew Hodgson 300005243c only bold current room if it has unread msgs 2015-10-23 17:43:30 +01:00
David Baker 5392afdec4 Add UI for changing room avatars and update UI when room avatars change 2015-10-23 17:36:02 +01:00
David Baker e844b7aa21 UI to set Room Avatars 2015-10-23 13:47:32 +01:00
Matthew Hodgson 4019e359ca fix visibility during contextual window 2015-10-23 12:46:08 +01:00
Matthew Hodgson 185efb00fb new buttons 2015-10-23 12:41:59 +01:00
Matthew Hodgson d946b39671 stop annoying popping and fix layout of hoverover tile stuff 2015-10-23 12:41:51 +01:00
Matthew Hodgson c74dc8ef47 slightly prettier source view 2015-10-23 12:41:32 +01:00
Matthew Hodgson 7292a2ced5 kill blue lozenges 2015-10-23 12:40:28 +01:00
Matthew Hodgson baf777a418 Merge branch 'develop' into matthew/redesign 2015-10-23 11:25:20 +01:00
Matthew Hodgson 30b2156278 fix typing notifs 2015-10-23 11:19:13 +01:00
David Baker f618585bd6 Merge branch 'develop' of github.com:vector-im/vector-web into develop 2015-10-23 09:25:15 +01:00
David Baker 7c6fb36520 Let the tile contents specify whether it requires a sender profile or not. Fixes #250. 2015-10-23 09:24:25 +01:00
Matthew Hodgson 7f65ba506b WIP of new CSS 2015-10-23 02:39:56 +01:00
Matthew Hodgson 351a94b4a1 oops - wrong branch
Revert "WIP of new CSS"

This reverts commit ad4e3418ff.
2015-10-23 02:38:32 +01:00
Matthew Hodgson ad4e3418ff WIP of new CSS 2015-10-23 02:32:49 +01:00
Matthew Hodgson 82affac438 oops, typo 2015-10-22 16:33:53 +01:00
David Baker 08270b26ee Do room avatars properly. 2015-10-22 13:10:02 +01:00
David Baker 4b645bcd66 Make context menus point the right way 2015-10-21 19:02:02 +01:00
David Baker 1f3a6e408c Factor out stuff commnon to all timeline events into EventTile: makes timestamp & edit button etc appear on everything, not just messages. 2015-10-21 17:52:34 +01:00
Kegan Dougal 3779ff7691 Handle Length case. Add default case and whine loudly. 2015-10-21 17:45:53 +01:00
Kegan Dougal 3d3680e42f NPE fix when accessing event.sender 2015-10-21 16:11:47 +01:00
Kegan Dougal af67df4c4a Hook up delete button on contextual menu (#56) 2015-10-21 15:52:35 +01:00
Matthew Hodgson bf40011815 prettier file upload 2015-10-21 15:30:18 +01:00
Kegan Dougal a9b093b7f5 Remove empty controllers 2015-10-21 15:30:04 +01:00
Kegan Dougal 5e7bd1e51f Remove empty files 2015-10-21 15:17:03 +01:00
David Baker 7142ea8f1e Redundant onclick 2015-10-21 11:15:27 +01:00
Matthew Hodgson c8f6d46c8b add remoteAudioElement 2015-10-21 01:23:15 +01:00
Matthew Hodgson 5d1ad4d259 only show the zoom button on video calls 2015-10-21 01:23:15 +01:00
David Baker 006f0b00c6 Try refing the container using a functiob as it currently seems to be endinh up with no refs some of the time 2015-10-20 18:23:27 +01:00
David Baker fe0707535c binding makes no difference - put a null check in to catch the rogue exception 2015-10-20 17:46:11 +01:00
David Baker da6c5653b1 Try binding actin handler 2015-10-20 12:13:31 +01:00
Matthew Hodgson 79eda12656 doh 2015-10-20 12:10:31 +01:00
Kegan Dougal c74f7c956f Fix missing getAvatarUrlForMember 2015-10-20 11:49:21 +01:00
Matthew Hodgson 137439243a fix layout 2015-10-20 11:49:08 +01:00
Matthew Hodgson bb5895c157 move mute state into the existing voice/video buttons for now. move zoom button to that set for now 2015-10-20 11:30:54 +01:00
David Baker 34ad48a5d3 Wire up fullscreen button. Requires react-sdk with sync flag to dispatcher. 2015-10-20 11:03:32 +01:00
David Baker 078134d481 Add fullscreen button (not wired up to anything) 2015-10-20 10:48:08 +01:00
Kegan Dougal f882ecc31b 'center' the buttons just like the cog/video/voice buttons are. 2015-10-20 10:22:23 +01:00
Kegan Dougal d302f3eebb Add in voip mute video/audio skin. Needs a bit more CSS tweaks. 2015-10-20 09:55:41 +01:00
David Baker bdbfc2b6e0 Add the little edit widgets and make those the things that bring up the message context menus. Still need to add them to all event tiles and make the context menus point the right way. 2015-10-19 19:30:04 +01:00
Matthew Hodgson f256f79418 accidental regression that was causing the room list to scroll horizontally 2015-10-19 18:27:21 +01:00
Matthew Hodgson d1cda75c8b Date refinements. Show more detailed timestamps for older messages, and try to show a separator as the first message in every room 2015-10-19 18:19:26 +01:00
Matthew Hodgson 530b077a8e reimplement 1a95148dae which somehow got lost during refactoring vector-web into matrix-react-sdk and vector-web 2015-10-19 17:13:51 +01:00
David Baker 11aa6f8c37 Null check userId on member. Fixes #5. 2015-10-19 14:33:45 +01:00
David Baker e3e49daddb Make 'view source' work 2015-10-15 14:41:12 +01:00
David Baker 48924a6106 Change resend buttons to a context menu with working resending and non-working 'view source' 2015-10-15 14:14:33 +01:00
David Baker c0938f270e Unused code 2015-10-13 16:03:07 +01:00
David Baker 47c1bb35db Un-break member hovering 2015-10-13 15:17:20 +01:00
David Baker 7598be684c Merge pull request #198 from stevenhammerton/sh-cas-auth
Add support for CAS auth
2015-10-13 14:26:03 +01:00
David Baker 1dd707775a Use new js-sdk modified time to avoid unnecessary member tile updates. Also avoid double-updating since we were setting state and then forcing an update which is redundant. 2015-10-13 11:10:43 +01:00
Steven Hammerton 293ee1bbcb Fix typo in comment and remove console.log leftover from debugging 2015-10-12 17:41:56 +01:00
Steven Hammerton b5357d3298 Remove whitespace 2015-10-12 10:28:39 +01:00
Steven Hammerton c561647460 Add missing comma 2015-10-12 10:27:45 +01:00
Steven Hammerton f5039ac9af Use node querystring module to parse query string like name value pairs from fragment 2015-10-12 10:27:21 +01:00
Steven Hammerton 353af6c647 Move CasLogin logic to controller class and logic object in react-sdk 2015-10-12 10:27:16 +01:00
Matthew Hodgson 17c81c1101 icons 2015-10-11 22:51:00 +01:00
Matthew Hodgson 50ebce69b7 make file upload look slightly less crap 2015-10-11 18:42:54 +01:00
Matthew Hodgson 191d56673b fix message spacing on Safari caused by switching back to <li/>s... 2015-10-11 18:21:36 +01:00
Matthew Hodgson 5d962e1feb improve horizontal flexing of timeline 2015-10-11 18:04:01 +01:00
Matthew Hodgson 201caed773 fix rubberband bounce on OSX and iOS 2015-10-11 17:50:24 +01:00
Matthew Hodgson 9be98058b7 fix horizontal overscroll 2015-10-11 17:50:16 +01:00
Matthew Hodgson ba0ae5ba59 various cosmetic fixes based on design feedback 2015-10-11 17:28:36 +01:00
Matthew Hodgson 9a8a9a4ce4 track RHS collapse state, and implement a basic responsive design 2015-10-11 16:09:46 +01:00
Matthew Hodgson b05f3343e2 tooltipize BottomLeftMenu too for consistency 2015-10-11 15:00:43 +01:00
Matthew Hodgson ae506b5b1f fix cursor for unhide LHS button 2015-10-11 13:56:25 +01:00
Matthew Hodgson 93de2307c1 improve collapsed LHS implementation - split the tooltip into its own component; position it with javascript as overflow-y + position absolute = clipping hell; preserve the collapse state between MatrixChat re-renders; fix positioning of the 'show' button; switch to dispatcher for show/hide LHS; remove errant scrollbars 2015-10-11 13:54:38 +01:00
Matthew Hodgson 8bdb5c0745 implement right panel collapsing more correctly too 2015-10-11 02:25:26 +01:00
Matthew Hodgson 47ed8971e3 implement collapsible leftpanel at last 2015-10-11 02:09:14 +01:00
Steven Hammerton a8d51cdf58 Add support for CAS auth 2015-10-10 18:52:44 +01:00
David Baker 93f266a4fa Update to new memberlist api and hopefully sort out presence (list wasn't being re-sorted at the right time)
Hopefully fix #11
2015-10-09 17:26:28 +01:00
David Baker aed1fe9bf1 Merge branch 'master' into develop 2015-10-09 16:40:27 +01:00
David Baker 7296cbfd5b Spellig 2015-10-09 16:38:37 +01:00
David Baker 023034ce4f Check for existence of content.size. Fixes #201. 2015-10-09 16:28:51 +01:00
David Baker c68ef38399 Use ChangeDisplayNname / ChangeAvatar widgets to prompt for display name & avatar at signup.
Fixes #7.
2015-10-09 11:56:16 +01:00
David Baker ccc5f30c9b Get the vector 'ongoing conference' bar back (vector now needs a custom RoomView for this: it would be nice it it didn't) 2015-10-08 15:22:16 +01:00
David Baker c22442f6d1 Add ChangeDisplayName component and use it 2015-10-07 18:44:07 +01:00
David Baker fca65a8cdb Show invited members separately.
May not be the final look.

Fixes #6
2015-10-06 15:09:42 +01:00
David Baker 807e947146 Add spinner for inviting. Fixes #13. 2015-10-06 14:12:45 +01:00
David Baker 85636ccdad Show end call button in states other than connected and ringback: it's perfectly valid to want to end the call at other times.
Fixes #9
2015-10-05 16:29:07 +01:00
David Baker 490e56bfbb Improved url / hash change handling 2015-10-05 15:32:34 +01:00
David Baker df39c3a281 Changes from PR feedback 2015-10-02 16:44:35 +01:00
David Baker 2247d951d6 Add config file for default hs/is urls 2015-10-02 11:48:52 +01:00
David Baker c687f32f39 Port over custom vector roomlist controller with mini callview 2015-10-01 10:46:42 +01:00
David Baker 3845a989f6 Get conf calling working, apart from the end call button showing in the right room. 2015-09-30 18:22:15 +01:00
David Baker 94a6f856d1 Use the new interface for providing conf call functionality. Doesn't shoe it in the right room yet. 2015-09-30 16:52:45 +01:00
David Baker fd6e7663cb Fix notifications 2015-09-28 17:52:34 +01:00
David Baker 7d540572fd Update for new default avatar API. 2015-09-28 17:06:39 +01:00
David Baker c3f32b74e4 Some missed '/' / '.' replacemement 2015-09-28 14:48:07 +01:00
David Baker 588dbf5693 reskindex 2015-09-28 11:34:11 +01:00
David Baker 91c0df4450 Merge branch 'master' into reactsdk-unfork 2015-09-28 11:32:40 +01:00
David Baker f778f6adf9 Remove unused stuff 2015-09-25 15:33:38 +01:00
David Baker 409697b35b Oops, these were just at the wrong scope 2015-09-25 11:46:06 +01:00
David Baker f020f4397c Switch to webpack
Webapck actually supports loading input source maps and generally seems a lot
more solid then browserify (even if their website has an annoying animated
logo).
2015-09-25 11:43:28 +01:00
Matthew Hodgson 5fe41e28d7 make presence work better on the memberlist. kludges around lack of syjs-28. is about as good as angular was now. 2015-09-24 01:58:21 +02:00
David Baker b11abae8e8 More fixing up of paths, requires etc 2015-09-22 19:09:23 +01:00
David Baker 7e72ee891a More fixing up of vector skin 2015-09-22 18:49:04 +01:00
David Baker 40594fc5fa Fix up controller requires 2015-09-22 18:17:19 +01:00
David Baker 148dbc23ed Rename base skin to vector 2015-09-22 18:05:55 +01:00
David Baker 682392d02a Move skins dir to src 2015-09-22 18:05:31 +01:00
David Baker 09b81f46b0 Remove controllers that all come from react-sdk 2015-09-22 17:20:22 +01:00
David Baker 616b4fe0f1 Merge pull request #175 from vector-im/matthew/userlist
Reskin the userlist as per the design
2015-09-22 15:27:21 +01:00
Matthew Hodgson ef3603cd1a oops, rogue debugging stmt 2015-09-22 01:25:58 +02:00
Matthew Hodgson 61c94d63e7 make the new userlist UI actually work 2015-09-22 01:16:45 +02:00
Matthew Hodgson 260e22186b WIP at turning MemberInfo into a ContextualMenu 2015-09-21 19:23:04 +02:00
Matthew Hodgson 048260bb1b WIP at turning MemberInfo into a ContextualMenu 2015-09-21 19:22:29 +02:00
David Baker 81db1b2360 Merge pull request #160 from vector-im/conferencing
Add conferencing support
2015-09-18 10:03:02 +01:00
Kegan Dougal 240d5502fe Add a FIXME explaining the situation around alternative FS ASes 2015-09-17 11:47:42 +01:00
Kegan Dougal 7a50166dc6 Move the 'thumbnail' video to the top-left of the screen
This was originally laid out at the MatrixChat level which could then be
CSSified, but Matthew suggests this looks a lot better being at the
RoomList level above recents. Move the rendering logic to RoomList.
2015-09-17 11:37:56 +01:00
Matthew Hodgson 01d3f2f119 implement /part, /j, and error rather than pass-through unrecognised commands 2015-09-16 01:09:32 +01:00
Kegan Dougal f89fbffe89 Auto-place a video call if the conf notification is clicked 2015-09-15 15:55:02 +01:00
Kegan Dougal 2b65b4c2dc Hide the local video when in a conf call 2015-09-15 15:49:33 +01:00
Kegan Dougal 370310bf82 Use better variable names 2015-09-15 15:02:02 +01:00
Kegan Dougal f384aa7d9e Add notification to group chat rooms with ongoing conf calls
This notification disappears when in the conf call / when the call is over.
CSS stolen from the desktop notification bar.
2015-09-15 14:18:17 +01:00
Kegan Dougal 353269370f Wire up the "room" CallView for conferencing
This also separates out concerns better - UI elements just need to poke
getCallForRoom rather than care if the thing they are displaying is a
true 1:1 for this room ID or actually a conf room.
2015-09-15 13:19:07 +01:00
Kegan Dougal 7866979c79 Show/hide the Hangup button depending on the state of the conf call. 2015-09-15 13:04:09 +01:00
Kegan Dougal 5e3698de64 Actually enforce 1 call semantics. 2015-09-15 11:43:51 +01:00
Kegan Dougal 59986d8b72 Pass the call around different CallViews to keep media flowing
Previously, the CallView was attached to the RoomView, so you would get
a new CallView each time you changed the room and the one you changed
from would be destroyed. This would destroy media capture/playback as
the element was no longer in the DOM.

This is now fixed by having a "global" CallView which is attached at
the MatrixChat "page" level in the DOM hierarchy. This CallView isn't
scoped to a particular room; it will render any "active" call it can
find that *isn't the current room being displayed*. This has the side
effect of enforcing 1 call per app semantics as only the first active
call found is returned.

This fixes https://github.com/vector-im/vector-web/issues/31
This is unfinished (CSS for the global call view isn't done)
2015-09-15 11:05:53 +01:00
Kegan Dougal fc892b3580 Hide 1:1 conference rooms 2015-09-11 16:55:48 +01:00
Kegan Dougal e3b02a295c Check conf user/rooms a bit more efficiently 2015-09-11 16:14:30 +01:00
Kegan Dougal 77401e215e First working outbound conference calling
This has a number of failings currently: 1) It needs to hide the 1:1 conference
room, 2) Swapping tabs on the outbound call mutes audio (this just seems to be
a vector bug since I can repro this on a normal 1:1 voip call), 3) Needs a big
plinth/etc to say the conf call is in progress.
2015-09-11 15:49:47 +01:00
Matthew Hodgson 737fc74756 Merge branch 'matthew/login' into matthew/userlist 2015-09-01 02:13:52 +03:00
Matthew Hodgson ab068cc372 improve login, including checkbox fix for advanced options, rechecking when you change server, avoiding flickering when you change HS, better error/spinner layout, and trimming whitespace 2015-08-31 19:30:24 +01:00
Matthew Hodgson e3798e1b85 WIP fixing up the member list - just needs CSS and testing 2015-08-15 03:06:21 +01:00
Matthew Hodgson cb7f1aa916 ctrl-alt-num to change rooms 2015-08-14 16:30:19 +01:00
Matthew Hodgson 316a28838f let's wrap when you go off the beginning 2015-08-14 15:51:57 +01:00
David Baker 960a38fe43 Don't try loading -ve room indices 2015-08-14 15:44:21 +01:00
David Baker 87feb6b076 Revert accidental commit 2015-08-14 15:37:41 +01:00
David Baker c5e33352b0 You can't just use React classes as normal static classes :( 2015-08-14 15:25:05 +01:00
Matthew Hodgson 9ed5ca3ccb implement a pretty droptarget when uploading files 2015-08-14 13:20:39 +01:00
David Baker 7bdf612ad5 argh 2 2015-08-14 11:25:54 +01:00
David Baker 6d390ebd2f Argh 2015-08-14 11:24:41 +01:00
David Baker e5099ce3b7 Don't clobber the ready state if the sdk isn't ready yet 2015-08-14 10:31:09 +01:00
David Baker a3879b507a Fix default avatars 2015-08-14 10:30:47 +01:00
Matthew Hodgson 001d1c50ef factor out MRoomMemberTile, MCallInviteTile, MCallAnswerTile and MCallHangupTile to just use EventAsTextTile and thus reduce duplication enormously 2015-08-14 00:28:37 +01:00
David Baker fec266f1c0 Move avatars into their own components so I can add functionality like custom default avatars and onerror sources without having to add it in 13 separate places. Add the aforementioned features. 2015-08-13 19:30:02 +01:00
David Baker b580fba7db Rooms with notifs turned off should still go bold. 2015-08-13 16:43:59 +01:00
David Baker 8bb836ad49 Assuming this was meant to be temporary 2015-08-12 18:26:43 +01:00
David Baker eb36a2b242 If we were loaded with a room alias, don't lose that alias when we try to load the corresponding room. 2015-08-12 17:06:45 +01:00
Matthew Hodgson 18be8530fe put key='' on the right element 2015-08-12 01:45:04 +01:00
Matthew Hodgson 566c0437c0 provide a way to hide the notification nag toolbar 2015-08-12 00:42:04 +01:00
David Baker a20b4d2d2c If we have a current room on load, we should display it! 2015-08-11 17:24:12 +01:00
David Baker be5aaeaad7 Don't try to fill space if we don't have a message wrapper 2015-08-11 17:20:31 +01:00
David Baker 18c56a171e Focus composer on alt-up/down 2015-08-11 14:43:52 +01:00
David Baker a45785fe1a Fix blank page on login 2015-08-10 17:12:31 +01:00
David Baker 19d350e876 Merge branch 'email_login' 2015-08-10 16:25:04 +01:00
David Baker 7a1796870a Handle old server that don't support login using email address 2015-08-10 16:22:33 +01:00
David Baker 96cedc237e Actually change to vector IS 2015-08-10 15:50:26 +01:00
David Baker 6ab993f1a9 Change default IS to vector 2015-08-10 15:27:36 +01:00
David Baker efcc2061b8 Hopefully port over ndarilek's accessibility changes to Vector (albeit with list elements contained within RoomView) 2015-08-10 15:17:15 +01:00
David Baker 711bf583ab missed a file 2015-08-06 16:04:22 +01:00
David Baker 2771907573 Support room aliases in url bar and show them for rooms that have them 2015-08-06 14:58:52 +01:00
David Baker cdbbf4bfef Don't re-set savedParams, we did it earlier 2015-08-04 18:04:56 +01:00
David Baker 5cffee7ce6 stop matrix client on logout please 2015-08-04 16:45:39 +01:00
David Baker 9d8d4e4896 Support email login 2015-08-04 16:30:41 +01:00
David Baker 259d9dc3a2 Handle THREEPID_IN_USE error 2015-08-04 14:49:01 +01:00
David Baker 674f90f27f If no Notifications, we essentially don't have permission (should fix on iOS) 2015-07-23 19:33:37 -07:00
David Baker 6f62211465 Return to root URL on log out. 2015-07-22 21:40:13 -07:00
David Baker c2e92045d0 Don't announce that we've entered the null room on login if there are no rooms. 2015-07-22 21:37:46 -07:00
David Baker 9847383ba6 Commit imageview files 2015-07-22 20:37:08 -07:00
David Baker 772053713a lightbox image viewing (that needs CSS) 2015-07-22 16:04:29 -07:00
Erik Johnston 51d2677525 Prompt if a user really wants to leave the room 2015-07-22 17:53:18 +01:00
Kegan Dougal fbb6775523 Implement unread message status when scrolled up. 2015-07-22 14:49:32 +01:00
Kegan Dougal 8b0db49b8b Bugfix: Accepting an invite no longer results in a stale membership list. 2015-07-22 14:10:06 +01:00
Erik Johnston 431c93fc29 Fix invites so they display in room list 2015-07-22 13:57:48 +01:00
Erik Johnston 0016c2ad83 Also change URL when going to next/prev room 2015-07-22 13:47:08 +01:00
Erik Johnston ed1cb44deb Show Loader while leaving 2015-07-22 13:39:36 +01:00
Erik Johnston b9fd174f72 Merge branch 'master' of github.com:vector-im/vector-web into leave_room_button 2015-07-22 13:30:34 +01:00
Kegan Dougal d4147c1315 Don't allow blank messages to be sent. 2015-07-22 13:15:12 +01:00
Kegan Dougal 7e42072952 Scroll to bottom when there are live call updates.
This keeps the latest messages visible when you place or receive a call.
2015-07-22 13:04:18 +01:00
Erik Johnston 6bfc566d9a Switch to another room when we succesfully leave a room 2015-07-22 11:41:32 +01:00
Erik Johnston 5835ea0a97 Only display rooms you're currently joined to in recents 2015-07-22 11:33:46 +01:00
Kegan Dougal e80cf8a133 Bugfix: Scroll to the bottom more reliably on new incoming messages.
Added some padding to the calculation which means the scrollbar can
be scrolled up a bit and still get bumped down. Scroll a lot though
and it will not keep bumping you down (parity with Angular)
2015-07-22 11:12:45 +01:00
Mark Haines e1aca588b5 Clear local storage *before* creating the client, Otherwise we will blow away anything that the client tried to persist after it was created 2015-07-22 09:43:40 +01:00
David Baker 2eba2280d8 Don't barf if we we can't get a given room ID 2015-07-21 20:34:55 -07:00
Matthew Hodgson a2f5933417 make aux panel behave vaguely intelligently 2015-07-21 15:43:54 -07:00
David Baker 9af09de7d4 Dispatch notifier_enabled when permission given if we don't already have it. 2015-07-21 15:35:30 -07:00
Matthew Hodgson aaa96f1ac1 vicious rewrite of the CSS to support the notifications toolbar, removing all height: 100%'s and letting the flexbox stuff calculate auto-height instead. may have slowed down the rendering, especially when the toolbar is visible 2015-07-21 15:03:05 -07:00
David Baker e03809b224 Merge pull request #16 from matrix-org/markjh/end-to-end
Add basic support for end-to-end crypto using olm.
2015-07-21 13:21:43 -07:00
David Baker 6fc910a259 Don't try to set page_type if not logged in 2015-07-21 11:12:59 -07:00
David Baker 959c0f0669 Order room members by lastActiveAgo 2015-07-21 11:05:54 -07:00
Kegan Dougal 2160440ff1 Add and impl resend button. Update UI when failing to send messages. 2015-07-21 18:05:22 +01:00
Mark Haines f036a10a7d Add missing src/encryption.js file 2015-07-21 17:00:57 +01:00
Mark Haines 6bb6eafdc0 Hook up slash commands to enable and disable encryption for a room so that we can experiment with encryption while we wait for the rest of the UI to exist 2015-07-21 16:46:17 +01:00
Kegan Dougal e0496305aa Log when presence is set. 2015-07-21 16:23:21 +01:00
Kegan Dougal 2698405e2f Add MatrixToolbar CSS. Make the toolbar part of RoomView and don't cover the UI (shift it instead) 2015-07-21 16:17:50 +01:00
Kegan Dougal c1de5e9e95 Factor out logic from EnableNotificationsButton(!) and reuse MatrixToolbar.
Added notification logic to Notifier; dispatch notifier_enabled when toggled
so the toolbar can be shown/hidden and the button text can be kept in sync.
Add MatrixToolbar back into MatrixChat for notification nagging.
2015-07-21 16:17:50 +01:00
Erik Johnston c5d84562ba Move logic from view to controller 2015-07-21 15:24:10 +01:00
Erik Johnston 89f6459915 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing 2015-07-21 14:14:48 +01:00
Erik Johnston b8e1927e82 Use getDefaultProps instead of setting porps 2015-07-21 14:14:15 +01:00
Erik Johnston d81260c92a Use getDefaultProps instead of setting porps 2015-07-21 14:13:59 +01:00
Kegan Dougal 2454a71b38 Implement create/remove mod button. 2015-07-21 13:24:59 +01:00
Mark Haines 726ee7b50b Hook up the encrypt button when creating rooms 2015-07-21 12:03:15 +01:00
Kegan Dougal 13f04f77dc Tidy up power level logic. Add 'Moderator' label to members. 2015-07-21 11:43:18 +01:00
Kegan Dougal 2e2cecdd4f Implement kick/ban/[un]mute buttons on member list dialogs. 2015-07-21 11:26:02 +01:00
Erik Johnston 2bec7ec981 Add spinner while uploading state 2015-07-21 11:02:36 +01:00
Erik Johnston 0b1b6057d6 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing 2015-07-21 10:39:46 +01:00
Matthew Hodgson 12c824323d rename DirectoryMenu as BottomLeftMenu and implement a really really really basic RoomDirectory 2015-07-20 20:11:33 -07:00
Matthew Hodgson fe71f69f0a rename EditableText's placeHolder parameter to be 'label' to avoid colliding with the HTML5 placeholder parameter 2015-07-20 20:11:33 -07:00
David Baker e0673eee29 Don't go & load the first room if we've already been told to load a different one. 2015-07-20 14:09:41 -07:00
David Baker 36b1280f0c Bookmarkable room URLs 2015-07-20 12:20:35 -07:00
Erik Johnston 813cf0481e Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing 2015-07-20 18:18:04 +01:00
David Baker 0a3cddbd89 Merge pull request #13 from matrix-org/markjh/vector-cleanup-client-peg
Markjh/vector cleanup client peg
2015-07-20 10:12:16 -07:00
David Baker e9b2cd1364 Allow input history to go forwards again to the empty field 2015-07-20 10:05:53 -07:00
Kegan Dougal 5d59a5b297 Change opacity of member list entries when their presence changes.
This is done by attaching a single room listener at the member list level and
then forceUpdate()ing the individual tiles as presence changes come in from
the JS SDK. This is more efficient than having hundreds of listeners attached
directly to the JS SDK (if we were to add a listener per tile).
2015-07-20 17:42:19 +01:00
Erik Johnston 3a7ebf73eb Wire up changing of power levels 2015-07-20 17:31:40 +01:00
Kegan Dougal 9d110d58e5 Manage presence of the client (same semantics as angular) 2015-07-20 17:14:29 +01:00
Kegan Dougal bcab2f231a Add error dialogs for invites and call timeouts. 2015-07-20 16:40:00 +01:00
Erik Johnston 1b6ca2b0ee Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing 2015-07-20 16:31:02 +01:00
Erik Johnston eae0972820 Add files. Add power levels to room settings 2015-07-20 16:28:23 +01:00
Kegan Dougal 6fe842e130 Add ErrorDialog class. Use it for VoIP/command errors. 2015-07-20 16:26:53 +01:00
Erik Johnston 04f17c963c Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing 2015-07-20 16:03:35 +01:00
Erik Johnston 0039ccf203 Add ability to edit room settings 2015-07-20 15:07:51 +01:00
Kegan Dougal f2bd802bdc Wire up invite button on the member list. 2015-07-20 15:07:19 +01:00
Mark Haines 28022534f7 Fix the client-peg clean up to match the changes vector has made to the sdk 2015-07-20 14:28:02 +01:00
Mark Haines d8494ff89b Fix syntax 2015-07-20 14:01:52 +01:00
Mark Haines 715db89204 Move all the calls to createClient inside the MatrixClientPeg 2015-07-20 14:01:52 +01:00
Kegan Dougal 19ee75577e Actually access state_key when getting target invite names... 2015-07-20 13:30:01 +01:00
Kegan Dougal 0baa2141fc Wire up Start Chat button. 2015-07-20 13:22:56 +01:00
Kegan Dougal 08c16e0d7a Hook up presence/last active up (live updating; no ticker for last active). 2015-07-20 11:37:48 +01:00
David Baker 29b4f59982 Basically working upload progress bar. 2015-07-19 22:55:17 -07:00
David Baker b82d932a51 Logout button 2015-07-19 22:55:17 -07:00
Matthew Hodgson 2121ddc295 add a MemberInfo list overlay as a mini user-profile page 2015-07-20 01:51:58 +01:00
David Baker caa7f813eb Bugfix sending of typing events 2015-07-19 17:29:41 +01:00
David Baker e8b944c0e1 Sooner or later I'll get used to this. 2015-07-19 16:43:45 +01:00
David Baker e1f3c80f19 Display who's typing 2015-07-19 16:38:56 +01:00
David Baker 73c8eb7738 Send typing notifs 2015-07-19 15:29:16 +01:00
David Baker 85748c09cf Linkify emote tiles 2015-07-19 10:43:16 +01:00
Matthew Hodgson 1e1f7492d8 basic skin of incomingCallBox 2015-07-19 01:58:04 +01:00
Matthew Hodgson 919e1cf84f unbreak voice calls 2015-07-19 00:36:23 +01:00
Matthew Hodgson c83ff1c623 hide events with no text equiv 2015-07-18 19:06:36 +01:00
Matthew Hodgson 5a12a4a1a3 don't break the layout with unrecognised join events 2015-07-18 02:17:10 +01:00
Matthew Hodgson 10cdf46c2c s/that/self/g 2015-07-17 21:59:48 +01:00
Matthew Hodgson 348aa3e5e1 fix up memberlist a bit more 2015-07-17 21:29:41 +01:00
David Baker 5f367f7c75 missing event listener remove 2015-07-17 19:01:11 +01:00
David Baker 5c7bef3107 Add topic changes to timeline by adding a tile that just uses TextForEvent 2015-07-17 18:49:48 +01:00
Matthew Hodgson ddb426095e /topic 2015-07-17 18:14:05 +01:00
David Baker 214ef4b4ce Tidy up profile picture setting & fix notification bug 2015-07-17 17:13:51 +01:00
Kegan Dougal 812eb66ed5 Play ringback/busy/callend audio at the right times. 2015-07-17 17:05:11 +01:00
Kegan Dougal 827e777079 Implement ringing audio. Add other audio tags. 2015-07-17 16:42:26 +01:00
David Baker ff567faeaa Profile picture setting and notifdications thereof. 2015-07-17 16:41:46 +01:00
David Baker a730804943 there is no content.target - it's state_key. Also, warn if no target 2015-07-17 15:55:36 +01:00
David Baker 1df8e65cdf argh javascript 2015-07-17 14:42:36 +01:00
David Baker 383a958abe Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into vector 2015-07-17 14:36:15 +01:00
David Baker 9a79539978 missed removeventlistener 2015-07-17 14:35:33 +01:00
Kegan Dougal 5c6b8a4cf9 Merge branch 'irc-style-commands' into vector 2015-07-17 14:26:58 +01:00
Kegan Dougal b6f9ca0f95 When accepting calls, go to the right room. Relink video elements when CallView loads. 2015-07-17 14:25:51 +01:00
David Baker 6a76d8ace8 Update room header when room name changes 2015-07-17 13:48:24 +01:00
David Baker b53640f892 Just return nothing for unknown events 2015-07-17 12:23:24 +01:00
David Baker 00c45e48a9 Merge branch 'vector' into irc-style-commands 2015-07-17 12:03:10 +01:00
David Baker 37108ac56c Make notifications sensible again and have information once and only once. 2015-07-17 11:57:26 +01:00
David Baker 1b03aa8119 Display nick changes and factor out getting text for events into a common place. 2015-07-17 11:57:26 +01:00
Kegan Dougal 2bb2295499 Implement /join 2015-07-17 11:48:40 +01:00
Kegan Dougal 001372ec39 Fix nick changes 2015-07-17 11:13:05 +01:00
Kegan Dougal c8caf34777 Merge branch 'vector' into irc-style-commands 2015-07-17 09:17:58 +01:00
Matthew Hodgson 1a95148dae basic date separator support 2015-07-17 00:12:53 +01:00
David Baker 0f39ec580f Slightly improve error messages 2015-07-16 22:06:00 +01:00
David Baker d08c47a328 Fix npe 2015-07-16 21:45:59 +01:00
David Baker cfbef0177e Fix custom server or registration & do some of new login UI 2015-07-16 19:30:27 +01:00
Kegan Dougal 1126769686 Merge branch 'vector' into irc-style-commands 2015-07-16 18:08:30 +01:00
Erik Johnston df999fb2f8 Remove deleted atoms 2015-07-16 18:03:29 +01:00
Kegan Dougal 91943d8a45 Merge branch 'vector' into irc-style-commands 2015-07-16 17:41:30 +01:00
Kegan Dougal 9aa66c1d8b Add SlashCommands to functionally process /commands. 2015-07-16 17:41:12 +01:00
David Baker 03733e6a0f Merge pull request #9 from matrix-org/create_room
Wire in create room.
2015-07-16 17:37:48 +01:00
Erik Johnston 98160c3947 Add ability to remove people from invite list 2015-07-16 17:30:10 +01:00
Erik Johnston 68d60aadd1 Make Presets stateless 2015-07-16 17:24:33 +01:00
Erik Johnston aa1b763518 Make CreateRoom remember what the values of its fields were. Remove some fairly pointless atoms 2015-07-16 17:20:03 +01:00
David Baker 75f8363be0 Merge branch 'master' into vector 2015-07-16 16:53:27 +01:00
David Baker e6260987cc some s/then/done/ 2015-07-16 16:53:08 +01:00
David Baker 3a6423dd0a Merge branch 'master' into vector 2015-07-16 16:52:19 +01:00
David Baker 9b6060a363 Decouple login view & controller 2015-07-16 16:49:40 +01:00
Kegan Dougal 6b81022e28 Move position of incoming call buttons. 2015-07-16 16:32:21 +01:00
Erik Johnston ebedf0b907 Add comment about RoomAlias magic 2015-07-16 16:17:29 +01:00
Erik Johnston 95968bf619 Make server_name magix in RoomAlias optional 2015-07-16 16:14:55 +01:00
David Baker 50edc619af Merge branch 'master' into vector 2015-07-16 16:13:24 +01:00
David Baker 64042c9de8 Handle localstorage exceptions. 2015-07-16 16:12:54 +01:00
David Baker ebe6072225 Make this a done so it doesn't swallow exceptions 2015-07-16 16:04:31 +01:00
Erik Johnston cd26d1323f Wire together checkboxes and presets and use new /createRoom api 2015-07-16 15:55:46 +01:00
David Baker 155dd74a6f Merge pull request #8 from matrix-org/message-history-arrow-keys
Implement sent message history (up/down keys).
2015-07-16 15:41:57 +01:00
Kegan Dougal b043889169 Implement sent message history (up/down keys).
This includes preserving and restoring partially entered text per room. This
is mostly ported straight from Angular.
2015-07-16 15:22:46 +01:00
David Baker dac94d2293 mplement custom registration screen 2015-07-16 15:16:26 +01:00
David Baker 41bab56133 Merge pull request #7 from matrix-org/nick-completion
Implement nick completion (tab-complete).
2015-07-16 14:52:46 +01:00
Kegan Dougal 42c9766203 s/did/will/ 2015-07-16 14:39:15 +01:00
Kegan Dougal 6fbb7d7da4 Implement nick completion (tab-complete).
Including SHIFT+TAB to go backwards and the 'blink' css (which may need to be
factored out of the view). Mostly ported from Angular.
2015-07-16 14:25:57 +01:00
David Baker cf38b8a5bb Merge branch 'master' into vector 2015-07-16 14:19:50 +01:00
David Baker a6df6ca29b Don't forget form values on error 2015-07-16 14:19:13 +01:00
David Baker 7aa4d50560 Handle registration errors. 2015-07-16 14:08:52 +01:00
Erik Johnston c708976635 Wire up CreateRoom to UI. 2015-07-16 13:49:34 +01:00
Kegan Dougal 0a3a3dac1a Display call logs in the UI.
Display placed/incoming calls, answers and hangups.
2015-07-16 13:30:14 +01:00
Kegan Dougal c4379e4827 Remove 'status' from payload; unused. 2015-07-16 12:57:59 +01:00
David Baker 41f659db4c Merge branch 'master' into vector 2015-07-16 12:44:42 +01:00
David Baker df790c1b54 Refactor view/controller logic between files, fix syntax & silly bugs. 2015-07-16 12:44:04 +01:00
David Baker a6f857e9d8 Merge pull request #6 from matrix-org/voip
VoIP addition
2015-07-16 12:31:36 +01:00
Kegan Dougal 5f3721f471 Tidying up 2015-07-16 11:54:53 +01:00
Kegan Dougal c056bdf104 Only allow calls to be placed if there are 2 joined members. 2015-07-16 11:34:39 +01:00
Kegan Dougal 50f9d34211 Only display video elements in video calls. 2015-07-16 11:30:34 +01:00
Kegan Dougal eedd437ca7 Minimal CSS bodge so the video actually dies when the call ends. 2015-07-16 11:21:43 +01:00
Kegan Dougal 7ffd97b5dc Implement call FSM. All works. 2015-07-16 11:05:09 +01:00
Erik Johnston f17a9b14c2 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings 2015-07-16 10:46:40 +01:00
Erik Johnston ca593b8544 Remove commented out code 2015-07-16 10:39:58 +01:00
Erik Johnston 5d99abf18c Correctly pull in client version from package.json 2015-07-16 10:38:00 +01:00
David Baker 139b92fcd6 Merge branch 'master' into vector 2015-07-16 10:33:53 +01:00
Kegan Dougal ecd1f09095 Glue in video elements. 2015-07-16 10:26:41 +01:00
Erik Johnston 02045858f7 Wire up change password 2015-07-16 10:23:31 +01:00
David Baker e2757b3587 Merge pull request #4 from matrix-org/registration
Registration
2015-07-16 09:58:53 +01:00
David Baker 931a4f29c8 Argh, accidentally committed again 2015-07-16 09:57:14 +01:00
Erik Johnston bc93aeb50e Flesh out the user_settings page 2015-07-16 09:37:58 +01:00
Erik Johnston 1b4358624f Add a basic modal dialog implementation 2015-07-16 09:37:14 +01:00
David Baker 77114e0081 Improve registration so the container page can pick what URL it's going to route through to registration. 2015-07-15 20:33:12 +01:00
David Baker 23d9cee299 didn't mean to commit that 2015-07-15 19:30:10 +01:00
David Baker 4756427e61 First cut working regisatration 2015-07-15 19:25:36 +01:00
Kegan Dougal 4f132c418f Fix a couple state bugs. 2015-07-15 17:48:26 +01:00
Kegan Dougal 14a4da54f8 Wire up hangup/answer buttons. 2015-07-15 17:36:47 +01:00
Kegan Dougal 37c9c8fbb4 Add CallHandler singleton and add CallView.
CallView is the container for either VideoViews or WaveformViews. All UI
elements listen for 'call_state' payloads and then call
CallHandler.getCall(roomId) to extract the current MatrixCall for that room.
We can't do this via stateful dispatches because dispatching does not preserve
ordering empirically (probably due to setTimeout).
2015-07-15 16:52:23 +01:00
Kegan Dougal 6316f1b195 Add call handling logic. Outbound voice calls work! 2015-07-15 15:36:45 +01:00
Erik Johnston 2b81f46030 Add placeHolder prop for EditableText 2015-07-15 15:04:39 +01:00
Erik Johnston dfd54f3b95 Basic structure of user settings 2015-07-15 15:04:24 +01:00
Kegan Dougal 7e30c0f47b Add CallHandler to handle call logic and make VideoViews/WaveformViews. 2015-07-15 14:57:52 +01:00
Kegan Dougal 28cebab9a3 Add voip subdirectory. 2015-07-15 14:35:04 +01:00
Kegan Dougal 7cbb43fddb Merge branch 'vector' into voip
Conflicts:
	src/ComponentBroker.js
2015-07-15 14:21:58 +01:00
Kegan Dougal 78bea916e1 Dispatch events when calls are made/received. 2015-07-15 14:06:44 +01:00
Erik Johnston 844a883ad8 Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector 2015-07-15 13:59:24 +01:00
Erik Johnston 5cd92229eb Add an editable text atom 2015-07-15 13:55:43 +01:00
Kegan Dougal f94a061fda Add onClick listeners. Add getters for refs. 2015-07-15 13:34:11 +01:00
Kegan Dougal aba103b8e0 Add VideoFeed atom and VideoView organism. 2015-07-15 13:09:15 +01:00
Erik Johnston 2fc08aeb12 Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector 2015-07-15 10:36:47 +01:00
Matthew Hodgson 9b384e52b5 implement latest skin 2015-07-15 04:16:38 +01:00
David Baker 03d048c06f Get as far as requesting a token 2015-07-14 19:39:18 +01:00
David Baker aacc31b2ce Registration works with recaptcha 2015-07-14 18:46:15 +01:00
Erik Johnston bb06b752b4 Document CreateRoom phases 2015-07-14 17:40:49 +01:00
Erik Johnston c4764af9a2 Add phases to CreateRoom organism 2015-07-14 17:27:22 +01:00
Erik Johnston 03b715b8bf Add onRoomCreated callback to CreateRoom organism 2015-07-14 17:01:06 +01:00
Erik Johnston a748c090fb Move all element specific code into skins/ 2015-07-14 16:59:11 +01:00
Erik Johnston b53e710d20 Add invite selection to create room dialog 2015-07-14 16:53:49 +01:00
Erik Johnston ed52cdf6df Add basic CreateRoom organism. Supports setting room name and selecting preset 2015-07-14 15:17:49 +01:00
Matthew Hodgson dff9353339 tabs->spaces everywhere; sorry folks - \!blame sublime 2015-07-14 12:11:01 +01:00
Matthew Hodgson 69d1844773 fix NPE for invites 2015-07-14 12:10:15 +01:00
Matthew Hodgson 6b0167375c badges and broken avatars 2015-07-14 02:13:00 +01:00
Matthew Hodgson 341fe868e4 group messages together from the same user 2015-07-14 00:25:51 +01:00
David Baker a7e4a2847e Start of registration support. 2015-07-13 19:14:02 +01:00
Matthew Hodgson bfe0cdcfd1 vector wireframes 2015-07-13 01:51:24 +01:00
David Baker ed2cc33616 Linkify user IDs and room aliases (to nothing at the moment because we don't have anything to do with them) 2015-07-10 14:37:13 +01:00
David Baker a00510c1ca Linkify URLs 2015-07-09 15:41:19 +01:00
David Baker 12566c0c9c Separate with space too 2015-07-08 19:57:58 +01:00
David Baker 6a92fdc5e6 Fix file size display 2015-07-08 19:52:44 +01:00
David Baker 03451d8c7d Sort rooms for prev/next purposes 2015-07-08 19:47:58 +01:00
David Baker bdfef5eedd damn you javascript 2015-07-08 18:28:30 +01:00
David Baker c14886a1ee rename to mostRecentActivityFirst to disambiguate from sorting by when you joined a room, which this is not. 2015-07-08 18:21:57 +01:00
David Baker d58fdef362 Order room list by most recent activity 2015-07-08 18:18:03 +01:00
David Baker a591b66732 Don't barf if no info in m.file content 2015-07-08 16:50:49 +01:00
David Baker 5bed0b7275 typo 2015-07-08 16:32:03 +01:00
David Baker 53e9d030b7 See uploaded files 2015-07-08 16:25:27 +01:00
David Baker 36ecbfc87f Upload files and images 2015-07-08 14:34:53 +01:00
David Baker 00dd1e180a focus message composer when window gets focus 2015-07-07 13:30:38 +01:00
David Baker 9f37196eb7 Fix infinite scrolling 2015-07-07 11:00:02 +01:00
Matthew Hodgson 205ed54ec7 merge in matthew-css 2015-07-07 03:44:57 +01:00
David Baker 3e87e043d6 Fix docs 2015-07-06 18:29:24 +01:00
David Baker b4abe870cf Image displaying! 2015-07-06 18:09:19 +01:00
David Baker dcb4b5f912 Add room membership messages 2015-07-06 16:04:09 +01:00
David Baker 6c35908949 Add example shwing how to customise, make customising work and document all the ways in which browserify will break and how to work around it being dumb. 2015-07-06 14:13:02 +01:00
David Baker 1c03eabadb Not all events have a sender 2015-07-03 16:46:30 +01:00
David Baker b8f9cb44b8 argh, javascript 2015-07-03 16:35:06 +01:00
David Baker 1baaf39c48 update notification button when permission granted 2015-07-03 16:29:41 +01:00
David Baker 196ee3f6d4 Only highlight room list for messages where we notify - this may want to be an option in the react client potentially. 2015-07-03 11:36:44 +01:00
David Baker 53b0ba56db add license header 2015-07-03 11:24:04 +01:00
David Baker fd20e82123 Add desktop notifications, overridable in the same way as other components (although it's not a react component). Also extend the flux dispatcher a little to be less dumb about dispatching while something else is already dispatching. 2015-07-03 11:12:54 +01:00
David Baker 947f389e51 be more consistent with naming 2015-07-02 13:18:03 +01:00
David Baker acfe05db9d Use new push actions method on client 2015-07-01 14:11:23 +01:00
David Baker 898737d806 or is not and 2015-06-29 16:50:26 +01:00
David Baker 46646cbd87 Highlight room tiles on bing 2015-06-29 16:48:13 +01:00
David Baker 57ba816919 Highlight messages using new push rules support in js sdk 2015-06-29 16:24:02 +01:00
David Baker 9aa9a60333 Some checks to see whether stuff is still mounted when adding things. 2015-06-25 17:52:40 +01:00
David Baker 30a9436485 Room List should ignore paginated events 2015-06-25 17:44:27 +01:00
David Baker dd0d6159ce Make alt+up/down change rooms 2015-06-25 17:41:55 +01:00
David Baker fae629ea65 Use the pagination token to see when we've reached the room's birth 2015-06-25 15:58:51 +01:00
David Baker 5d44de9e08 Load limited number of room members when we first switch to a room, loading the rest a little later: makes switchign to large rooms much more responsive. 2015-06-25 14:57:35 +01:00
David Baker 209e052025 Limit the number of messages we load into a chat room when we switch to it (or more accurately, switch back to it). 2015-06-25 14:36:24 +01:00
David Baker 2355d5e6b5 Fix the permagrey local-echo bug 2015-06-24 18:15:34 +01:00
David Baker c54bed02c1 Argh, javascript 2015-06-24 14:09:38 +01:00
David Baker a54a7f80aa Apparently Object.keys is kinda slow 2015-06-24 14:01:59 +01:00
David Baker 52f6fa89a1 Only show joined and invited members 2015-06-24 13:48:39 +01:00
David Baker 8f1258b6cc Infinite scrolling 2015-06-24 13:28:44 +01:00
Matthew Hodgson aaa38d95ba s/themes/skins/g as we are always describing the whole UI layout here, whereas themes can sometimes just be small cosmetic tweaks (light-on-dark, dark-on-light etc) 2015-06-23 18:28:20 +01:00
David Baker 0c26206b88 Copyright headers (and use strict, while we're at it). 2015-06-23 16:41:25 +01:00
David Baker a022a4b9a6 Reshuffle to put "HTML" (JSX) and CSS together as a theme with logic elsewhere. 2015-06-23 14:40:50 +01:00
David Baker cc4fa6140c Fix joining 2015-06-23 11:36:19 +01:00
David Baker d10b1457ba obey room name changes 2015-06-22 15:56:16 +01:00
David Baker c425886a45 handle room invites 2015-06-22 14:48:58 +01:00
David Baker 2ba4ad04d1 Little fixes on member list 2015-06-22 13:15:14 +01:00
David Baker 0424ef07b3 Add member list (that doesn't really update much yet) 2015-06-22 11:42:09 +01:00
David Baker e77e9b7704 Add displayNames so they're not all just 'exports' in the react debugger 2015-06-19 16:21:09 +01:00
David Baker 41014af471 Display new rooms as they arrive 2015-06-19 16:12:22 +01:00
David Baker 1270bc3c62 m.notice 2015-06-19 14:01:17 +01:00
David Baker 2abea931ca Split out render methods into 'views' leaving UI logic in 'controllers'. Hopefully should make it easier to skin / customise. 2015-06-19 12:53:48 +01:00
David Baker 847e816035 grey out sending messages (although they don't go black until you send another message currently: awaiting fix in js sdk). 2015-06-18 15:49:41 +01:00
David Baker b31794cda5 Focus the text box at appropriate times 2015-06-18 15:03:57 +01:00
David Baker 90f6764cbf Fix cleaning unread state on room select & ignore our own messages 2015-06-18 14:40:55 +01:00
David Baker 7c405f673a Highlight rooms with unread messages 2015-06-18 14:35:17 +01:00
David Baker a63299aae0 Message scrolling 2015-06-18 11:23:35 +01:00
David Baker ed58a59f82 Switch everything over to use the component broker. 2015-06-17 16:43:29 +01:00
David Baker b35461f5c0 Unused require 2015-06-16 18:35:37 +01:00
David Baker c9a546b73b Load all components* through a central broker so we can overrride them with different ones
* only one place actually uses it currently
2015-06-16 18:18:55 +01:00
David Baker acaff68748 Oops, commit the emote tile. 2015-06-16 18:18:34 +01:00
David Baker 3a16c8a764 The most important feature 2015-06-16 15:29:13 +01:00
David Baker e2348c50d5 Fix logout 2015-06-16 14:37:15 +01:00
David Baker 1dbc54e172 Oops, put key in the right place 2015-06-16 14:31:35 +01:00
David Baker 2bd5b0fdad Just be a little less ugly 2015-06-16 14:27:13 +01:00
David Baker f25bf58d6d Use JS-SDK recommended way of getting sender name. 2015-06-16 14:19:46 +01:00
David Baker 672258f604 Start rendering messages with something more than the json 2015-06-16 11:58:03 +01:00
David Baker 88e9ab02f9 Yay, message sending. 2015-06-16 11:08:27 +01:00
David Baker b2843b09bc Rest of commit adding messagecomposer, and put li's in ul. 2015-06-16 10:41:05 +01:00
David Baker a0c5fb4a8b Add not-working-yet text box, plus a bit more css 2015-06-15 18:35:28 +01:00
David Baker 2a15b3a98c css tweaking 2015-06-15 15:50:24 +01:00
David Baker 52286b2316 Prevent default otherwise the form will submit and reload the page 2015-06-15 11:00:39 +01:00
David Baker 4bb570c545 messages arrive! 2015-06-12 18:17:54 +01:00
David Baker 0b0e6adce3 Make room changing work 2015-06-12 18:01:38 +01:00
David Baker 125fa78bc6 Something starting to resemble a Matrix Client 2015-06-12 17:34:17 +01:00
David Baker 2f6a123118 more Matrixy naming 2015-06-12 15:01:36 +01:00
David Baker 971a7c1133 Display the room list 2015-06-12 14:59:33 +01:00
David Baker 5f970edac5 strip out cruft 2015-06-12 13:49:23 +01:00
David Baker ffb0dc78b8 Fixes to login, and change to not use the dispatcher because it's just unnecessary here 2015-06-12 13:45:22 +01:00
David Baker e28fde7ae1 Save creds to localstorage 2015-06-12 13:12:39 +01:00
David Baker add78c6e92 Oops: the file modifications for making it log in. 2015-06-11 18:25:29 +01:00
David Baker f487b9ba04 Make it log in 2015-06-11 18:23:02 +01:00
David Baker eeb2dfd1fc uglify at the end so we can also mangle names, and don't bother uglifying individual modules with -g as it doesn't seem to make any difference 2015-06-11 17:46:25 +01:00
David Baker c42733ec95 Basic structure of a react SDK and start of an implementation. 2015-06-09 17:40:42 +01:00