Richard van der Hoff
38e81ba61a
TimelineWindow.load: make the livetimeline case quicker
...
Avoid doing a loop round the reactor if we are just loading the live timeline.
2016-02-26 12:45:28 +00:00
Richard van der Hoff
164e4814af
Merge remote-tracking branch 'origin/develop' into rav/reset_timeline
2016-02-25 18:35:53 +00:00
Richard van der Hoff
abf908b14f
Fire a 'Room.timelineReset' event when we get a gappy sync
...
We need to reset things at the UI level when we get a gappy sync, so give the
clients something to listen for.
Also add a bunch of tests for that bit of code.
2016-02-25 18:26:11 +00:00
Richard van der Hoff
1deb2e27d8
.npmignore which includes git-revision.txt
2016-02-25 17:50:54 +00:00
Richard van der Hoff
848ffe8a40
Merge branch 'master' into develop
2016-02-25 17:29:39 +00:00
Richard van der Hoff
79c10c1b68
Remove old tarball before building new one
2016-02-25 17:23:54 +00:00
Richard van der Hoff
7e6eb89524
Empty commit to kick jenkins
2016-02-25 17:22:53 +00:00
Richard van der Hoff
3d3e52b104
s/version.txt/git-revision.txt/
2016-02-25 16:48:41 +00:00
Richard van der Hoff
05326984df
Add a 'version.txt' file to the tarball
...
This will enable the vector build to know what it got
2016-02-25 15:21:23 +00:00
Richard van der Hoff
e97e3c673f
jenkins.sh: Run npm pack after build to build tarball
2016-02-25 13:20:13 +00:00
Richard van der Hoff
f0ae46afc9
add jenkins.sh script
2016-02-25 13:17:38 +00:00
Richard van der Hoff
aaf4371fae
Merge pull request #85 from matrix-org/rav/recreate_filter_on_changes
...
Check filters before we reuse them
2016-02-24 17:22:57 +00:00
David Baker
7728009ef3
Changelog
2016-02-24 16:20:46 +00:00
Richard van der Hoff
46912431cc
make the tests pass again
2016-02-24 16:15:08 +00:00
Richard van der Hoff
6a19e08381
lint
2016-02-24 15:58:35 +00:00
Richard van der Hoff
43f392955d
Check filters before we reuse them
...
Make sure that we check the content of existing filters before we blindly reuse
them.
Fixes https://github.com/vector-im/vector-web/issues/988
2016-02-24 15:23:42 +00:00
David Baker
41d2076bd4
Merge branch 'develop'
2016-02-24 13:52:10 +00:00
David Baker
670d230f2e
Bump to 0.4.0
2016-02-24 13:49:58 +00:00
David Baker
7970f3f5a5
Merge pull request #84 from matrix-org/dbkr/keypair_3pid_invites
...
Add support for new keypair style 3pid invites
2016-02-23 16:37:48 +00:00
David Baker
567716c4f7
Use more normal promise structure
2016-02-23 11:21:29 +00:00
David Baker
518e41c078
add docs
2016-02-23 11:08:07 +00:00
David Baker
bd600f65fb
Add support for new keypair style 3pid invites (add an option to joinRoom for specifying the signing url)
2016-02-23 10:11:04 +00:00
Matthew Hodgson
363b08c4d8
don't NPE on 50x's - as per BOTS-170
2016-02-22 10:34:43 +00:00
Matthew Hodgson
2150bdc444
fix tests
2016-02-19 17:59:26 +00:00
Matthew Hodgson
5886b3358d
f1x l1nt
2016-02-19 17:56:55 +00:00
Matthew Hodgson
8b887d8559
name 3PID invite rooms better
2016-02-19 17:45:57 +00:00
Richard van der Hoff
7278c38fa6
Merge pull request #83 from matrix-org/rav/fix_context_event_ordering
...
Interpret the response from /context correctly
2016-02-19 17:12:48 +00:00
Richard van der Hoff
24ae4a8d1a
Interpret the response from /context correctly
...
events_before are backwards
Fixes https://github.com/vector-im/vector-web/issues/963
2016-02-19 17:03:47 +00:00
David Baker
923b9cad39
Merge pull request #82 from matrix-org/real_receipts
...
Add a param to getEventReadUpTo to have it ignore implicit read receipts
2016-02-19 16:20:04 +00:00
David Baker
e9f6e41550
Local echos are fake too.
2016-02-19 16:18:29 +00:00
David Baker
2950417f70
Add docs to appease jslint
2016-02-19 15:35:36 +00:00
David Baker
39f641a851
Address PR comments
2016-02-19 15:22:38 +00:00
David Baker
95fff38dbb
Add a param to getEventReadUpTo to have it ignore implicit read receipts. Store real receipts separately to make this work.
2016-02-19 14:42:07 +00:00
Richard van der Hoff
785326376a
Merge pull request #80 from matrix-org/rav/keep_redactions
...
Keep redacted events in the timeline
2016-02-17 21:41:42 +00:00
Richard van der Hoff
1baf14861c
Merge pull request #81 from matrix-org/rav/fix_timeline_after_join
...
EventTimeline: Fix baseIndex after removing the last event
2016-02-17 12:23:29 +00:00
Richard van der Hoff
8e47fe2968
Fix lint
2016-02-16 22:32:50 +00:00
Richard van der Hoff
88827fab84
EventTimeline: Fix baseIndex after removing the last event
...
Removing the last event in an EventTimeline (as we might, for instance, if it
was a local echo in an empty timeline) got us into a state where the baseIndex
would increment when adding events to the end of the timeline, causing much
confusion.
2016-02-16 22:22:26 +00:00
Richard van der Hoff
ab0a06eea7
More delinting
2016-02-16 16:19:32 +00:00
Richard van der Hoff
6a6db36088
delintificate
2016-02-16 16:14:45 +00:00
Richard van der Hoff
6f3bdcfbb6
Remember to propagate Room.redaction
2016-02-16 16:03:40 +00:00
Richard van der Hoff
4c6d0a5128
Redactions: only remove the keys that are specced for removal
2016-02-16 16:03:18 +00:00
Richard van der Hoff
5eff278454
Keep redacted events in the timeline
...
Everything gets confused when we remove events from timelines, so keep
redacted events in there, and mark them as redacted instead.
2016-02-16 12:05:13 +00:00
David Baker
c8d1e210a3
Merge pull request #79 from matrix-org/dbkr/new_reconnection_logic
...
Use only /versions requests for connection recovery
2016-02-10 11:17:29 +00:00
David Baker
8614632e54
No ES6 in the JS SDK and other lint warnings.
2016-02-10 10:48:03 +00:00
David Baker
c3796c61cd
Use a promise for when the connection comes back
2016-02-10 10:40:42 +00:00
David Baker
6224aff882
improve comment as per PR review
2016-02-10 10:09:39 +00:00
David Baker
e506a1b2de
Oops: set keepAliveTimer!
2016-02-09 17:39:30 +00:00
David Baker
b40a6d1481
remember bound function as it returns a new reference each time
2016-02-09 17:06:20 +00:00
David Baker
5c8f73019e
lint
2016-02-09 16:22:12 +00:00
David Baker
3cfc4f8ba5
Add short delay to treating a 400 as a success to avoid hammering in a loop.
2016-02-09 16:17:52 +00:00
