69420 Commits

Author SHA1 Message Date
Richard van der Hoff 835d13c696 Another go at using latest Olm
The previous attempt failed due to npm shenanigans. Let's have another go,
without the "help" of npm.
2016-09-06 13:24:06 +01:00
wmwragg ddf1e4841a Selecting users with arrow keys added 2016-09-06 13:07:06 +01:00
wmwragg 1fe85f37fd Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching 2016-09-06 11:34:38 +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
David Baker c0eb69963d Merge pull request #2092 from vector-im/rav/use_development_olm
jenkins.sh: install olm from jenkins artifacts
2016-09-06 11:11:05 +01:00
Luke Barnard cb4df84d49 Missing curly bracket 2016-09-06 10:36:44 +01:00
Luke Barnard fa3387b326 Code review
- use an empty state key
- swap switch for if
- s/not in view/not visible/
2016-09-06 10:29:38 +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
Richard van der Hoff d309a7a67b jenkins.sh: install olm from jenkins artifacts
Use the latest version of olm, as provided by jenkins, rather than the most
recent release.
2016-09-05 18:54:10 +01:00
David Baker 80dd927275 Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms
Fix: conference rooms were no longer hidden
2016-09-05 18:39:15 +01:00
David Baker 04889a89ec Only count rooms we're in as DM rooms 2016-09-05 18:35:32 +01:00
Richard van der Hoff 83296512fd Merge pull request #444 from matrix-org/dbkr/fix_conf_error
Fix error dialog on conf call error
2016-09-05 17:47:30 +01:00
David Baker 50ef695740 Fix: conference rooms were no longer hidden 2016-09-05 17:42:22 +01:00
wmwragg 5ed680e5ce Picking the top of the queryList not _userList, as the queryList is the query filtered _userList 2016-09-05 17:34:20 +01:00
wmwragg f6f68bc348 Initial AddressTile added 2016-09-05 17:28:23 +01:00
wmwragg 3dd84e2b8a Initial AddressTile added 2016-09-05 17:28:08 +01:00
David Baker d782d5bbc7 Fix error dialog on conf call error 2016-09-05 17:03:10 +01:00
Luke Barnard 310e6602ca Fix ref to dispatcher 2016-09-05 15:24:05 +01:00
Luke Barnard efccdab0ad Better error message for room not viewed 2016-09-05 15:16:22 +01:00
Luke Barnard 1c29c95990 Only current room works with postMessage 2016-09-05 15:13:48 +01:00
Luke Barnard 54f21c9acc Expose join rules of a room 2016-09-05 14:58:16 +01:00
wmwragg d9c6448a0f Adding better deafults and ErrorDialog message 2016-09-05 14:29:21 +01:00
wmwragg 3d66dff0aa Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any 2016-09-05 14:16:21 +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 9c0f51fb82 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:06:31 +01:00
wmwragg 2acbad36a6 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:43 +01:00
wmwragg ca443e01d8 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:16 +01:00
wmwragg 519dd16135 Added the correct styling back for the dialog buttons, that got regressed somewhere 2016-09-05 10:50:58 +01:00
Richard van der Hoff 31e09e6137 Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user
Make MemberInfo to use client.getStoredDevicesForUser
2016-09-05 10:38:24 +01:00
wmwragg 67c623d410 Rename the action to make it clearer what it is doing 2016-09-05 10:29:03 +01:00
wmwragg fb103cb9e1 Rename the action to make it clearer what it is doing 2016-09-05 10:27:54 +01:00
Kegsay 6e2fd85760 Merge pull request #437 from matrix-org/kegan/starter-links
Implement starter link support
2016-09-05 09:10:39 +01:00
Kegan Dougal 56ac0004e5 Use href='#' hack to make link text look like a link 2016-09-05 09:10:15 +01:00
Richard van der Hoff 922fb448c5 Merge pull request #442 from matrix-org/rav/e2e_devices
Convert MemberDeviceInfo to ES6 class
2016-09-05 00:53:47 +01:00
Richard van der Hoff 5e9a95fdfe Merge pull request #2085 from vector-im/rav/e2e_devices
e2e device CSS
2016-09-05 00:43:52 +01:00
Richard van der Hoff fc40bdcbfc Make MemberInfo to use client.getStoredDevicesForUser
It's more powerful than listDeviceKeys, and isn't deprecated.
2016-09-05 00:08:16 +01:00
Richard van der Hoff a316c652b7 Convert MemberDeviceInfo to ES6 class 2016-09-04 21:49:06 +01:00
Aviral Dasgupta b8610ab466 RTE formatbar (wip) 2016-09-04 21:03:00 +05:30
Richard van der Hoff ee3fdbee5b e2e device CSS
CSS to make the deviceinfo stuff a little bit closer to the designs
2016-09-04 13:42:33 +01:00
wmwragg 2d827a75a6 Sending the top and left position tweaks with the action 2016-09-04 12:16:01 +01:00
wmwragg 50bb4edd1c Small refactor, to make it clearer whats happening 2016-09-04 08:54:15 +01:00
wmwragg e52f5b5d08 Removed unrequired positional tweak props 2016-09-04 08:49:43 +01:00
wmwragg fd81ce126b Code tidy up 2016-09-04 08:40:43 +01:00
wmwragg 7ae821e2b5 Removed nolonger needed conditional test, as the parent will always exist 2016-09-04 08:39:32 +01:00
wmwragg f9ab2fa957 When zoomed in, the sticky headers should correctly position themselves 2016-09-04 08:01:04 +01:00
wmwragg cb98e2421e Removed the nolonger required methods 2016-09-04 07:56:32 +01:00