Commit Graph

  • c9a79bf32e Prevent messages from being sent if other messages have failed to send Travis Ralston 2018-11-08 16:46:03 -07:00
  • d74ed508f9 Restart broken Olm sessions David Baker 2018-11-08 19:09:28 +00:00
  • eafba9c7ef Merge pull request #777 from matrix-org/dbkr/olm_unit_test David Baker 2018-11-06 12:04:55 +00:00
  • 610923af89 Merge pull request #778 from matrix-org/rxl881/loginWithPassword Richard Lewis 2018-11-05 17:25:31 +00:00
  • 23dfeb13df Update CHANGELOG. Richard Lewis 2018-11-05 17:17:22 +00:00
  • f4abd7d027 Update CHANGELOG. Richard Lewis 2018-11-05 17:06:39 +00:00
  • b716e71784 Refactor code to base 'login' method. Richard Lewis 2018-11-05 16:40:11 +00:00
  • 094598196a Linting. Richard Lewis 2018-11-05 16:02:30 +00:00
  • db1d1c49a0 Merge pull request #779 from matrix-org/rxl881/getRooms David Baker 2018-11-05 12:14:12 +00:00
  • ff4125c11e Remove unused stuff & comments David Baker 2018-11-05 09:39:46 +00:00
  • a0d51803ed Add function to get currently joined room members. Richard Lewis 2018-11-05 00:08:04 +00:00
  • 3aabd63975 Add function to get currently joined rooms. Richard Lewis 2018-11-04 21:49:17 +00:00
  • 394e37f9ea Set access_token and user_id after login in with username and password. Richard Lewis 2018-11-04 19:43:18 +00:00
  • 369b88d6f8 Merge pull request #775 from matrix-org/travis/cleanup-request Travis Ralston 2018-11-02 09:39:23 -06:00
  • ec8b3ae515 Lint (and also name the test right) David Baker 2018-11-02 12:33:46 +00:00
  • c94382b46c A unit test for olm David Baker 2018-11-02 12:05:13 +00:00
  • 2a6a67c6cc Inbound session creation counts as a received message David Baker 2018-11-01 17:08:43 +00:00
  • 37f0a9ad7b Try tests on node 10 David Baker 2018-11-01 13:54:41 +00:00
  • 28540ad50a Use the last olm session that got a message David Baker 2018-11-01 12:59:38 +00:00
  • 29d92d3e81 Lint David Baker 2018-10-31 20:05:21 +00:00
  • 0477f354c9 Fix key forwarded count David Baker 2018-10-31 19:45:29 +00:00
  • c7a0c1402c refer to getAllEndToEndInboundGroupSessions for magic numbers David Baker 2018-10-31 19:39:07 +00:00
  • 2af5643243 Clarify comment David Baker 2018-10-31 19:37:19 +00:00
  • 5e9885946f random double linebreak David Baker 2018-10-31 19:36:30 +00:00
  • e89879d8a6 Remove the request-only stuff we don't need anymore Travis Ralston 2018-10-31 13:07:31 -06:00
  • 2f219f83db Catch exceptions from backupGroupSession() David Baker 2018-10-31 18:46:02 +00:00
  • 63e9f794c7 Remove unnecessary if David Baker 2018-10-31 18:37:38 +00:00
  • 7c0b910d7a remove unnecessary isFinite check David Baker 2018-10-31 18:36:55 +00:00
  • c77ecad9a5 clarify comment David Baker 2018-10-31 18:34:49 +00:00
  • db2897cf1e Remove spurious interlopers David Baker 2018-10-31 18:33:31 +00:00
  • 5c5ce0dfe3 Typo David Baker 2018-10-31 18:32:48 +00:00
  • 6de213483c Change getDeviceByIdentityKey() to just the 2 arg version David Baker 2018-10-31 18:31:56 +00:00
  • f5846b89ea More modern loop syntax David Baker 2018-10-31 18:18:41 +00:00
  • c5e7bedb37 Conclusion: no, it shouldn't David Baker 2018-10-31 18:08:53 +00:00
  • 2b46c560c7 Add crypto. prefix to keyBackupStatus event David Baker 2018-10-31 18:07:12 +00:00
  • c6ad0665b5 factor out duplicated test code David Baker 2018-10-31 18:03:40 +00:00
  • 8ab84dee16 PR feedback 1/n David Baker 2018-10-31 17:40:17 +00:00
  • 62b2c07be2 Merge pull request #770 from matrix-org/travis/fix-request Travis Ralston 2018-10-30 15:18:33 -06:00
  • 2fb29ae8fd Use the right query string lib Travis Ralston 2018-10-30 14:59:57 -06:00
  • b57e858ad1 We can't use arrow functions, apparently. Travis Ralston 2018-10-30 14:27:51 -06:00
  • 054aac17aa Just use the interface provided to us rather than hack in a flag Travis Ralston 2018-10-30 14:25:25 -06:00
  • 68b65dd357 Because uglify-js breaks everything Travis Ralston 2018-10-30 14:12:41 -06:00
  • f2881126cd Manually construct query strings for browser-request instances Travis Ralston 2018-10-30 13:59:29 -06:00
  • 11968a5888 Merge pull request #769 from matrix-org/bwindels/initcryptoll Bruno Windels 2018-10-30 16:13:32 +00:00
  • ad279dc566 correctly check for crypto being present Bruno Windels 2018-10-30 16:05:44 +01:00
  • 2814932845 lint David Baker 2018-10-30 12:36:03 +00:00
  • a2430dbc53 Fix DeviceList index of users by identity key David Baker 2018-10-30 12:29:44 +00:00
  • e51d2dd36a Fix a few e2e backup bits David Baker 2018-10-30 11:45:19 +00:00
  • 604af1ac8c Merge branch 'master' into develop David Baker 2018-10-29 14:01:26 +00:00
  • 68c6393eb2 v0.12.1 v0.12.1 David Baker 2018-10-29 13:59:39 +00:00
  • 4cbf9c7f47 Prepare changelog for v0.12.1 David Baker 2018-10-29 13:59:39 +00:00
  • 8bb3b75b1d Merge pull request #768 from aaronraimist/lint Travis Ralston 2018-10-26 21:13:04 -06:00
  • a76f0c7cb4 Update babel-eslint to 8.1.1 Aaron Raimist 2018-10-26 22:06:33 -05:00
  • 01e31afcbd Merge pull request #764 from matrix-org/travis/permalink-routing Travis Ralston 2018-10-26 14:22:51 -06:00
  • 3b2f2f922e Bump db version David Baker 2018-10-26 18:49:05 +01:00
  • 64b83b3245 Merge branch 'develop' into travis/permalink-routing Travis Ralston 2018-10-26 09:20:54 -06:00
  • 563e6b3cdd Fix jsdoc David Baker 2018-10-26 13:23:37 +01:00
  • 6518bff2ac Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups David Baker 2018-10-26 12:09:38 +01:00
  • 0e26247b53 Speed up time rather than increasing timeouts David Baker 2018-10-26 12:08:55 +01:00
  • e69f7dbc5f Merge pull request #767 from matrix-org/dbkr/loglevel_dep David Baker 2018-10-26 11:26:15 +01:00
  • 4d0f6df89a alphabetical order David Baker 2018-10-26 11:23:05 +01:00
  • 6b184363a1 loglevel should be a normal dependency David Baker 2018-10-26 11:16:20 +01:00
  • b519069634 Merge pull request #766 from matrix-org/dbkr/stop_devicelist David Baker 2018-10-26 11:14:36 +01:00
  • 1bd44a7427 Merge remote-tracking branch 'origin/develop' into travis/permalink-routing Travis Ralston 2018-10-25 14:36:46 -06:00
  • 568ff5a3f5 Appease the linter Travis Ralston 2018-10-25 14:36:14 -06:00
  • a6bf40d4e2 We can always import these now David Baker 2018-10-25 19:21:29 +01:00
  • b3bb99d76a Stop client after backup tests David Baker 2018-10-25 19:11:43 +01:00
  • 243bab7036 Merge branch 'dbkr/stop_devicelist' into dbkr/e2e_backups David Baker 2018-10-25 19:03:57 +01:00
  • 88b39f4b67 Stop devicelist when client is stopped David Baker 2018-10-25 19:00:03 +01:00
  • 5e8061f846 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups David Baker 2018-10-25 17:33:48 +01:00
  • 870e96a1df Merge pull request #743 from matrix-org/dbkr/wasm David Baker 2018-10-25 15:58:18 +01:00
  • 59070c2af6 Merge remote-tracking branch 'origin/develop' into dbkr/wasm David Baker 2018-10-25 15:29:41 +01:00
  • cec8936728 Merge pull request #763 from Ryuno-Ki/logging-lib David Baker 2018-10-25 15:28:47 +01:00
  • 14071b0d31 Merge pull request #765 from matrix-org/dbkr/mock_request_stop David Baker 2018-10-25 15:16:08 +01:00
  • 57173e4385 Use mock-request 1.2.2 David Baker 2018-10-25 15:01:05 +01:00
  • 997caad985 jsdoc David Baker 2018-10-25 14:43:17 +01:00
  • 2b752c0c02 Use new stop() method on matrix-mock-request David Baker 2018-10-25 14:29:25 +01:00
  • 2cccb8b450 Install memfs because webpack is made of fail Travis Ralston 2018-10-24 16:57:36 -06:00
  • 0c540ac8de Re-add the querystring options Travis Ralston 2018-10-24 16:36:12 -06:00
  • 6033b7b886 Update request and browserify; Use request in the browser Travis Ralston 2018-10-24 16:36:00 -06:00
  • b67f8d1389 Merge branch 'develop' into travis/permalink-routing Travis Ralston 2018-10-24 16:22:18 -06:00
  • ae645ad9f0 Use Node.js module export, since ES6 export breaks build. André Jaenisch 2018-10-24 21:52:50 +02:00
  • 5b72509dac Fix broken build. André Jaenisch 2018-10-24 21:12:51 +02:00
  • 3ce42a096b Add Apache license banner. André Jaenisch 2018-10-24 21:06:04 +02:00
  • 8331c2f267 Use ES6 export instead of CommonJS. André Jaenisch 2018-10-24 21:05:21 +02:00
  • b3c9570b0f Remove 'use strict'. André Jaenisch 2018-10-24 20:56:29 +02:00
  • 9d5c877df9 Set loglevel to DEBUG to remain current behaviour. André Jaenisch 2018-10-24 20:55:54 +02:00
  • a8e2727473 Set level of logger instead of all of them. André Jaenisch 2018-10-24 20:55:22 +02:00
  • 4b9c6e6bd2 Merge remote-tracking branch 'origin/develop' into dbkr/wasm David Baker 2018-10-24 19:15:04 +01:00
  • d29ac088c0 retest David Baker 2018-10-24 18:55:04 +01:00
  • 3a316de9ef Update to Olm 3 here too David Baker 2018-10-24 17:40:58 +01:00
  • 40cb37e824 Update to Olm 3 David Baker 2018-10-24 16:58:48 +01:00
  • f165b55a1d Merge branch 'e2e_backups' of git://github.com/uhoreg/matrix-js-sdk into uhoreg-e2e_backups David Baker 2018-10-24 17:15:36 +01:00
  • 84b91d4575 Update to Olm 3 David Baker 2018-10-24 16:58:48 +01:00
  • f5832423f4 v0.12.1-rc.1 v0.12.1-rc.1 David Baker 2018-10-24 11:14:59 +01:00
  • 73dd07aadf Prepare changelog for v0.12.1-rc.1 David Baker 2018-10-24 11:14:59 +01:00
  • 0f39a45734 Fixing module export of logger. Refs #332 André Jaenisch 2018-10-24 01:44:10 +02:00
  • f41060c39a Replace console.log with loglevel logger. Fixes #332 André Jaenisch 2018-10-24 00:47:51 +02:00
  • bbb8e12bac Create logger module. Refs #332 André Jaenisch 2018-10-24 00:29:26 +02:00
  • d0e1471c91 Added loglevel library. Refs #332 André Jaenisch 2018-10-23 23:57:52 +02:00