Commit Graph

  • f3073e120d Space David Baker 2019-11-01 10:51:49 +00:00
  • a571624e13 Typo David Baker 2019-11-01 10:46:43 +00:00
  • 74b649c04c Typo David Baker 2019-11-01 10:45:41 +00:00
  • 7973b99f50 Fix incorrect return value of MatrixClient.prototype.uploadKeys ZengJing 2019-10-31 17:53:00 +08:00
  • e8f5a8b89d v2.4.3-rc.1 v2.4.3-rc.1 RiotRobot 2019-10-30 16:40:25 +00:00
  • 2d0bda933c Prepare changelog for v2.4.3-rc.1 RiotRobot 2019-10-30 16:40:25 +00:00
  • 49588da73d Fix more tests David Baker 2019-10-29 19:39:31 +00:00
  • 3e2d845342 Merge remote-tracking branch 'origin/develop' into dbkr/cross_signing David Baker 2019-10-28 16:47:16 +00:00
  • e92d2bd70a Fix test again David Baker 2019-10-28 16:07:26 +00:00
  • de1b545df1 lint David Baker 2019-10-28 15:42:42 +00:00
  • 3bec28b2ff make other tests pass David Baker 2019-10-28 15:23:58 +00:00
  • 8cad116dd7 Make tests pass David Baker 2019-10-28 14:56:35 +00:00
  • 35adb75d80 Merge pull request #1056 from uhoreg/fix_logger_path Hubert Chathi 2019-10-26 13:45:24 -04:00
  • e9908b1d97 fix the path in references to logger.js Hubert Chathi 2019-10-25 23:24:30 -04:00
  • fffd2eb70a Merge pull request #1050 from uhoreg/verification_in_dms Hubert Chathi 2019-10-23 12:09:52 -04:00
  • 136b9c0f50 remove unnecessary async Hubert Chathi 2019-10-23 12:03:17 -04:00
  • 0f1206b4ee apply suggestions from review Hubert Chathi 2019-10-22 13:29:24 -04:00
  • 46d7e4c707 Merge branch 'master' into develop RiotRobot 2019-10-18 14:38:58 +01:00
  • c874783742 v2.4.2 v2.4.2 RiotRobot 2019-10-18 14:36:57 +01:00
  • bb296f50d9 Prepare changelog for v2.4.2 RiotRobot 2019-10-18 14:36:57 +01:00
  • da68b53ff9 Merge pull request #1054 from rcsm/develop Michael Telatynski 2019-10-17 15:35:33 +01:00
  • bbe141d44e chore: updated throws docs in function getRelationsForEvent Rafael Cascalho 2019-10-17 11:30:41 -03:00
  • 8a03e41a7c chore: corrected the docs the getRelationsForEvent function Rafael Cascalho 2019-10-17 10:51:34 -03:00
  • a79e1bc976 Merge remote-tracking branch 'upstream/develop' into develop Rafael Cascalho 2019-10-17 10:15:10 -03:00
  • 056bfbf7a3 Merge pull request #1055 from matrix-org/jryans/bluebird-3.5 J. Ryan Stinnett 2019-10-17 00:10:54 +02:00
  • e0b64a487d Downgrade to Bluebird 3.5.5 to fix Firefox J. Ryan Stinnett 2019-10-17 00:05:47 +02:00
  • d47d1d8f26 Merge remote-tracking branch 'upstream/develop' into develop Rafael Cascalho 2019-10-15 11:12:00 -03:00
  • 42a07de9a7 chore: corrected getRelationForEvent return docs Rafael Cascalho 2019-10-15 10:28:23 -03:00
  • aead855470 Merge pull request #1053 from matrix-org/jryans/major-deps-2 J. Ryan Stinnett 2019-10-11 13:53:58 +01:00
  • 335b2314f1 Upgrade safe deps to latest major version J. Ryan Stinnett 2019-10-11 12:43:52 +01:00
  • 89bab24c14 Merge pull request #1052 from clokep/no-js-import Travis Ralston 2019-10-10 00:14:52 +01:00
  • 3a439dcdad Don't include .js in the import string. Patrick Cloke 2019-10-09 18:44:41 -04:00
  • 20d82eb92f v2.4.2-rc.1 v2.4.2-rc.1 RiotRobot 2019-10-09 16:49:43 +01:00
  • 319e1d1191 Prepare changelog for v2.4.2-rc.1 RiotRobot 2019-10-09 16:49:42 +01:00
  • 5f3492dbf8 send the m.key.verification.done message when done Hubert Chathi 2019-10-09 11:13:32 -04:00
  • 107c8c0b1f Merge pull request #1047 from matrix-org/dbkr/olm_session_describe David Baker 2019-10-09 15:48:54 +01:00
  • 8c6d9586bf Update docs to reflect minimum olm version David Baker 2019-10-09 15:41:34 +01:00
  • 1271fc6bf3 Actually bump olm David Baker 2019-10-09 15:38:47 +01:00
  • c9df03c40c Bump to olm 3.1.4 which has olm_session_describe David Baker 2019-10-09 10:19:13 +01:00
  • d8e8dddd25 initial implementation of verification in DMs Hubert Chathi 2019-10-08 15:44:51 -04:00
  • 27f6745123 Merge pull request #1048 from matrix-org/bwindels/redact-all-more-robust Bruno Windels 2019-10-08 06:58:13 +00:00
  • 964f448334 moar doc fix Bruno Windels 2019-10-02 15:30:28 +02:00
  • 20ee03bb44 fix docs Bruno Windels 2019-10-02 15:25:19 +02:00
  • 77bd677182 add method to get access to all timelines Bruno Windels 2019-10-02 10:00:11 +02:00
  • e024d047e3 v2.4.1 v2.4.1 RiotRobot 2019-10-01 11:30:13 +01:00
  • 40943edc06 Prepare changelog for v2.4.1 RiotRobot 2019-10-01 11:30:12 +01:00
  • e6699c5424 Log state of Olm sessions David Baker 2019-10-01 11:19:52 +01:00
  • bd8a307e50 Merge pull request #1046 from matrix-org/jryans/deps-2019-09-27 J. Ryan Stinnett 2019-09-27 16:01:50 +01:00
  • f71301cafc Upgrade deps J. Ryan Stinnett 2019-09-27 15:04:21 +01:00
  • 562bf9331b Merge branch 'master' into develop RiotRobot 2019-09-27 11:44:14 +01:00
  • 11e6eb94b5 v2.4.0 v2.4.0 RiotRobot 2019-09-27 11:42:17 +01:00
  • cee3aa2a7a Prepare changelog for v2.4.0 RiotRobot 2019-09-27 11:42:17 +01:00
  • 81e3783488 Merge pull request #1043 from matrix-org/dbkr/ignore_empty_crypto_event David Baker 2019-09-27 10:44:17 +01:00
  • fc7f9786f8 Merge pull request #1045 from matrix-org/jryans/yarn-cache-clean J. Ryan Stinnett 2019-09-26 11:37:18 +01:00
  • 0808c0edf1 Clean Yarn cache during release J. Ryan Stinnett 2019-09-26 11:18:20 +01:00
  • 8de6746efd v2.4.0-rc.1 v2.4.0-rc.1 RiotRobot 2019-09-25 17:14:17 +01:00
  • eb9b8ef7c6 Prepare changelog for v2.4.0-rc.1 RiotRobot 2019-09-25 17:14:16 +01:00
  • b09621b915 Merge pull request #1044 from matrix-org/jryans/rm-id-server-creds J. Ryan Stinnett 2019-09-25 16:02:41 +01:00
  • 8d667f9367 Remove id_server from creds for interactive auth J. Ryan Stinnett 2019-09-25 14:59:32 +01:00
  • 56dfe6630f Ignore crypto events with no content David Baker 2019-09-25 12:05:52 +01:00
  • 8b3b181a48 Merge pull request #1041 from matrix-org/jryans/rm-id-params-request-token J. Ryan Stinnett 2019-09-23 14:43:03 +01:00
  • c952768542 Remove IS details from requestToken to HS J. Ryan Stinnett 2019-09-23 13:36:07 +01:00
  • 1a368aa996 Merge pull request #1040 from matrix-org/jryans/msisdn-submit-url J. Ryan Stinnett 2019-09-23 13:21:28 +01:00
  • 61449458cf Add support for sending MSISDN tokens to alternate URLs J. Ryan Stinnett 2019-09-23 12:20:28 +01:00
  • 4eb547e535 Merge pull request #1038 from matrix-org/jryans/msc2290 J. Ryan Stinnett 2019-09-20 14:37:00 +01:00
  • b54acffaef Tweak unbind 3PID params J. Ryan Stinnett 2019-09-19 17:28:50 +01:00
  • 65a1833e1f Add 3PID unbind API J. Ryan Stinnett 2019-09-19 15:28:58 +01:00
  • 1ce4f25811 Use unstable prefix for add and bind J. Ryan Stinnett 2019-09-19 15:28:35 +01:00
  • 3127105516 Merge pull request #1037 from matrix-org/dependabot/npm_and_yarn/eslint-utils-1.4.2 J. Ryan Stinnett 2019-09-18 12:52:28 +01:00
  • d59ea4be78 Bump eslint-utils from 1.4.0 to 1.4.2 dependabot[bot] 2019-09-18 11:48:29 +00:00
  • f256f04440 Add MSISDN validation API on the IS J. Ryan Stinnett 2019-09-18 11:47:37 +01:00
  • b444aaa67e Add separate add and bind HS APIs J. Ryan Stinnett 2019-09-18 11:16:23 +01:00
  • 745185e689 Fix function doc syntax J. Ryan Stinnett 2019-09-18 10:38:52 +01:00
  • 2bfa891f0a Add function to check for separate 3PID add and bind J. Ryan Stinnett 2019-09-18 10:36:05 +01:00
  • 147167bed3 Merge pull request #1036 from matrix-org/travis/wrap-ff Travis Ralston 2019-09-17 13:52:19 -06:00
  • 565e18e8a3 Handle WebRTC security errors as non-fatal Travis Ralston 2019-09-17 13:49:50 -06:00
  • 55b4595bbf Merge pull request #1035 from matrix-org/travis/r0.6 Travis Ralston 2019-09-16 14:43:00 -06:00
  • eeb2c463dc Check for r0.6.0 support in addition to unstable feature flags Travis Ralston 2019-09-16 14:30:18 -06:00
  • d9bb0e9a52 Merge branch 'master' into develop RiotRobot 2019-09-16 17:43:01 +01:00
  • 7d07ab7c7e v2.3.2 v2.3.2 RiotRobot 2019-09-16 17:40:19 +01:00
  • f8ff3aac58 Prepare changelog for v2.3.2 RiotRobot 2019-09-16 17:40:19 +01:00
  • 299a7728d1 Merge pull request #1034 from matrix-org/travis/t2 David Baker 2019-09-16 17:02:32 +01:00
  • 39dc6a1742 Fix addPendingEvent with pending event order == chronological David Baker 2019-08-28 16:34:09 -04:00
  • f21c5aa7f2 v2.3.2-rc.1 v2.3.2-rc.1 RiotRobot 2019-09-13 16:13:27 +01:00
  • e9bc3f26a5 Prepare changelog for v2.3.2-rc.1 RiotRobot 2019-09-13 16:13:27 +01:00
  • 23eaddd6ea Merge pull request #1033 from matrix-org/travis/t1 David Baker 2019-09-13 16:07:58 +01:00
  • 8143ce8450 Update src/client.js Travis Ralston 2019-09-02 11:06:54 -06:00
  • 0a487ec43e Add Synapse admin functions for deactivating a user Travis Ralston 2019-09-01 18:05:12 -06:00
  • 0edb483802 Merge pull request #1032 from matrix-org/travis/t1 Travis Ralston 2019-09-13 08:27:31 -06:00
  • 06a32ce0a1 Add matrix base API to report an event Michael Telatynski 2019-08-08 15:15:25 +01:00
  • 8cae00407a Merge branch 'master' into develop RiotRobot 2019-09-12 12:51:29 +01:00
  • a57ec87c67 v2.3.1 v2.3.1 RiotRobot 2019-09-12 12:48:36 +01:00
  • 4e62491ea4 Prepare changelog for v2.3.1 RiotRobot 2019-09-12 12:48:36 +01:00
  • 5758029c1e v2.3.1-rc.1 v2.3.1-rc.1 RiotRobot 2019-09-11 18:38:22 +01:00
  • 8f08710c58 Prepare changelog for v2.3.1-rc.1 RiotRobot 2019-09-11 18:38:21 +01:00
  • 90f98105f0 Merge pull request #1031 from matrix-org/dbkr/update_profile_on_redact_2 David Baker 2019-09-11 18:12:46 +01:00
  • 90354aa330 Update room members on member event redaction David Baker 2019-09-11 16:07:34 +01:00
  • aaabebe7f5 Merge pull request #1030 from matrix-org/dbkr/update_profile_on_redact David Baker 2019-09-11 18:07:49 +01:00
  • 80a92dcdc2 Update room members on member event redaction David Baker 2019-09-11 16:07:34 +01:00
  • dc9081e9d4 Merge pull request #1028 from matrix-org/travis/hidden_rr Travis Ralston 2019-09-10 10:55:58 -06:00