Commit Graph

  • 49010c3e93 Refactor how 'readReceipts' are passed into EventTiles Kegan Dougal 2016-12-09 11:24:10 +00:00
  • aed5a95c8f Merge pull request #589 from matrix-org/dbkr/dont_crash_if_no_dmroommap David Baker 2016-12-09 11:04:33 +00:00
  • 6a017ba763 Merge pull request #587 from matrix-org/dbkr/fix_test_fail David Baker 2016-12-09 11:04:23 +00:00
  • e52907a462 Missed semicolon David Baker 2016-12-09 10:59:05 +00:00
  • b06cff7928 Merge pull request #2727 from vector-im/dbkr/make_loading_tests_work_alone Richard van der Hoff 2016-12-09 10:58:25 +00:00
  • 8d1095bc26 Don't throw exception on stop if no DMRoomMap David Baker 2016-12-09 10:32:56 +00:00
  • d65374f7f9 Make the 'loading' tests work in isolation David Baker 2016-12-09 10:31:26 +00:00
  • 289f8ab439 Fix failing test David Baker 2016-12-08 18:44:38 +00:00
  • f0b0999f65 Numeracy David Baker 2016-12-08 18:04:44 +00:00
  • bd7553d1ea Add read receipt times to the hovertip of read markers Kegan Dougal 2016-12-08 16:23:20 +00:00
  • e55845ac52 Makeover! David Baker 2016-12-08 16:21:37 +00:00
  • 229693dd71 gitignore .npmrc David Baker 2016-12-08 11:41:31 +00:00
  • 5e8e6f4c8b Add icon missed from #2708 David Baker 2016-12-08 11:40:33 +00:00
  • 98f9e2f870 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 David Baker 2016-12-07 17:18:15 +00:00
  • 2b51cda6da talk to jenkins via https for the /dev redeployer Matthew Hodgson 2016-12-07 14:07:31 +00:00
  • 65a31cc8a9 Merge pull request #2708 from vector-im/dbkr/png_icon_on_linux Richard van der Hoff 2016-12-07 11:23:10 +00:00
  • 737f912abb Use a PNG for the icon on non-Windows David Baker 2016-12-07 11:19:51 +00:00
  • f6957aa367 Merge pull request #2703 from uhoreg/patch-1 Matthew Hodgson 2016-12-07 09:24:11 +00:00
  • ad79f67ab6 Add missing brackets to call to toUpperCase Hubert Chathi 2016-12-06 17:59:17 -05:00
  • a9fcf106ab v0.9.1-rc.2 David Baker 2016-12-06 16:06:15 +00:00
  • 0f47c9956c Prepare changelog for v0.9.1-rc.2 David Baker 2016-12-06 16:06:14 +00:00
  • d4ac5f829f react-sdk rc.2 David Baker 2016-12-06 16:04:46 +00:00
  • a297015d27 v0.8.1-rc.2 David Baker 2016-12-06 16:04:05 +00:00
  • a8a07a01de Prepare changelog for v0.8.1-rc.2 David Baker 2016-12-06 16:04:05 +00:00
  • d31a675ca8 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 David Baker 2016-12-06 16:02:26 +00:00
  • 1006d50a0d Merge remote-tracking branch 'origin/develop' into release-v0.8.1 David Baker 2016-12-06 16:02:14 +00:00
  • 587325b36c Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir Richard van der Hoff 2016-12-06 15:58:07 +00:00
  • fe0dc85d66 Merge pull request #583 from matrix-org/luke/fix-post-message-api-origin-check David Baker 2016-12-06 15:00:26 +00:00
  • 9e3c94edf4 Fix exception when clearing room dir search David Baker 2016-12-06 14:59:10 +00:00
  • b3f642e835 Merge pull request #584 from matrix-org/dbkr/search_box_field_name Richard van der Hoff 2016-12-06 14:48:25 +00:00
  • 96f620829f Merge pull request #2700 from vector-im/dbkr/fix_notification_click Richard van der Hoff 2016-12-06 14:47:41 +00:00
  • 004b420eaa Merge pull request #582 from matrix-org/dbkr/fix_notification_click Richard van der Hoff 2016-12-06 14:47:37 +00:00
  • a3ab59832e Give the search box field a name David Baker 2016-12-06 14:40:09 +00:00
  • ef1cb9530f Allow integration UI URLs with paths Luke Barnard 2016-12-06 14:30:21 +00:00
  • 5fa0f62ccc Fix clicking on notifications David Baker 2016-12-06 13:28:59 +00:00
  • 28e663dd48 Pass the room object into displayNotification David Baker 2016-12-06 13:27:36 +00:00
  • b825862f95 Merge pull request #2697 from vector-im/dbkr/show_when_ready Richard van der Hoff 2016-12-06 09:59:32 +00:00
  • c0b931a837 Merge pull request #581 from matrix-org/dbkr/dont_crash_settings_if_no_e2e Richard van der Hoff 2016-12-06 09:49:55 +00:00
  • 8d06b54091 Only show window when ready David Baker 2016-12-06 09:45:31 +00:00
  • 6777e07a41 Remove device name from crypto section David Baker 2016-12-05 20:03:43 +00:00
  • 8ffe14881e Don't throw an exception entering settings page David Baker 2016-12-05 18:33:38 +00:00
  • df5143c818 v0.9.1-rc.1 David Baker 2016-12-05 18:02:03 +00:00
  • ca6a3a2ad9 Prepare changelog for v0.9.1-rc.1 David Baker 2016-12-05 18:02:03 +00:00
  • 6934b7ed56 released js-sdk & react-sdk David Baker 2016-12-05 17:53:06 +00:00
  • 66f72e674b v0.8.1-rc.1 David Baker 2016-12-05 17:51:04 +00:00
  • b348dfa382 Prepare changelog for v0.8.1-rc.1 David Baker 2016-12-05 17:51:03 +00:00
  • 6693817cdb released js-sdk David Baker 2016-12-05 17:47:54 +00:00
  • 987822bd5a typo in cp destination David Baker 2016-12-05 17:27:30 +00:00
  • 189c8aca79 Remove redundant line getting version David Baker 2016-12-05 17:15:48 +00:00
  • b6aa7f430c Merge pull request #2653 from vector-im/dbkr/electron_dist_tweaks David Baker 2016-12-05 16:22:44 +00:00
  • d8e772cfc4 Merge pull request #2692 from vector-im/dbkr/repo-rename-riot David Baker 2016-12-05 16:22:33 +00:00
  • ec959f0052 Update name & repo to reflect renamed repository David Baker 2016-12-05 14:40:06 +00:00
  • 3d813e68e9 gitignore electron/pub David Baker 2016-12-05 14:20:26 +00:00
  • 37b4734bbe Also re-add installer spinner David Baker 2016-12-05 14:19:49 +00:00
  • b613a742f5 Forgot to re-add squirrelhooks David Baker 2016-12-05 14:17:22 +00:00
  • 72de35a2a1 Switch back to Squirrel installer David Baker 2016-12-05 14:08:27 +00:00
  • 61cf08ca1b Merge pull request #579 from kyrias/irc-strip-click Matthew Hodgson 2016-12-03 01:17:33 +00:00
  • f321c6c346 Strip (IRC) when clicking on username Johannes Löthberg 2016-12-03 01:20:50 +01:00
  • 970a029cea Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks David Baker 2016-12-02 14:32:31 +00:00
  • d5a5abe202 Merge pull request #2680 from vector-im/dbkr/document_cross_origin_renderer_url David Baker 2016-12-02 14:31:45 +00:00
  • 6ff253d0d8 Empty commit Richard van der Hoff 2016-12-02 14:27:34 +00:00
  • 749d26c8f4 Link to the repo which it turns out is a thing David Baker 2016-12-02 14:25:20 +00:00
  • f1998497f2 Put the riot.im config back in this repo David Baker 2016-12-02 14:21:33 +00:00
  • 81e429eb14 Fix e2e attachment download by using iframes. (#562) Mark Haines 2016-12-02 14:21:07 +00:00
  • d0c2ab4cf1 Document cross_origin_renderer_url David Baker 2016-12-02 13:43:41 +00:00
  • 0a42a78b13 Merge pull request #577 from matrix-org/luke/fix-scroll-jump-on-image-decryption Richard van der Hoff 2016-12-02 11:28:55 +00:00
  • 5665a0ef37 Fix scroll jump on image decryption Luke Barnard 2016-12-02 11:11:35 +00:00
  • 7871a3edb5 Just rm dist in the clean step David Baker 2016-12-01 19:43:04 +00:00
  • 9f51e2c407 Auto-update & build process with NSIS for windows David Baker 2016-12-01 19:33:42 +00:00
  • 2930a94c79 Change to update_base_url David Baker 2016-12-01 18:01:23 +00:00
  • 3aa1e0dd9e Update browser-encrypt-attachment to v0.3.0 (#570) Mark Haines 2016-12-01 13:12:22 +00:00
  • 9026cc4977 Merge pull request #2659 from vector-im/markjh/attachment_iframe_css Mark Haines 2016-12-01 13:12:12 +00:00
  • e3290c1117 Switch to new auto-update & add linux build David Baker 2016-12-01 11:35:26 +00:00
  • bacd467b4c Merge pull request #2670 from vector-im/dbkr/fix_config_location Richard van der Hoff 2016-12-01 10:04:20 +00:00
  • 4988f0603f Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks David Baker 2016-11-30 18:13:14 +00:00
  • 6a944d3e7d Fix config location in some more places David Baker 2016-11-30 18:09:51 +00:00
  • 868e16c366 Merge pull request #576 from matrix-org/kegan/cutting-doesnt-clear-tab-complete David Baker 2016-11-30 11:08:18 +00:00
  • 5d03543f85 Make cut operations update the tab complete list Kegan Dougal 2016-11-30 10:49:40 +00:00
  • 5f160d2e7f Markdown: Use .call instead of .bind Johannes Löthberg 2016-11-30 01:03:05 +01:00
  • 4d2926485b Replace marked with commonmark Johannes Löthberg 2016-11-29 20:56:48 +01:00
  • 03bd4b1457 Merge pull request #574 from matrix-org/rav/s_block_blacklist David Baker 2016-11-29 19:09:18 +00:00
  • 0e18a12472 Merge pull request #2662 from vector-im/rav/s_block_blacklist David Baker 2016-11-29 19:09:08 +00:00
  • f202197545 CSS updates for s/block/blacklist for e2e Richard van der Hoff 2016-11-29 18:49:23 +00:00
  • c7fb83ed2d s/block/blacklist for e2e Richard van der Hoff 2016-11-29 18:25:26 +00:00
  • 496f507684 Merge pull request #2660 from vector-im/dbkr/electron_1.4.8 Richard van der Hoff 2016-11-29 12:18:47 +00:00
  • 1a4163747e Merge pull request #573 from matrix-org/dbkr/electron_fix_download_icon Richard van der Hoff 2016-11-29 11:44:09 +00:00
  • 55062c7ec5 Update to electron 1.4.8 David Baker 2016-11-28 16:37:43 +00:00
  • 6c21391ff5 Merge branch 'develop' into markjh/attachment_iframe_css Mark Haines 2016-11-28 15:10:49 +00:00
  • 21d65d2ad1 Fix the download icon on attachments David Baker 2016-11-25 23:19:20 +00:00
  • a1347e7bf1 Correct vector to webapp & platform update URLs David Baker 2016-11-25 20:09:21 +00:00
  • c7635a362f Don't copy config, check update url David Baker 2016-11-25 20:08:45 +00:00
  • 97c0e2dfcd Delete electron config from here David Baker 2016-11-25 20:08:05 +00:00
  • dfa7c3b72e Animated install logo from Ben David Baker 2016-11-25 20:07:38 +00:00
  • 4073688ba6 Missed an x64 David Baker 2016-11-25 20:07:12 +00:00
  • 693867f074 Final bits to prepare electron distribtion: David Baker 2016-11-25 19:57:08 +00:00
  • f9afa79b01 Merge pull request #2644 from vector-im/dbkr/electron_config David Baker 2016-11-24 18:19:20 +00:00
  • a870ea2389 Add electron config David Baker 2016-11-24 17:24:11 +00:00
  • ac2911c222 Merge pull request #2643 from vector-im/dbkr/device_name_to_platform David Baker 2016-11-24 16:57:01 +00:00
  • 57d82eb39e Merge pull request #572 from matrix-org/dbkr/fix_tests Richard van der Hoff 2016-11-24 16:47:36 +00:00
  • c786980454 Move getDefaultDeviceName into the Platforms David Baker 2016-11-24 16:46:15 +00:00