Richard van der Hoff
f2336aaedf
Merge to master before develop
...
This avoids picking up things which have been landed on develop since the
release process started.
2016-03-11 12:17:29 +00:00
Richard van der Hoff
16ab2fd82a
Add uglifyjs to devDependencies
...
The release script requires it, so we better install it
2016-03-11 12:15:00 +00:00
Richard van der Hoff
295fda027c
Build 0.4.1
2016-03-11 12:00:44 +00:00
Richard van der Hoff
28e6f00766
Prep r0.4.1
2016-03-11 11:50:47 +00:00
Richard van der Hoff
b1988de753
Merge branch 'master' into develop
2016-03-11 11:27:52 +00:00
Kegsay
0302eefd3c
Update RELEASING.md
2016-03-11 11:05:55 +00:00
Kegsay
8ad5605e49
Update RELEASING.md
2016-03-11 11:03:00 +00:00
Kegsay
4b5539fe53
Create RELEASING.md
2016-03-11 10:58:39 +00:00
Richard van der Hoff
b0becbc8d5
Merge pull request #97 from matrix-org/rav/updates_on_send_fail
...
Raise localEchoUpdated events in more places
2016-03-10 14:19:30 +00:00
Richard van der Hoff
4ae353d3d3
Raise localEchoUpdated events in more places
...
We need to know about more transitions for local-echo status changes, so raise
localEchoUpdated events for each transition.
Fixes an issue where we weren't turning failed transmissions red, because the
timeline wasn't being updated.
2016-03-10 12:07:27 +00:00
Richard van der Hoff
b4b8b4bfb8
Merge pull request #95 from matrix-org/rav/raise_event_on_remote_echo
...
Emit an event when a local-echo is turned into a proper event
2016-03-08 16:40:03 +00:00
Richard van der Hoff
909a8a0648
Merge pull request #96 from matrix-org/rav/no_pagination_tightloop
...
Work around confused timelines causing pagination loops
2016-03-08 16:39:46 +00:00
Richard van der Hoff
234c227fd5
Work around confused timelines causing pagination loops
...
Look out for us getting stuck in a loop of using the same pagination token,
and use something else next time.
Hopefully this will fix https://github.com/vector-im/vector-web/issues/1089 .
2016-03-08 15:38:00 +00:00
Richard van der Hoff
78eded3bbd
Emit an event when a local-echo is turned into a proper event
...
We need to trigger an update of the timeline when this happens, so raise an
event for it.
2016-03-08 15:00:19 +00:00
David Baker
f324e4c72f
lint
2016-03-03 17:48:23 +00:00
David Baker
9328a12ccb
Add maySendStateEvent method, ported from react-sdk (but fixed). Plus tests.
2016-03-03 17:44:27 +00:00
Richard van der Hoff
51380f8116
Merge pull request #93 from matrix-org/rav/another_timeline_race
...
Set the back-pagination token before raising Room.timelineReset
2016-03-02 11:41:20 +00:00
Richard van der Hoff
cfd96969fc
Add unit tests for setting the pagination token on sync
2016-03-01 13:58:29 +00:00
Richard van der Hoff
0034bdf4ad
Set the back-pagination token before raising Room.timelineReset
...
This fixes another race condition on gappy syncs, wherein we weren't
back-paginating back from the start of the gappy sync.
2016-03-01 13:35:22 +00:00
Richard van der Hoff
00af1ce7d2
Merge pull request #92 from matrix-org/rav/sync_left_rooms_test
...
Add a unit test for syncLeftRooms
2016-03-01 13:19:12 +00:00
Richard van der Hoff
76f84c54db
Add a unit test for syncLeftRooms
...
We don't have *any* tests for syncLeftRooms right now, so start one.
2016-03-01 12:12:49 +00:00
Mark Haines
bb4766c8c6
Merge pull request #90 from matrix-org/markjh/change_push_actions
...
Add setPushRuleActions method for setting the actions for push notifi…
2016-03-01 10:10:38 +00:00
Richard van der Hoff
e287e7591b
Merge pull request #91 from matrix-org/rav/fix_stuck_pagination_after_join
...
Don't reset the timeline when we join a room after peeking
2016-03-01 09:10:21 +00:00
David Baker
48f7aca121
Merge pull request #89 from matrix-org/dbkr/invite_name_from_member_event
...
Use our inviter's member event to get their display name if it exists.
2016-02-29 18:05:27 +00:00
Richard van der Hoff
a14f9e6d1c
Don't reset the timeline when we join a room after peeking
...
If we've already got all the events in a limited sync, there is no need to reset
the timeline.
2016-02-29 17:25:20 +00:00
David Baker
5fefcd8ce3
pep8
2016-02-29 13:53:55 +00:00
David Baker
76f1d24c7b
Make room name generation slightly more sane and add unit tests fir invite naming.
2016-02-29 13:51:55 +00:00
Mark Haines
066dd77aba
Add setPushRuleActions method for setting the actions for push notification rules
2016-02-26 16:47:22 +00:00
David Baker
45a3bf63b2
Use our inviter's member event to get their display name if it exists.
2016-02-26 14:11:10 +00:00
Richard van der Hoff
75f2efffac
Merge pull request #88 from matrix-org/rav/optimise_timeline_load
...
TimelineWindow.load: make the livetimeline case quicker
2016-02-26 13:27:40 +00:00
Richard van der Hoff
0584ec3319
Merge pull request #87 from matrix-org/rav/reset_timeline
...
Fire a 'Room.timelineReset' event when we get a gappy sync
2016-02-26 13:27:25 +00:00
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
