matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-17 21:42:17 +03:00
Code Activity
2,775 Commits 243 Branches 517 Tags
dffe0b39b67fd8c91bbcc67060c110d49bba581c
Commit Graph

2775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
a15aa0f7a4 Merge branch 'release-v0.6.4' 2016-11-02 10:30:05 +00:00
David Baker
efa1eee6e2 v0.6.4-rc.1 v0.6.4-rc.1 2016-11-02 10:26:53 +00:00
David Baker
55179f0a1a Prepare changelog for v0.6.4-rc.1 2016-11-02 10:26:53 +00:00
David Baker
01593d1a69 Set the release branch variable 
when using the current branch, otherwise we'll try to check out
the wrong thing
 2016-11-02 10:25:47 +00:00
Richard van der Hoff
40e22cfa86 Merge pull request #272 from matrix-org/dbkr/release_script_fixes 
More fixes to the release script
 2016-11-02 10:05:41 +00:00
David Baker
97aeaec8d2 More fixes to the release script 
* Don't create a new release branch if the current branch starts
   with 'release'
 * This is definitely a bash script at this point
 * Fix update_changelog test
 * Tabs
 2016-11-02 09:56:00 +00:00
David Baker
0b9f85d97b Merge pull request #271 from matrix-org/dbkr/build_process 
Update the release process to use github releases
 2016-11-01 17:43:06 +00:00
David Baker
d266486581 Check we have the various scripts 
Rather than trying to use them and failing at annoying points
 2016-11-01 16:48:16 +00:00
David Baker
c47d2fc750 too many ses(es) 2016-11-01 15:38:20 +00:00
David Baker
66c4c8882f Right repo 2016-11-01 15:37:39 +00:00
David Baker
72d7dd7690 /dist not dist 2016-11-01 15:36:37 +00:00
David Baker
fff354669c Update README to point to where releases now live 2016-11-01 14:53:26 +00:00
David Baker
07ae4b0be6 Add 'dist' script to js-sdk 
(which just runs npm build, but the presence of the dist script
will inform the release process to run it and upload release
assets)
 2016-11-01 14:36:56 +00:00
David Baker
cc51805c39 Use github release in release.sh 
Adds the 'dist' target for building assets for distribution,
which the release script will run, uploading resulting files
as release assets.
 2016-11-01 14:34:48 +00:00
David Baker
c61ac2a845 Delete aaaaaaall of dist/ 
and gitignore dist since we now just use it for build output.
 2016-10-31 18:31:24 +00:00
David Baker
6d67de06a2 Build bundled files straight to dist 
Rather than to version specific directories beneath dist, since
we're now not keeping every built version in the source tree.

Also:

 * build the minified version at the same time,
 * Include rimraf so we can rm -r dist (npm has re-ordered the
   deps)
 * Exclude olm from the bundled file
 2016-10-31 18:25:34 +00:00
Richard van der Hoff
ec1273893f Merge pull request #270 from matrix-org/dbkr/no_pack_world 
Don't package the world when we release
 2016-10-31 18:09:29 +00:00
David Baker
1e26077d58 Include browser-index.js 2016-10-31 18:06:37 +00:00
David Baker
ad67f002e3 Remove comment about syncing with .npmignore 
Given there is no longer a .npmignore
 2016-10-31 18:04:26 +00:00
David Baker
572df32dca Don't package the world when we release 
Include files explicitly rather than excluding them with .npmignore

As https://github.com/vector-im/vector-web/pull/2516
 2016-10-31 17:29:34 +00:00
David Baker
6b8181c06f Merge pull request #269 from matrix-org/luke/feature-initial-sync-filter 
Add ability to set a filter prior to the first /sync
 2016-10-26 11:37:55 +01:00
lukebarnard
5900542cfb Add ability to set a filter prior to initial sync. 
Useful for only syncing with a subset of joined rooms or only retrieving certain relevant types of events.
 2016-10-25 20:05:25 +01:00
Richard van der Hoff
a28b825c4d Merge pull request #236 from pik/get-room-tags 
Add getRoomTags method to client
 2016-10-21 14:26:52 +01:00
Richard van der Hoff
d105854619 Merge pull request #243 from matrix-org/rav/sign_one_time_keys 
Sign one-time keys, and verify their signatures
 2016-10-21 14:24:07 +01:00
Richard van der Hoff
a4f192bc88 Sign one-time keys, and verify their signatures 
We have decided that signing one-time keys is the lesser of two evils;
accordingly, use a new key algorithm type (`signed_curve25519`), sign the
one-time keys that we upload to the server, and verify the signatures on those
we download.

