Commit Graph

  • 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
  • 5f0b891d47 Add date seperator to the expanded events Luke Barnard 2016-11-09 17:44:43 +00:00
  • 04a934f738 Trying to get rid of the date separator problem Luke Barnard 2016-11-09 16:24:56 +00:00
  • 2f02c4b84e WIP nicer join/part folding Luke Barnard 2016-11-09 16:03:35 +00:00
  • 3e9414b21e Merge pull request #533 from matrix-org/markjh/encrypted-attachments David Baker 2016-11-09 09:45:01 +00:00
  • f2222c84a8 Merge pull request #545 from matrix-org/dbkr/fix_ctrl_e Richard van der Hoff 2016-11-08 18:37:58 +00:00
  • a008f5010a Fix the ctrl+e mute camera shortcut David Baker 2016-11-08 18:04:22 +00:00
  • 8676481aab dist now, not packages David Baker 2016-11-08 17:37:49 +00:00
  • e66e8b11cb Merge pull request #2560 from Half-Shot/msg-external-url David Baker 2016-11-08 17:20:21 +00:00
  • 1401de2e7d Move the jenkins / redeploy scripts to scripts David Baker 2016-11-08 17:09:44 +00:00
  • 15c730a22a Add rel="noopener" to context menu links. Will Hunt 2016-11-08 17:08:50 +00:00
  • 3b06563960 Fix jenkins script / redeployer David Baker 2016-11-08 17:08:01 +00:00
  • cf33ed58c1 Add menu option for external_url if present Will Hunt 2016-11-08 16:26:10 +00:00
  • cd241a4a17 Truncate consecutive member events Luke Barnard 2016-11-08 16:34:02 +00:00
  • c838164f40 Make the promises be q promises Mark Haines 2016-11-08 16:26:25 +00:00
  • c8a6be1454 Update gitignore David Baker 2016-11-08 16:14:57 +00:00
  • 5b7f629996 Build to the 'webapp' directory instead David Baker 2016-11-08 15:46:21 +00:00
  • a4c16b896b Merge remote-tracking branch 'origin/develop' into dbkr/build_vector_dir David Baker 2016-11-08 15:44:27 +00:00
  • d150ee0d05 Missed a -w David Baker 2016-11-08 15:30:19 +00:00
  • 7bf69d067a Another missed file from the windows fixes David Baker 2016-11-08 14:32:33 +00:00
  • ccc43cc0ed Merge pull request #2555 from vector-im/dbkr/auto_update_config David Baker 2016-11-08 14:33:44 +00:00
  • f7091d2fdd Merge pull request #2556 from vector-im/dbkr/windows_fixes_missed_files David Baker 2016-11-08 14:33:19 +00:00
  • 1e2cd9c2d1 Build all of the vector dir in the build process David Baker 2016-11-08 14:30:12 +00:00
  • 93ddb5539e Make imports more consistent, fix m.video Mark Haines 2016-11-08 12:57:24 +00:00
  • a2a3d7a0f9 Remove spurious log line David Baker 2016-11-08 11:45:11 +00:00
  • d871ca2b24 PR feedback David Baker 2016-11-08 11:43:24 +00:00
  • 911f9e4e63 Review comments Mark Haines 2016-11-08 11:42:20 +00:00
  • abc306be6c Merge pull request #2554 from vector-im/luke/feature-show-integration-error-popup Luke Barnard 2016-11-08 11:27:49 +00:00
  • 5a61a1e6e1 Merge pull request #543 from matrix-org/luke/feature-show-integration-error-popup Luke Barnard 2016-11-08 11:27:32 +00:00
  • ccea483f4f Missed files electron windows fixes David Baker 2016-11-08 11:20:47 +00:00
  • de83e578e7 Use generic error message Luke Barnard 2016-11-08 11:18:44 +00:00
  • 84aac88677 Make auto-update configureable David Baker 2016-11-08 11:07:36 +00:00
  • c0c662aeaf Show the error that occured when trying to reach scalar Luke Barnard 2016-11-08 10:57:48 +00:00
  • b30df2115c Add some CSS for an error popup that appears next to the Manage Integrations button if there was a problem contacting Scalar Luke Barnard 2016-11-08 10:54:03 +00:00
  • 8d46077ac2 Support for get_app_version David Baker 2016-11-08 10:47:01 +00:00
  • d44adcb7a9 Fix the vector web version in UserSettings David Baker 2016-11-08 10:45:19 +00:00
  • 0441fcf3df Merge pull request #2552 from vector-im/dbkr/electron_catch_unhandled_errors Richard van der Hoff 2016-11-07 15:22:11 +00:00
  • b223d3b385 Catch unhandled errors in the electron process David Baker 2016-11-07 14:37:12 +00:00
  • e033ce6c43 Merge pull request #2551 from vector-im/dbkr/electron_windows_fixes David Baker 2016-11-07 13:54:38 +00:00
  • 884ae0e218 Merge pull request #541 from matrix-org/dbkr/dont_preview_matrix_to David Baker 2016-11-07 12:32:33 +00:00
  • 5c2c01d414 Fix function to consistently return boolean David Baker 2016-11-07 11:45:55 +00:00
  • 6681205337 Slight grab-bag of fixes for electron on Windows David Baker 2016-11-07 11:41:41 +00:00
  • 2bb7aec0de Don't do URL previews for matrix.to David Baker 2016-11-07 10:57:08 +00:00
  • b86f9f362a Merge pull request #540 from matrix-org/rav/fix_npe David Baker 2016-11-07 09:57:46 +00:00
  • 2ee98e9fdc Fix NPE in LoggedInView Richard van der Hoff 2016-11-07 09:23:45 +00:00
  • dc679a8eca Fix gif hoverover Mark Haines 2016-11-04 18:40:57 +00:00
  • 4214c67f8f 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
  • 1529396ef5 Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded Mark Haines 2016-11-04 18:09:12 +00:00
  • 8f778f54fd Use data:// URI rather than blob: URI to avoid XSS Mark Haines 2016-11-04 15:39:39 +00:00
  • 6ea0085290 Decrypt m.file attachments Mark Haines 2016-11-04 14:00:26 +00:00
  • 94bfe31857 Decrypt m.audio attachments Mark Haines 2016-11-04 13:45:00 +00:00
  • 91123431dd Fix unencrypted video thumbnail Mark Haines 2016-11-04 13:13:25 +00:00
  • 71c002d588 Remove spurious TODO Mark Haines 2016-11-04 13:08:17 +00:00
  • 48cfd4f399 Decypt m.video events Mark Haines 2016-11-04 13:05:34 +00:00
  • 6da1a1077d 0.8.4 has been released David Baker 2016-11-04 13:03:11 +00:00
  • c973dbf1c4 0.7.5 has been released David Baker 2016-11-04 13:02:12 +00:00
  • b6653dd0ed 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
  • 12fc70c671 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
  • 5ac0aac65b Merge pull request #538 from matrix-org/dbkr/matrix_to_links Richard van der Hoff 2016-11-04 11:42:49 +00:00
  • 04c27205a3 Make room alias & user ID links matrix.to links David Baker 2016-11-04 11:38:28 +00:00
  • 3a0b63dbda Merge pull request #537 from matrix-org/rav/memberinfo_use_client_from_context David Baker 2016-11-04 10:59:11 +00:00
  • 80bae0563d Merge pull request #2535 from vector-im/dbkr/electron_3 David Baker 2016-11-04 10:56:59 +00:00
  • f301e55b6e Merge remote-tracking branch 'origin/develop' into rav/memberinfo_use_client_from_context David Baker 2016-11-04 10:54:32 +00:00
  • 0ab46df94a Merge pull request #536 from matrix-org/rav/add_client_to_context David Baker 2016-11-04 10:54:11 +00:00
  • 9a00ec128c many semicolons David Baker 2016-11-04 10:46:51 +00:00