Commit Graph

  • d309a7a67b jenkins.sh: install olm from jenkins artifacts Richard van der Hoff 2016-09-05 18:54:10 +01:00
  • 80dd927275 Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms David Baker 2016-09-05 18:39:15 +01:00
  • 04889a89ec Only count rooms we're in as DM rooms David Baker 2016-09-05 18:35:32 +01:00
  • 83296512fd Merge pull request #444 from matrix-org/dbkr/fix_conf_error Richard van der Hoff 2016-09-05 17:47:30 +01:00
  • 50ef695740 Fix: conference rooms were no longer hidden David Baker 2016-09-05 17:42:22 +01:00
  • 5ed680e5ce Picking the top of the queryList not _userList, as the queryList is the query filtered _userList wmwragg 2016-09-05 17:34:20 +01:00
  • f6f68bc348 Initial AddressTile added wmwragg 2016-09-05 17:28:23 +01:00
  • 3dd84e2b8a Initial AddressTile added wmwragg 2016-09-05 17:28:08 +01:00
  • d782d5bbc7 Fix error dialog on conf call error David Baker 2016-09-05 17:03:10 +01:00
  • 310e6602ca Fix ref to dispatcher Luke Barnard 2016-09-05 15:24:05 +01:00
  • efccdab0ad Better error message for room not viewed Luke Barnard 2016-09-05 15:16:22 +01:00
  • 1c29c95990 Only current room works with postMessage Luke Barnard 2016-09-05 15:13:48 +01:00
  • 54f21c9acc Expose join rules of a room Luke Barnard 2016-09-05 14:58:16 +01:00
  • d9c6448a0f Adding better deafults and ErrorDialog message wmwragg 2016-09-05 14:29:21 +01:00
  • 3d66dff0aa Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any wmwragg 2016-09-05 14:16:21 +01:00
  • d6a324ede7 Formatting toggle, markdown indicator, quoting Aviral Dasgupta 2016-09-05 17:39:32 +05:30
  • 7378904f00 Adding back the BottomLeftMenuTile component, as it turns out it's still used in the RightPanel wmwragg 2016-09-05 12:43:04 +01:00
  • 059f5198e5 Merge branch 'develop' into wmwragg/one-to-one-chat wmwragg 2016-09-05 12:07:21 +01:00
  • 9c0f51fb82 Merge branch 'develop' into wmwragg/one-to-one-chat wmwragg 2016-09-05 12:06:31 +01:00
  • 2acbad36a6 Initial commit of the new ChatInviteDialog wmwragg 2016-09-05 12:03:43 +01:00
  • ca443e01d8 Initial commit of the new ChatInviteDialog wmwragg 2016-09-05 12:03:16 +01:00
  • 519dd16135 Added the correct styling back for the dialog buttons, that got regressed somewhere wmwragg 2016-09-05 10:50:58 +01:00
  • 31e09e6137 Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user Richard van der Hoff 2016-09-05 10:38:24 +01:00
  • 67c623d410 Rename the action to make it clearer what it is doing wmwragg 2016-09-05 10:29:03 +01:00
  • fb103cb9e1 Rename the action to make it clearer what it is doing wmwragg 2016-09-05 10:27:54 +01:00
  • 6e2fd85760 Merge pull request #437 from matrix-org/kegan/starter-links Kegsay 2016-09-05 09:10:39 +01:00
  • 56ac0004e5 Use href='#' hack to make link text look like a link Kegan Dougal 2016-09-05 09:10:15 +01:00
  • 922fb448c5 Merge pull request #442 from matrix-org/rav/e2e_devices Richard van der Hoff 2016-09-05 00:53:47 +01:00
  • 5e9a95fdfe Merge pull request #2085 from vector-im/rav/e2e_devices Richard van der Hoff 2016-09-05 00:43:52 +01:00
  • fc40bdcbfc Make MemberInfo to use client.getStoredDevicesForUser Richard van der Hoff 2016-09-04 21:49:32 +01:00
  • a316c652b7 Convert MemberDeviceInfo to ES6 class Richard van der Hoff 2016-09-04 14:01:19 +01:00
  • b8610ab466 RTE formatbar (wip) Aviral Dasgupta 2016-09-04 21:03:00 +05:30
  • ee3fdbee5b e2e device CSS Richard van der Hoff 2016-09-04 13:31:44 +01:00
  • 2d827a75a6 Sending the top and left position tweaks with the action wmwragg 2016-09-04 12:16:01 +01:00
  • 50bb4edd1c Small refactor, to make it clearer whats happening wmwragg 2016-09-04 08:54:15 +01:00
  • e52f5b5d08 Removed unrequired positional tweak props wmwragg 2016-09-04 08:49:43 +01:00
  • fd81ce126b Code tidy up wmwragg 2016-09-04 08:40:43 +01:00
  • 7ae821e2b5 Removed nolonger needed conditional test, as the parent will always exist wmwragg 2016-09-04 08:39:32 +01:00
  • f9ab2fa957 When zoomed in, the sticky headers should correctly position themselves wmwragg 2016-09-04 08:01:04 +01:00
  • cb98e2421e Removed the nolonger required methods wmwragg 2016-09-04 07:56:32 +01:00
  • 721baf8d42 Tolltip tweak to not require the passing in of the parent wmwragg 2016-09-04 07:42:09 +01:00
  • 5417385c83 Tolltip thweak to not require the passing in of the parent wmwragg 2016-09-04 07:41:48 +01:00
  • 941dcc7e87 Merge pull request #439 from matrix-org/rav/enable_megolm_encryption Richard van der Hoff 2016-09-03 18:50:28 +01:00
  • bc8e7724e8 Make the 'encrypt this room' knob be megolm Richard van der Hoff 2016-09-03 18:42:54 +01:00
  • c2d8067523 Testing to see if having the header badges when collapsed is usable wmwragg 2016-09-03 14:55:35 +01:00
  • 52bd61a2f0 When collapsed a long hover on the header now shows the full tag name and room count wmwragg 2016-09-03 14:48:10 +01:00
  • aee56a5bd1 z-index tweak for badge, so it does sit aboce the header wmwragg 2016-09-03 14:47:36 +01:00
  • 7f52fa74a4 Better comments, and syntax tweak wmwragg 2016-09-03 14:14:11 +01:00
  • d1dd4bd3d8 Updated tooltip styling to be better inline with the design wmwragg 2016-09-03 13:57:49 +01:00
  • 03e74f48f8 Positioned Tooltip better wmwragg 2016-09-03 13:44:44 +01:00
  • ab9f48cd47 Restyled tooltip to better match the design wmwragg 2016-09-03 13:44:00 +01:00
  • c597f05e71 Merge branch 'develop' into matthew/notif-panel Matthew Hodgson 2016-09-03 13:33:37 +01:00
  • fdfd6ecfd9 let users join confs as voice or video Matthew Hodgson 2016-09-03 13:27:46 +01:00
  • 405dcf76eb Further tweaks to the tooltip to better handle its position, and simplify it's use wmwragg 2016-09-03 12:44:55 +01:00
  • 80e6cd6d7c Further tweaks to the tooltip to better handle its position, and simplify it's use wmwragg 2016-09-03 12:44:09 +01:00
  • cb101b0a3b Allow better updating if the tooltip is designed to stick around, rather than just appearing on hover wmwragg 2016-09-02 18:50:47 +01:00
  • bffefd9261 Tweak of the RoomTooltip to use DOM element for the parent rather than a React component wmwragg 2016-09-02 18:41:44 +01:00
  • bf4e3364b4 Tweak of the RoomTooltip to use DOM element for the parent rather than a React component wmwragg 2016-09-02 18:41:27 +01:00
  • dbd17ea953 improve e2e warning a bit Matthew Hodgson 2016-09-02 17:37:16 +01:00
  • 0494dff545 Merge branch 'master' into develop Matthew Hodgson 2016-09-02 17:23:02 +01:00
  • d5865421bd Open commits in new window/tab from changelog Remi Rampin 2016-09-02 12:20:01 -04:00
  • 8578203073 Open HTML commit page for changelog entries Remi Rampin 2016-09-02 12:19:37 -04:00
  • e63e6e7016 0.7.5-r3 v0.7.5-r3 Matthew Hodgson 2016-09-02 17:21:30 +01:00
  • dec62ab92c bump react-sdk Matthew Hodgson 2016-09-02 17:20:23 +01:00
  • 67d38bfab8 Prepare changelog for v0.7.5-r3 Matthew Hodgson 2016-09-02 17:20:08 +01:00
  • b5f9c2a5ac Merge branch 'master' into develop Matthew Hodgson 2016-09-02 17:17:24 +01:00
  • 14227b5718 0.6.5-r3 Matthew Hodgson 2016-09-02 17:17:01 +01:00
  • 714060ec8f Prepare changelog for v0.6.5-r3 Matthew Hodgson 2016-09-02 17:17:00 +01:00
  • d5062f1ff7 gah, revert debug Matthew Hodgson 2016-09-02 17:15:21 +01:00
  • fd664e893f Merge branch 'master' into develop Matthew Hodgson 2016-09-02 17:14:24 +01:00
  • c2ca261085 0.6.5-r2 Matthew Hodgson 2016-09-02 17:13:59 +01:00
  • 6de2e8bda5 update changelog Matthew Hodgson 2016-09-02 17:13:52 +01:00
  • fd0ed4a406 Show something when we see a no-op join event Richard van der Hoff 2016-09-02 16:54:27 +01:00
  • 8e9c04e1aa Merge pull request #438 from matrix-org/rav/matrix_dev_hack Matthew Hodgson 2016-09-02 16:58:29 +01:00
  • f5fe4b2433 Show something when we see a no-op join event Richard van der Hoff 2016-09-02 16:54:27 +01:00
  • 45ada1887d Implement starter link support Kegan Dougal 2016-09-02 16:36:43 +01:00
  • 6ec7e5df28 Move scalar auth stuff to ScalarAuthClient from RoomSettings Kegan Dougal 2016-09-02 16:03:24 +01:00
  • 4c05edb71b Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari wmwragg 2016-09-02 15:47:40 +01:00
  • d2e2c726eb Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari wmwragg 2016-09-02 15:45:43 +01:00
  • 00d53e4824 css for conf join Matthew Hodgson 2016-09-02 15:38:40 +01:00
  • f9d8829ba2 let you join confs either as voice or video Matthew Hodgson 2016-09-02 15:38:28 +01:00
  • 4ce80a0837 fix dialog css Matthew Hodgson 2016-09-02 14:39:38 +01:00
  • 9aa59fa358 Merge pull request #2069 from vector-im/rav/update_olm Richard van der Hoff 2016-09-02 12:02:27 +01:00
  • 6c8a492637 Bump to olm 1.1.0 Richard van der Hoff 2016-09-02 12:01:27 +01:00
  • d3bc2b7df7 Merge pull request #436 from matrix-org/rav/handle_broken_olm Richard van der Hoff 2016-09-02 11:58:40 +01:00
  • f3a1c58fa9 Handle broken OlmAccounts Richard van der Hoff 2016-09-02 11:25:10 +01:00
  • 584c7ed56d Merge branch 'rav/show_session_load_errors' into develop Richard van der Hoff 2016-09-02 11:03:39 +01:00
  • b4521bc44c review feedback Richard van der Hoff 2016-09-01 22:45:09 +01:00
  • 9709a38250 merge master Matthew Hodgson 2016-09-01 22:38:40 +01:00
  • 06ca94c1e6 0.7.5-r2 v0.7.5-r2 Matthew Hodgson 2016-09-01 22:29:36 +01:00
  • 67255e3f84 Prepare changelog for v0.7.5-r2 Matthew Hodgson 2016-09-01 22:29:36 +01:00
  • a20962ac14 bump to react-sdk v0.6.5-r1 Matthew Hodgson 2016-09-01 22:28:39 +01:00
  • 1a4e236a50 Merge branch 'master' into develop Matthew Hodgson 2016-09-01 22:18:32 +01:00
  • b9d98f918e 0.6.5-r1 Matthew Hodgson 2016-09-01 22:18:11 +01:00
  • 57ba49d896 Prepare changelog for v0.6.5-r1 Matthew Hodgson 2016-09-01 22:18:10 +01:00
  • 1586e5bd6f fix guest access; broken since Aug 18 Matthew Hodgson 2016-09-01 16:58:18 +01:00
  • b4cf86a362 fix padding-top for unread msgs Matthew Hodgson 2016-09-01 17:00:52 +01:00
  • 1bc26cb6c5 fix guest access; broken since Aug 18 Matthew Hodgson 2016-09-01 16:58:18 +01:00
  • bf8d7050cc New People icon in place of Directory icon, and placeholder functionality wmwragg 2016-09-01 16:46:51 +01:00
  • e7d4ef74d0 Placeholder for one to one chat dialog and functionality wmwragg 2016-09-01 16:45:24 +01:00