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
2,982 Commits 237 Branches 514 Tags
f41060c39a5385348e4dd71cdd54d2f87d5eb76c
Commit Graph

2982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
André Jaenisch
f41060c39a Replace console.log with loglevel logger. Fixes #332 
Signed-off-by: André Jaenisch <andre.jaenisch@posteo.de>
 2018-10-24 00:48:57 +02:00
André Jaenisch
bbb8e12bac Create logger module. Refs #332 
Signed-off-by: André Jaenisch <andre.jaenisch@posteo.de>
 2018-10-24 00:48:57 +02:00
André Jaenisch
d0e1471c91 Added loglevel library. Refs #332 
Signed-off-by: André Jaenisch <andre.jaenisch@posteo.de>
 2018-10-24 00:48:52 +02:00
Aaron Raimist
8d35bea830 Add repository type to package.json to make it valid 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-20 21:38:04 -05:00
Travis Ralston
1061026f96 Merge pull request #761 from Half-Shot/hs/upload-limits 
Add getMediaConfig()
 2018-10-16 09:04:08 -06:00
Will Hunt
e638c49160 Merge remote-tracking branch 'upstream/develop' into hs/upload-limits 2018-10-16 11:32:21 +01:00
David Baker
5d84db9fb7 Merge branch 'release-v0.12.0' 2018-10-16 10:49:14 +01:00
David Baker
874bdea634 v0.12.0 v0.12.0 2018-10-16 10:47:33 +01:00
David Baker
68497d3a1f Prepare changelog for v0.12.0 2018-10-16 10:47:32 +01:00
David Baker
874029dff0 oops - fix changelog format in retrospect 2018-10-11 15:38:34 +01:00
David Baker
6aff3ed407 v0.12.0-rc.1 v0.12.0-rc.1 2018-10-11 14:42:29 +01:00
David Baker
c0ae78ae82 Prepare changelog for v0.12.0-rc.1 2018-10-11 14:42:29 +01:00
David Baker
8b22f01ecd Merge pull request #760 from matrix-org/bwindels/fixleavesinmemberlist 
never replace /sync'ed memberships with OOB ones
 2018-10-11 14:01:38 +01:00
Bruno Windels
2ed694b041 remove supersedes OOB logic 2018-10-11 14:32:03 +02:00
Bruno Windels
a0ef6ab811 typo 2018-10-11 14:14:42 +02:00
Bruno Windels
d098b39024 never replace /sync'ed memberships with OOB ones 2018-10-11 14:11:40 +02:00
David Baker
3cf23f8a5c Document breaking change 2018-10-11 12:13:25 +01:00
Bruno Windels
72e77d237a Merge pull request #759 from matrix-org/dbkr/lazy_load_check_before_sync 
Don't fail to start up if lazy load check fails
 2018-10-10 18:28:47 +02:00
David Baker
ecc3e18e85 typo 2018-10-10 17:27:06 +01:00
David Baker
dea70af889 remove debug logging 2018-10-10 17:06:26 +01:00
David Baker
30362091e5 Don't fail to start up if lazy load check fails 
Do the lazy loading check in the batch of things we do before
starting a sync rather than at client start time, so we don't fail
to start the client if we can't hit the HS to determine LL support.

Fixes https://github.com/vector-im/riot-web/issues/7455
 2018-10-10 16:59:36 +01:00
David Baker
0aa3362671 Merge pull request #754 from matrix-org/dbkr/e2e_on_interslice 
Make e2e work on Edge
 2018-10-09 10:48:24 +01:00
David Baker
92fbf58b13 Merge pull request #758 from matrix-org/bwindels/betteridberrors 
throw error with same name and message over idb worker boundary
 2018-10-09 09:59:55 +01:00
Bruno Windels
a4b2cc84c7 Merge pull request #755 from matrix-org/travis/fix-vuln-warning 
Default to a room version of 1 when there is no room create event
 2018-10-08 09:55:10 +02:00