This will mean that develop won't be able to talk to master, but hey, we're in
beta.
 2016-10-21 12:24:19 +01:00
Richard van der Hoff
db925d7fde Merge branch 'master' into develop 2016-10-21 12:07:16 +01:00
Mark Haines
16b4865035 Merge pull request #241 from matrix-org/markjh/check_for_duplicate_message_ids 
Check for duplicate message indexes for group messages
 2016-10-21 09:55:38 +01:00
Mark Haines
20b310484b Document the format of the keys 2016-10-21 09:54:57 +01:00
Richard van der Hoff
611a191b0e Merge pull request #240 from matrix-org/rav/rotate_megolm_sessions 
Rotate megolm sessions
 2016-10-20 21:06:28 +01:00
Mark Haines
8b856b9d15 Wrap the longer lines 2016-10-20 18:02:48 +01:00
Mark Haines
3f7df0d15c Fiddle linebreaks 2016-10-20 17:59:15 +01:00
Mark Haines
e0917d3c47 Check for duplicate message indexes for group messages 2016-10-20 17:49:37 +01:00
Richard van der Hoff
19c257703c Rotate megolm sessions 
In order to mitigate backward-secrecy concerns, make sure that we rotate the
outbound megolm session at regular intervals (every week/100 msgs by default).
 2016-10-20 15:42:06 +01:00
pik
62b6262534 Add getRoomTags method 
Signed-off-by: pik <alexander.maznev@gmail.com>
 2016-10-19 10:10:33 -05:00
Richard van der Hoff
55bd3ac302 Add CONTRIBUTING.rst 2016-10-19 11:55:09 +01:00
Richard van der Hoff
7a7f345f28 Merge pull request #239 from matrix-org/rav/fix_unknown_key 
Check recipient and sender in Olm messages
 2016-10-19 11:44:48 +01:00
Richard van der Hoff
ff2282a41a Merge pull request #237 from matrix-org/rav/check_userid_in_device_list 
Consistency checks for E2E device downloads
 2016-10-19 11:30:07 +01:00
Richard van der Hoff
b5c7c700d5 Check recipient and sender in Olm messages 
Embed the sender, recipient, and recipient keys in the plaintext of Olm
messages, and check those fields on receipt.

Fixes https://github.com/vector-im/vector-web/issues/2483
 2016-10-19 11:24:59 +01:00
Richard van der Hoff
de6330fb80 Fix up failing test 
Update a failing test to include user_id and device_id in the right place.

Remove one of the cases since it's somewhat redundant to
matrix-client-crypto-spec anyway.
 2016-10-18 21:09:10 +01:00
Richard van der Hoff
aafb1ffdef Consistency checks for E2E device downloads 
Check that the user_id and device_id in device query responses match those that
we expect.

This resolves an unknown-key attack whereby Eve can re-sign Bob's keys with her
own key, thus getting Alice to send her messages which she can then forward to
Bob, making Bob think that Alice sent the messages to him.
 2016-10-18 13:40:13 +01:00
David Baker
c5d738d25c Merge pull request #235 from matrix-org/rav/delete_device_ui_auth 
Support User-Interactive auth for delete device
 2016-10-12 18:13:49 +01:00
David Baker
15d8252909 Merge pull request #234 from matrix-org/rav/interactive_auth 
Utility to help with interactive auth
 2016-10-12 18:13:36 +01:00
Richard van der Hoff
8189c58fc3 Use utils.extend instead of Object.assign 
... because javascript is awful
 2016-10-12 15:21:47 +01:00
David Baker
b3e7f4ea21 gjslint wants a space before the '='... 2016-10-12 11:42:10 +01:00
David Baker
9c9ae562ec Merge branch 'master' into develop 2016-10-12 11:38:08 +01:00
David Baker
f93eea095e Fail the build if the docs don't generate 2016-10-12 11:32:42 +01:00
David Baker
09255a52f7 Merge branch 'release-v0.6.3' 2016-10-12 11:27:05 +01:00
David Baker
6f9c8c3007 Apparently that jsdoc syntax is not valid 2016-10-12 11:24:14 +01:00
David Baker
2e99d5da64 0.6.3 v0.6.3 2016-10-12 11:11:09 +01:00
David Baker
72c8586fad Prepare changelog for v0.6.3 2016-10-12 11:07:51 +01:00