matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity
4,030 Commits 237 Branches 514 Tags
a571624e1330e3cdfdf70393f70a2efbb37de476
Commit Graph

4030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
a571624e13 Typo 2019-11-01 10:46:43 +00:00
David Baker
74b649c04c Typo 2019-11-01 10:45:41 +00:00
David Baker
49588da73d Fix more tests 2019-10-29 19:39:31 +00:00
David Baker
3e2d845342 Merge remote-tracking branch 'origin/develop' into dbkr/cross_signing 2019-10-28 16:47:16 +00:00
David Baker
e92d2bd70a Fix test again 
That one was part of the protocol - don't camelcase that
 2019-10-28 16:07:26 +00:00
David Baker
de1b545df1 lint 2019-10-28 15:42:42 +00:00
David Baker
3bec28b2ff make other tests pass 2019-10-28 15:23:58 +00:00
David Baker
8cad116dd7 Make tests pass 
* Pass the http backend out of makeTestClients so we can tell it
   to expect queries and flush requests out
 * Change colons to dots in the key events
 2019-10-28 14:56:35 +00:00
Hubert Chathi
35adb75d80 Merge pull request #1056 from uhoreg/fix_logger_path 
fix the path in references to logger.js
 2019-10-26 13:45:24 -04:00
Hubert Chathi
e9908b1d97 fix the path in references to logger.js 2019-10-25 23:24:30 -04:00
Hubert Chathi
fffd2eb70a Merge pull request #1050 from uhoreg/verification_in_dms 
verification in DMs
 2019-10-23 12:09:52 -04:00
Hubert Chathi
136b9c0f50 remove unnecessary async 2019-10-23 12:03:17 -04:00
Hubert Chathi
0f1206b4ee apply suggestions from review 2019-10-22 13:29:24 -04:00
RiotRobot
46d7e4c707 Merge branch 'master' into develop 2019-10-18 14:38:58 +01:00
RiotRobot
c874783742 v2.4.2 v2.4.2 2019-10-18 14:36:57 +01:00
RiotRobot
bb296f50d9 Prepare changelog for v2.4.2 2019-10-18 14:36:57 +01:00
Michael Telatynski
da68b53ff9 Merge pull request #1054 from rcsm/develop 
Properly document the function possible returns for getRelationsForEvent
 2019-10-17 15:35:33 +01:00
Rafael Cascalho
bbe141d44e chore: updated throws docs in function getRelationsForEvent 2019-10-17 11:30:41 -03:00
Rafael Cascalho
8a03e41a7c chore: corrected the docs the getRelationsForEvent function 2019-10-17 10:51:34 -03:00
Rafael Cascalho
a79e1bc976 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-17 10:15:10 -03:00
J. Ryan Stinnett
056bfbf7a3 Merge pull request #1055 from matrix-org/jryans/bluebird-3.5 
Downgrade to Bluebird 3.5.5 to fix Firefox
 2019-10-17 00:10:54 +02:00
J. Ryan Stinnett
e0b64a487d Downgrade to Bluebird 3.5.5 to fix Firefox 
Bluebird 3.6.0+ currently breaks in at least Firefox with errors in their
rejection tracking approach. For now, this retreats back to the version we had
used for a long time.

Regressed by https://github.com/matrix-org/matrix-js-sdk/pull/1053
Fixes https://github.com/vector-im/riot-web/issues/11148
 2019-10-17 00:05:47 +02:00
Rafael Cascalho
d47d1d8f26 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-15 11:12:00 -03:00
Rafael Cascalho
42a07de9a7 chore: corrected getRelationForEvent return docs 2019-10-15 10:28:23 -03:00
J. Ryan Stinnett
aead855470 Merge pull request #1053 from matrix-org/jryans/major-deps-2 
Upgrade safe deps to latest major version
 2019-10-11 13:53:58 +01:00
J. Ryan Stinnett
335b2314f1 Upgrade safe deps to latest major version 2019-10-11 12:44:36 +01:00
Travis Ralston
89bab24c14 Merge pull request #1052 from clokep/no-js-import 
Don't include .js in the import string.
 2019-10-10 00:14:52 +01:00
Patrick Cloke
3a439dcdad Don't include .js in the import string. 
Signed-off-by: Patrick Cloke <clokep@patrick.cloke.us>
 2019-10-09 18:44:41 -04:00
RiotRobot
20d82eb92f v2.4.2-rc.1 v2.4.2-rc.1 2019-10-09 16:49:43 +01:00
RiotRobot
319e1d1191 Prepare changelog for v2.4.2-rc.1 2019-10-09 16:49:42 +01:00
Hubert Chathi
5f3492dbf8 send the m.key.verification.done message when done 2019-10-09 11:13:32 -04:00
David Baker
107c8c0b1f Merge pull request #1047 from matrix-org/dbkr/olm_session_describe 
Log state of Olm sessions
 2019-10-09 15:48:54 +01:00
David Baker
8c6d9586bf Update docs to reflect minimum olm version 2019-10-09 15:41:34 +01:00
David Baker
1271fc6bf3 Actually bump olm 2019-10-09 15:38:47 +01:00
David Baker
c9df03c40c Bump to olm 3.1.4 which has olm_session_describe 2019-10-09 10:19:13 +01:00
Hubert Chathi
d8e8dddd25 initial implementation of verification in DMs 2019-10-08 15:44:51 -04:00
Bruno Windels
27f6745123 Merge pull request #1048 from matrix-org/bwindels/redact-all-more-robust 
Add method to get access to all timelines
 2019-10-08 06:58:13 +00:00
Bruno Windels
964f448334 moar doc fix 2019-10-02 15:30:28 +02:00
Bruno Windels
20ee03bb44 fix docs 2019-10-02 15:25:19 +02:00
Bruno Windels
77bd677182 add method to get access to all timelines 2019-10-02 10:00:11 +02:00
RiotRobot
e024d047e3 v2.4.1 v2.4.1 2019-10-01 11:30:13 +01:00
RiotRobot
40943edc06 Prepare changelog for v2.4.1 2019-10-01 11:30:12 +01:00
David Baker
e6699c5424 Log state of Olm sessions 
...whenever we encrypt or decrypt a message on them. This adds
another line of logging for every device in the room, so will
be reasonably verbose if you're in large encrypted rooms, but
the information ought to be valuable.

Requires https://gitlab.matrix.org/matrix-org/olm/merge_requests/9

Don't merge before a new version of Olm is released with this merge
request (it won't work).
 2019-10-01 11:19:52 +01:00
J. Ryan Stinnett
bd8a307e50 Merge pull request #1046 from matrix-org/jryans/deps-2019-09-27 
Upgrade deps
 2019-09-27 16:01:50 +01:00
J. Ryan Stinnett
f71301cafc Upgrade deps 2019-09-27 15:04:21 +01:00
RiotRobot
562bf9331b Merge branch 'master' into develop 2019-09-27 11:44:14 +01:00
RiotRobot
11e6eb94b5 v2.4.0 v2.4.0 2019-09-27 11:42:17 +01:00
RiotRobot
cee3aa2a7a Prepare changelog for v2.4.0 2019-09-27 11:42:17 +01:00
David Baker
81e3783488 Merge pull request #1043 from matrix-org/dbkr/ignore_empty_crypto_event 
Ignore crypto events with no content
 2019-09-27 10:44:17 +01:00
J. Ryan Stinnett
fc7f9786f8 Merge pull request #1045 from matrix-org/jryans/yarn-cache-clean 
Clean Yarn cache during release
 2019-09-26 11:37:18 +01:00