Commit graph

  • 59f419b310 Merge pull request #541 from vector-im/kegan/archived-rooms Kegsay 2015-12-18 17:36:16 +00:00
  • dcea0dd601 Move min-height to RoomList; remove bottommost prop Kegan Dougal 2015-12-18 17:13:57 +00:00
  • dc1e2010a6 Merge branch 'develop' into kegan/archived-rooms Kegan Dougal 2015-12-18 17:00:20 +00:00
  • d7b87743f3 Merge pull request #533 from vector-im/matthew/inbound-calls Matthew Hodgson 2015-12-18 15:59:05 +00:00
  • 7cc1573f33 Add startAsHidden and showSpinner props to RoomSubList Kegan Dougal 2015-12-18 15:17:18 +00:00
  • f7c4cca675 Add TODO after spending 15 mins trying to figure out the difference between props.collapsed and state.hidden Kegan Dougal 2015-12-18 13:32:22 +00:00
  • 869c08a790 Add onHeaderClick and alwaysShowHeader props to RoomSubList for archived room clicking Kegan Dougal 2015-12-18 11:56:22 +00:00
  • a7b9e54594 Merge branch 'develop' into matthew/settings Matthew Hodgson 2015-12-18 00:36:46 +00:00
  • 5f3a1cb6e1 Merge pull request #537 from vector-im/kegan/3pid-inv Kegsay 2015-12-17 16:43:13 +00:00
  • 63d0477223 Pass through the starting query params from the URL Kegan Dougal 2015-12-17 15:01:07 +00:00
  • 1a90a2c426 position the inbound call box correctly, and fix various issues with when the video preview and callview are shown Matthew Hodgson 2015-12-17 02:53:53 +00:00
  • 856156ef5c Merge pull request #527 from vector-im/kegan/hide-fs-user Kegsay 2015-12-16 13:56:50 +00:00
  • c8ca1dd8d0 Pass a userId rather than a RoomMember to isConferenceUser Kegan Dougal 2015-12-16 11:55:13 +00:00
  • d945050de6 fix typing notifs Matthew Hodgson 2015-12-15 15:59:40 +00:00
  • d3ecce2d2e add fullscreen button Matthew Hodgson 2015-12-15 00:01:32 +00:00
  • a495aecdd8 assets for VoIP and DnD file upload Matthew Hodgson 2015-12-14 23:38:24 +00:00
  • c553258aff add dedicated leave button to header Matthew Hodgson 2015-12-13 13:49:54 +00:00
  • 9c8984b308 fix vertical alignment of voip buttons Matthew Hodgson 2015-12-13 04:14:20 +00:00
  • c2061ed439 revert dd08f53756 - do this in JS instead Matthew Hodgson 2015-12-13 04:08:35 +00:00
  • 96cddc5ca8 fix layout for long room names & topics Matthew Hodgson 2015-12-12 17:30:08 +00:00
  • dd08f53756 don't let auxpanel push out the height of the roomview Matthew Hodgson 2015-12-12 17:15:45 +00:00
  • 056017007a improve look and feel of upload cancel Matthew Hodgson 2015-12-12 16:41:32 +00:00
  • 7cfca3ff4d Merge pull request #499 from vector-im/rav/mute_icon Matthew Hodgson 2015-12-11 15:32:08 +00:00
  • c36d1df417 Add a 'muted' icon for voip calls Richard van der Hoff 2015-12-11 14:59:53 +00:00
  • 762281cd96 fix vertical spacing of roomheader Matthew Hodgson 2015-12-11 03:39:13 +00:00
  • 898cb399a3 show results Matthew Hodgson 2015-12-11 02:58:47 +00:00
  • 3fb0c9883b escape key to cancel search box Matthew Hodgson 2015-12-11 02:32:30 +00:00
  • f2fb1836df only flash whilst searching Matthew Hodgson 2015-12-11 02:25:51 +00:00
  • fea3fed460 animate the search button whilst searching Matthew Hodgson 2015-12-11 02:24:58 +00:00
  • 4c82d86092 nice green highlights Matthew Hodgson 2015-12-11 01:35:05 +00:00
  • 1c9d61d731 dedicated search button Matthew Hodgson 2015-12-11 01:19:48 +00:00
  • 7b702c4594 don't grey out invites randomly Matthew Hodgson 2015-12-11 00:40:40 +00:00
  • d6bcf80431 make the settings button more discoverable by having the whole leftRow be a hover target Matthew Hodgson 2015-12-10 19:48:05 +00:00
  • e26efd475c preload warning.svg - fixes bug https://github.com/vector-im/vector-web/issues/455 Matthew Hodgson 2015-12-09 13:52:04 +00:00
  • 9d15bf2847 clean up broken renaming of /icons Matthew Hodgson 2015-12-09 13:24:56 +00:00
  • 8ecf70dda0 show images with unknown height - fixes issue 475 hopefully Matthew Hodgson 2015-12-09 13:24:15 +00:00
  • 4b8d7a612a make the mx_RoomView_statusAreaBox_line full width as per the ribot design Matthew Hodgson 2015-12-08 19:45:30 +00:00
  • 1d97a5f06b Merge pull request #470 from vector-im/rav/olm Richard van der Hoff 2015-12-08 16:03:54 +00:00
  • f8e5bbef0b Add a link to E2E bug in the README Richard van der Hoff 2015-12-08 16:03:12 +00:00
  • b532fd046a actually use SVGs - oops Matthew Hodgson 2015-12-08 10:28:00 +00:00
  • a8e24802ab rename icons to avoid namespace clash with /icons Matthew Hodgson 2015-12-08 10:27:42 +00:00
  • 862ab0c115 Merge pull request #477 from vector-im/kegan/resending Kegsay 2015-12-07 17:00:30 +00:00
  • 2f905e13e1 Invoke onFinished so the context menu doesn't hang around Kegan Dougal 2015-12-07 16:04:46 +00:00
  • 39778330b5 Also allow not_sent messages to be cancelled entirely. Kegan Dougal 2015-12-07 13:55:10 +00:00
  • 1af1297afc Allow queued events to be cancelled. Make not sent events appear differently to sending events. Kegan Dougal 2015-12-07 11:38:34 +00:00
  • da5c687320 svgize coloured icons Matthew Hodgson 2015-12-06 22:06:21 +00:00
  • 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. David Baker 2015-12-04 16:21:42 +00:00
  • ac8fcbb264 Force update the RightPanel when the member in MemberInfo is updated. Kegan Dougal 2015-12-04 16:16:41 +00:00
  • 759e35003b Put some warnings on the crypto stuff Richard van der Hoff 2015-12-04 15:39:39 +00:00
  • 97dd4e2e6b Merge branch 'develop' into rav/olm Richard van der Hoff 2015-12-03 18:28:50 +00:00
  • 56b7b65920 Notes on building a crypto-enabled version Richard van der Hoff 2015-12-03 18:24:44 +00:00
  • 782174069c Include olm in the webpack if it's been installed Richard van der Hoff 2015-12-02 14:54:26 +00:00
  • db5d9e2f6e Merge pull request #465 from vector-im/file_uploads David Baker 2015-12-03 10:58:03 +00:00
  • 547f59b1bc Oops, don't re-add these. David Baker 2015-12-03 10:00:29 +00:00
  • 2d2386ace5 Move upload bar CSS to new classes, and move into new, temporary place (since there is no new-style structure yet). David Baker 2015-12-02 18:19:03 +00:00
  • c603c1e37f dezalgo typing notigs on chrome Matthew Hodgson 2015-12-02 17:37:19 +00:00
  • de144cf4cd uh, actually include Open Sans webfont :-/ Matthew Hodgson 2015-12-02 15:13:34 +00:00
  • 8df62e3b02 Merge pull request #454 from vector-im/require-css David Baker 2015-12-02 10:26:41 +00:00
  • 939733b736 Merge branch 'develop' into require-css David Baker 2015-12-02 10:26:26 +00:00
  • 6db1151699 Merge pull request #453 from vector-im/kegan/vector-references Kegsay 2015-12-02 09:38:39 +00:00
  • 0210670e91 Merge branch 'develop' into kegan/vector-references Kegan Dougal 2015-12-02 09:37:28 +00:00
  • d837d02ac9 Still add highlight.js as an import as we symlink directly to the node_module for github.css :/ - Fixes ENOENT Kegan Dougal 2015-12-02 09:26:12 +00:00
  • cba27a7488 erm, surely we need to actually run reskindex after all that? Matthew Hodgson 2015-12-02 01:37:26 +00:00
  • 349a88d640 stop clobbering our font colours Matthew Hodgson 2015-12-01 18:37:51 +00:00
  • 95e71a531e Merge branch 'develop' into kegan/vector-references David Baker 2015-12-01 18:31:13 +00:00
  • d2c6e2195e Merge pull request #447 from vector-im/skindex-nextgen David Baker 2015-12-01 18:12:47 +00:00
  • a63bf7cb35 Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 18:10:57 +00:00
  • 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. David Baker 2015-12-01 18:05:43 +00:00
  • 2c12b9128b highlight binged rooms more clearly Matthew Hodgson 2015-12-01 16:57:36 +00:00
  • e21d435d84 Remove debug logging Kegan Dougal 2015-12-01 16:57:40 +00:00
  • a2b28b826c Add CustomServerDialog for vector Kegan Dougal 2015-12-01 16:48:51 +00:00
  • 8d31f72f83 Add VectorLoginHeader Kegan Dougal 2015-12-01 16:27:23 +00:00
  • e304a1925d Add VectorLoginFooter with vector references Kegan Dougal 2015-12-01 16:12:38 +00:00
  • 819b80d30f Merge pull request #450 from vector-im/kegan/vector-components Kegsay 2015-12-01 15:58:55 +00:00
  • c281fe785a Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 15:53:11 +00:00
  • 8083e7f118 Move vector-only components to src/components. Kegan Dougal 2015-12-01 15:45:38 +00:00
  • 5098c7d16f Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 15:44:45 +00:00
  • e07c03a7bb Merge branch 'develop' into kegan/vector-components Kegan Dougal 2015-12-01 15:39:02 +00:00
  • e7f6e09def Merge pull request #448 from vector-im/kegan/controller-merging4 Kegsay 2015-12-01 15:34:25 +00:00
  • 075d2b508d fix highlights on markdown Matthew Hodgson 2015-12-01 13:13:51 +00:00
  • e55e2bdd0d Remove unused class Kegan Dougal 2015-12-01 11:22:19 +00:00
  • 2a025201b1 Move remaining vector molecules to be components in vector (for now) Kegan Dougal 2015-12-01 11:19:54 +00:00
  • f89dcacf07 fix bottomleftmenu layout a bit Matthew Hodgson 2015-12-01 11:11:32 +00:00
  • 99f47b8601 match design spacing correctly Matthew Hodgson 2015-12-01 11:07:12 +00:00
  • 1896ab67d1 fix room avatar offset Matthew Hodgson 2015-12-01 11:05:11 +00:00
  • 2bc3b665d2 Merge pull request #445 from vector-im/matthew/new-font Matthew Hodgson 2015-12-01 10:59:05 +00:00
  • 8f5f71ec80 Move MatrixChat to react-sdk. Move all login stuff to react SDK. Kegan Dougal 2015-11-30 18:10:09 +00:00
  • 021056cfd1 Move copyright header David Baker 2015-11-30 18:00:54 +00:00
  • 6a4038daeb Add 'replaces' tag to mark that the RoomDNDView is a RoomTile David Baker 2015-11-30 17:56:55 +00:00
  • cadfbcbed3 Merge branch 'develop' into skindex-nextgen David Baker 2015-11-30 17:56:40 +00:00
  • 6f646260aa WIP of component indexing update David Baker 2015-11-30 17:31:32 +00:00
  • badfdb5e3e actually, seems FF is happy with this again now Matthew Hodgson 2015-11-30 17:24:38 +00:00
  • 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 Matthew Hodgson 2015-11-30 17:17:09 +00:00
  • ddc4f30bb6 Remove RoomView and port it to react-sdk. Move Resend.js to react-sdk Kegan Dougal 2015-11-30 17:16:31 +00:00
  • 4e7aa78ed7 Move RoomList to react-sdk. Inject a ConferenceHandler. Kegan Dougal 2015-11-30 16:56:05 +00:00
  • e792ebb837 Move and merge UserSettings to react-sdk Kegan Dougal 2015-11-30 15:53:13 +00:00
  • 4409f07c2e oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar Matthew Hodgson 2015-11-30 15:49:27 +00:00
  • b89bd35cad Merge branch 'develop' into kegan/controller-merging4 Kegan Dougal 2015-11-30 15:42:32 +00:00
  • 4614017b8f Merge pull request #443 from vector-im/matthew/rename-message-components Matthew Hodgson 2015-11-30 15:36:50 +00:00
  • 7636645efc rename message components as per RL discussion this morning Matthew Hodgson 2015-11-30 15:25:21 +00:00