enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • be90badc8d Add css for the iframes for e2e attachments Mark Haines 2016-11-17 11:36:46 +00:00
  • 3155d79a7e chatbot summit stuff Matthew Hodgson 2016-11-17 13:35:36 +02:00
  • dace762a6c Merge pull request #2587 from vector-im/rav/view_clear_source David Baker 2016-11-17 11:24:39 +00:00
  • 7577d2eb05 s/var/const/ Richard van der Hoff 2016-11-17 10:51:09 +00:00
  • 90019023c7 Merge branch 'develop' into rav/view_clear_source Richard van der Hoff 2016-11-17 10:39:16 +00:00
  • 5d02c72687 Bump to react 15.4 Richard van der Hoff 2016-11-17 10:34:12 +00:00
  • d3c9792126 Remove pin on react 15.3 and bump draft-js-export-html instead Richard van der Hoff 2016-11-17 10:15:10 +00:00
  • 81d70a921d Add a 'View decrypted source' button Richard van der Hoff 2016-11-16 23:10:51 +00:00
  • 3ef0a08493 Pin to 15.3.2 because 15.4.0 is broken and fails with missing CSSProperty file Kegan Dougal 2016-11-16 17:58:43 +00:00
  • f3582edb99 Merge pull request #560 from matrix-org/luke/fix-join-part-collapsing-regressions2 Richard van der Hoff 2016-11-16 16:33:18 +00:00
  • 7e88f0083d Fix more join-part collapsing regressions Luke Barnard 2016-11-16 16:26:24 +00:00
  • 3618b49982 Use new js-sdk public unpaginate Luke Barnard 2016-11-16 16:10:23 +00:00
  • 324448563a If only one mevent, return than one Luke Barnard 2016-11-16 16:07:19 +00:00
  • beecbc7cd7 Fix join/part collapsing regressions (#553) Luke Barnard 2016-11-16 14:42:30 +00:00
  • b718f1542c Fix infinite loop when there are a lot of invisible events (#554) Luke Barnard 2016-11-16 14:25:52 +00:00
  • 6ccc825f0d Cache the tinted SVGs for MFileBody as data URLs (#559) Mark Haines 2016-11-16 14:16:51 +00:00
  • 218ced0276 Merge pull request #557 from matrix-org/rav/show_padlock_on_unencrypted_room David Baker 2016-11-16 13:03:52 +00:00
  • 32a5d31f01 Merge pull request #558 from matrix-org/markjh/presentable David Baker 2016-11-15 16:12:52 +00:00
  • 595493e5bb Clean up MFileBody.presentableTextForFile Mark Haines 2016-11-15 15:54:14 +00:00
  • bb776c217d Merge pull request #556 from matrix-org/rav/decrypt_after_keys_arrive David Baker 2016-11-15 14:56:21 +00:00
  • a3d4ed5aee Show an open padlock for unencrypted rooms Richard van der Hoff 2016-11-15 12:31:17 +00:00
  • ec999f6fa1 Merge pull request #552 from matrix-org/rav/event_tile_withmatrixclient David Baker 2016-11-15 11:25:48 +00:00
  • 13f28e53e1 Generate thumbnails when sending m.image and m.video messages. (#555) Mark Haines 2016-11-15 11:22:39 +00:00
  • b209cc551e Update eventtiles when the events are decrypted Richard van der Hoff 2016-11-15 11:12:52 +00:00
  • 22757cfcd3 Inject MatrixClient into React context in tests Richard van der Hoff 2016-11-14 18:20:15 +00:00
  • 0e8a49ebb7 Update EventTile to use WithMatrixClient instead of MatrixClientPeg Richard van der Hoff 2016-11-14 16:00:24 +00:00
  • 363453fd06 Merge pull request #2577 from vector-im/dbkr/fix_update_bar_version_format Richard van der Hoff 2016-11-14 14:15:14 +00:00
  • 1599f3a666 make logo scale Matthew Hodgson 2016-11-14 01:46:42 +00:00
  • 70d383fb1b Fix changelog dialog to read new version format David Baker 2016-11-13 23:06:57 +00:00
  • f911f0cfca geektime verbiage tweaks Matthew Hodgson 2016-11-13 20:18:19 +00:00
  • 1fb14d5a40 plug mobile apps Matthew Hodgson 2016-11-13 14:32:00 +00:00
  • 616c20fc1e fix img path Matthew Hodgson 2016-11-13 14:26:54 +00:00
  • 6cf14e6a2a fix room alias Matthew Hodgson 2016-11-13 14:19:55 +00:00
  • 9f812b7069 fix img path Matthew Hodgson 2016-11-13 14:18:31 +00:00
  • efabf35613 make room previews more obvious Matthew Hodgson 2016-11-13 14:13:32 +00:00
  • 69f6393ed9 try to make joining rooms more obvious Matthew Hodgson 2016-11-13 14:13:21 +00:00
  • a967ddd1cb quick and dirty support for custom welcome pages, with an example for geektime techfest Matthew Hodgson 2016-11-13 14:10:46 +00:00
  • 3f640139d2 quick and dirty support for custom welcome pages, with an example for geektime techfest Matthew Hodgson 2016-11-13 14:10:33 +00:00
  • 34df6ea242 Complete attachment-encryption patch Richard van der Hoff 2016-11-12 12:20:36 +00:00
  • b0c1097f86 Don't include two vector prefixes David Baker 2016-11-11 18:23:25 +00:00
  • 68a3505091 Fix packaging David Baker 2016-11-11 18:18:51 +00:00
  • 6e47d2f1b5 It's '=' in sh, not '==' David Baker 2016-11-11 18:07:03 +00:00
  • 2bcb27b24f Merge pull request #2558 from vector-im/dbkr/build_vector_dir David Baker 2016-11-11 17:51:25 +00:00
  • 6ac5fe60d9 Empty commit to force jenkins David Baker 2016-11-11 17:41:24 +00:00
  • 8356ad7bfa Merge pull request #2553 from vector-im/dbkr/get_app_version David Baker 2016-11-11 17:33:41 +00:00
  • 062cb7a52e Add isomorphic fetch David Baker 2016-11-11 17:22:44 +00:00
  • 45bd234c38 Merge pull request #549 from matrix-org/markjh/disable_conferencing_for_e2e David Baker 2016-11-11 16:01:47 +00:00
  • 2eb9d90b86 Disable conference calling for encrypted rooms Mark Haines 2016-11-11 15:45:29 +00:00
  • 1ff3a86457 Merge pull request #548 from matrix-org/markjh/encrypted-attachments David Baker 2016-11-11 14:49:52 +00:00
  • 0bfcb38879 Add dependency on browser-encrypted-attachment Mark Haines 2016-11-11 14:24:39 +00:00
  • b7fce70ce5 Merge pull request #547 from matrix-org/luke/fix-memberavatar-proptypes Richard van der Hoff 2016-11-11 14:00:02 +00:00
  • 72d24f58d0 Make the promises be q promises Mark Haines 2016-11-08 16:26:25 +00:00
  • 9edfea3b32 Make imports more consistent, fix m.video Mark Haines 2016-11-08 12:57:24 +00:00
  • bf5ecbd016 Review comments Mark Haines 2016-11-08 11:42:20 +00:00
  • 734c4eb638 Fix gif hoverover Mark Haines 2016-11-04 18:40:57 +00:00
  • de384480c6 Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself. Mark Haines 2016-11-04 18:20:20 +00:00
  • 736ab743ee Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded Mark Haines 2016-11-04 18:09:12 +00:00
  • ee1768f644 Use data:// URI rather than blob: URI to avoid XSS Mark Haines 2016-11-04 15:39:39 +00:00
  • b69e88d4e3 Decrypt m.file attachments Mark Haines 2016-11-04 14:00:26 +00:00
  • 4e01a4f692 Decrypt m.audio attachments Mark Haines 2016-11-04 13:45:00 +00:00
  • 48340a2817 Fix unencrypted video thumbnail Mark Haines 2016-11-04 13:13:25 +00:00
  • b56417f46e Remove spurious TODO Mark Haines 2016-11-04 13:08:17 +00:00
  • 95e8889857 Decypt m.video events Mark Haines 2016-11-04 13:05:34 +00:00
  • a4a0d02848 Move decryptFile into a utility function so that it can be shared between different components Mark Haines 2016-11-04 12:46:45 +00:00
  • 5109833c42 Use correct prop types Luke Barnard 2016-11-11 13:55:32 +00:00
  • 49b3aec1e2 Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates Mark Haines 2016-11-04 11:52:47 +00:00
  • 2a1d32f4d5 Add key prop to memberlist summary Luke Barnard 2016-11-11 13:49:25 +00:00
  • 23e764604c Merge remote-tracking branch 'origin/master' into develop Mark Haines 2016-11-11 12:00:53 +00:00
  • f6b3248c9d Merge pull request #546 from matrix-org/revert-533-markjh/encrypted-attachments Mark Haines 2016-11-11 12:00:43 +00:00
  • 61921327c2 Merge remote-tracking branch 'origin/master' into develop Mark Haines 2016-11-11 12:00:30 +00:00
  • 1e163eabf0 Revert "Encrypt attachments in encrypted rooms," David Baker 2016-11-11 11:59:08 +00:00
  • 998690431f Merge pull request #542 from matrix-org/dbkr/get_app_version Richard van der Hoff 2016-11-11 11:11:36 +00:00
  • 00ecff7497 Merge pull request #544 from matrix-org/luke/feature-truncate-m-room-member-events Richard van der Hoff 2016-11-11 11:01:47 +00:00
  • 69eee7ca0a Merge pull request #2565 from vector-im/luke/fix-add-css-for-mlist-truncation Richard van der Hoff 2016-11-11 11:01:31 +00:00
  • 857c0d1747 Wrap getAppVersion() in promise David Baker 2016-11-11 10:05:53 +00:00
  • d3a548773a Remove redundant lines Luke Barnard 2016-11-10 18:01:34 +00:00
  • 3d7f6919cf Refactor renderNameList (thanks, @richvdh) Luke Barnard 2016-11-10 17:36:22 +00:00
  • 0695037f5f pass in prop onClick by default Luke Barnard 2016-11-10 17:30:35 +00:00
  • 87e8f0e4da trailing commas Luke Barnard 2016-11-10 17:27:59 +00:00
  • 3ec7940d12 Inline renderEvents Luke Barnard 2016-11-10 17:26:36 +00:00
  • d2d7ebc979 correct comment Luke Barnard 2016-11-10 17:22:16 +00:00
  • 4f944cf01c Add CSS for mlist truncation Luke Barnard 2016-11-10 17:15:30 +00:00
  • b11dd9542f Add class to expand link for pointer and colour Luke Barnard 2016-11-10 17:09:18 +00:00
  • e05aeb35a1 npm run reskindex Luke Barnard 2016-11-10 17:03:24 +00:00
  • ac460122cc revert now redundant TruncatedList edits Luke Barnard 2016-11-10 15:51:27 +00:00
  • f71ac93946 Prefer null to falsy, use correct plural Luke Barnard 2016-11-10 15:38:20 +00:00
  • 1a4df38500 remove href Luke Barnard 2016-11-10 15:20:53 +00:00
  • d8bc4d9a6f Factor out avatar click leads to view_user Luke Barnard 2016-11-10 15:18:59 +00:00
  • 6b2aa43b71 Factor out "and others" Luke Barnard 2016-11-10 14:33:41 +00:00
  • d6b74becfc Children are required Luke Barnard 2016-11-10 14:12:45 +00:00
  • 370f5f0a11 Use _ prefix for private methods Luke Barnard 2016-11-10 14:12:05 +00:00
  • 8422017827 events are required Luke Barnard 2016-11-10 14:09:40 +00:00
  • dcbb31279f Prefer import React, set prevEvent to last MemberhsipChange Luke Barnard 2016-11-10 14:08:11 +00:00
  • e2936376b6 Unnecessary props Luke Barnard 2016-11-10 13:26:27 +00:00
  • 566034cf2b Render children EventTiles before passing to summary element Luke Barnard 2016-11-10 13:25:48 +00:00
  • 764959ec1c Comment on i after membershipchanges Luke Barnard 2016-11-10 13:14:04 +00:00
  • 0ec5eebfc9 Hoist isMembershipChange out of for loop Luke Barnard 2016-11-10 13:03:17 +00:00
  • d01bb0b78f Use sdk.getComponent Luke Barnard 2016-11-10 13:01:48 +00:00
  • 79c01fa1a4 Remove empty lines Luke Barnard 2016-11-10 11:03:43 +00:00
  • f5bc8d1fe0 Removed logs, updated phrasing on 'others joined' Luke Barnard 2016-11-10 10:42:33 +00:00