David Baker
1395da694e Merge pull request #757 from matrix-org/dbkr/gone_away_is_the_bluebird 
Silence bluebird warnings
 2018-10-05 13:25:16 +01:00
David Baker
264b20535e Silence bluebird warnings 2018-10-05 12:13:05 +01:00
Bruno Windels
caba350b33 throw error with same name and message over idb worker boundary 
instead of string currently thrown. This allows handling error
from the main thread.
 2018-10-05 12:48:12 +02:00
Travis Ralston
d9fe194111 Default to a room version of 1 when there is no room create event 
Fixes https://github.com/vector-im/riot-web/issues/7331

There is something to be worried about when there is no room create event, however. This should always be available, although due to cache problems or servers that don't provide the event we can't be sure of this.
 2018-10-04 13:42:07 -06:00
David Baker
40dc13b2e2 lint try 2 2018-10-04 15:38:08 +01:00
David Baker
4cda54ca1c lint 2018-10-04 15:15:30 +01:00
David Baker
8116c5b3f7 Make e2e work on Edge 
We were sucessfully opening indexeddb but any queries using compound
indicies were failing because Edge doesn't support them, so messages
were failing to decrypt with 'DataError'.

Try a dummy query at startup, so if it fails we fall back to a
different store (ie. end up using localstorage on Edge).
 2018-10-04 13:49:32 +01:00
Bruno Windels
1dcc5127d0 Merge pull request #750 from matrix-org/bwindels/allownonffmerge 
allow non-ff merge from release branch into master
 2018-10-04 10:22:02 +02:00
Bruno Windels
6790699279 Merge pull request #739 from matrix-org/ben/new-examples 
add new examples, to be expanded into a post
 2018-10-04 10:21:36 +02:00
David Baker
85e3d7083c Merge pull request #751 from matrix-org/dbkr/indexeddb_errors 
Reject with the actual error on indexeddb error
 2018-10-03 16:22:26 +01:00
David Baker
bd2da08c4e Reject with the actual error on indexeddb error 
Rather than the event
 2018-10-02 16:48:27 +01:00
Bruno Windels
0a88d419c6 allow non-ff merge from release branch into master 2018-10-01 17:21:01 +02:00
Bruno Windels
80c190db36 Merge branch 'master' into develop 2018-10-01 15:40:16 +02:00
Bruno Windels
550cf00ee7 Merge branch 'release-v0.11.1' 2018-10-01 15:36:37 +02:00
Ben Parsons
fbca7951fc improvements suggested by Bruno 2018-10-01 14:29:24 +01:00
Bruno Windels
1e1358fcef v0.11.1 v0.11.1 2018-10-01 15:23:37 +02:00
Bruno Windels
fd1b3329f5 Prepare changelog for v0.11.1 2018-10-01 15:23:37 +02:00
Bruno Windels
9c9d8468a5 Merge pull request #744 from matrix-org/dbkr/update_mocha 
Update mocha to v5
 2018-09-28 12:57:49 +01:00
David Baker
6f59d62e5c Merge pull request #748 from matrix-org/bwindels/nollforguests 
disable lazy loading for guests as they cant create filters
 2018-09-27 19:29:54 +01:00
Bruno Windels
1c348f0cdb disable lazy loading for guests as they cant create filters 2018-09-27 18:55:21 +01:00
Bruno Windels
634596257d v0.11.1-rc.1 v0.11.1-rc.1 2018-09-27 11:47:28 +01:00
Bruno Windels
5e4973a1dc changelog 2018-09-27 11:45:33 +01:00
Bruno Windels
19f023e0ee Revert "v0.11.1-rc.1" 
This reverts commit 090c15fe19.
 2018-09-27 11:42:19 +01:00
Bruno Windels
090c15fe19 v0.11.1-rc.1 2018-09-27 11:38:25 +01:00
Bruno Windels
e8b307dc4f Prepare changelog for v0.11.1-rc.1 2018-09-27 11:38:25 +01:00
Bruno Windels
056479d450 Revert "v0.11.1-rc.1" 
This reverts commit 847d40e567.
 2018-09-27 11:35:52 +01:00