Commit Graph

9527 Commits

Author SHA1 Message Date
David Baker 588870b479 lint 2015-11-12 12:08:20 +00:00
David Baker f74bb3c145 Update UTs 2015-11-12 12:05:06 +00:00
David Baker 7095753410 Don't return non-mxc URLs by default. 2015-11-12 11:57:53 +00:00
Kegan Dougal 4f851dc431 Add isGuest/setGuest 2015-11-11 13:40:06 +00:00
Kegsay e89cc336b1 Merge pull request #46 from matrix-org/kegan/anon
Guest access endpoints
2015-11-10 17:06:04 +00:00
Kegan Dougal 959c588658 Guest rooms UTs 2015-11-10 16:49:50 +00:00
Kegan Dougal 7c887c1a5d Linting 2015-11-10 16:38:15 +00:00
Kegan Dougal 56bcf9796a Add MatrixClient.setGuestRooms
This is used in /events to grab events for the rooms the Guest is interested
in.
2015-11-10 16:36:44 +00:00
Kegan Dougal ee270314f8 Expose setting the HTTP body for extensibility 2015-11-10 16:30:41 +00:00
Kegan Dougal bda76afe4b Add a registerGuest endpoint 2015-11-10 16:25:15 +00:00
David Baker 4d426a3f31 The ts, not the event 2015-11-10 11:58:59 +00:00
Kegsay 9d33248c6e Merge pull request #45 from matrix-org/3pid-invites
Invite by 3PID endpoint
2015-11-09 17:09:35 +00:00
Kegan Dougal 46329ceb94 Remove the ability to set display_name in line with new spec 2015-11-09 16:58:52 +00:00
Kegan Dougal 2160f0bc08 Don't allow the IS URL to be configured on a per-request basis. 2015-11-09 16:51:12 +00:00
Kegan Dougal b231f19ec6 Make the display_name check for contains rather than equality. Add UT. 2015-11-09 16:50:10 +00:00
Kegan Dougal 6eb896e7a3 Use a small timeout when trying to poll when having previously failed. This makes re-connects propagate more quickly. 2015-11-09 15:55:09 +00:00
David Baker d7874315c3 Merge pull request #44 from matrix-org/implicit_read_receipts_2
Synthesize implicit read receipts in recalculateRoom
2015-11-09 15:08:04 +00:00
David Baker c95b27683f Add higher level keys to fake receipts 2015-11-09 15:05:46 +00:00
Kegan Dougal b0655d0431 Add UTs 2015-11-09 14:45:17 +00:00
David Baker ad24596d3f Revert c13b180 as it fails lint (creating functions in a loop) 2015-11-09 13:48:05 +00:00
Kegan Dougal 80a6cf34e2 Add 3pid invite endpoints 2015-11-09 11:58:45 +00:00
David Baker c13b1800b9 forEach probably nicer here 2015-11-09 10:23:37 +00:00
Kegsay b4bb0f011d Merge pull request #39 from matrix-org/matthew/room-tags
Room tag support
2015-11-09 09:34:57 +00:00
Matthew Hodgson b9ace61ccb split long lines 2015-11-07 20:26:16 +00:00
Matthew Hodgson 21273582a4 room tagging unit tests 2015-11-07 20:23:21 +00:00
Matthew Hodgson 53bbabea4f pass event in the Room.tags event 2015-11-07 20:23:09 +00:00
Matthew Hodgson 170a78a420 convert PUD POJOs to events with ugly utils.map rather than iterating in the for loop 2015-11-07 20:20:50 +00:00
Matthew Hodgson 8771ced8e4 fix jsdoc thinko 2015-11-07 17:28:37 +00:00
Matthew Hodgson dc7d2698b7 Merge branch 'develop' into matthew/room-tags 2015-11-07 17:25:53 +00:00
Matthew Hodgson 3d4694a92f fix casing of tagName 2015-11-07 17:22:45 +00:00
David Baker 8b2f94a6b2 Merge branch 'develop' into implicit_read_receipts_2 2015-11-06 15:39:16 +00:00
David Baker 6736164d98 Make linter happy (space at end of line) 2015-11-06 15:38:46 +00:00
David Baker 77266fe221 Fix lint errors and make thing that didn't need to be a member function not a member function 2015-11-06 15:26:35 +00:00
David Baker 14a48c1182 Synthesize implicit read receipts in recalculateRoom to make them correct when the room is first loaded. 2015-11-06 15:13:30 +00:00
Kegsay 5f6e52f367 Merge pull request #42 from stevenhammerton/sh-token-login
SH - CAS / Login token login
2015-11-06 14:34:48 +00:00
Steven Hammerton e71a87c62c Update javadoc 2015-11-06 12:14:24 +00:00
Steven Hammerton b963f177cc Update CAS login to return url rather than update location as the JS SDK may not be run within a browser env 2015-11-06 12:11:50 +00:00
Steven Hammerton c3097979f2 Change login with CAS to redirect to HS for CAS login 2015-11-06 11:19:32 +00:00
Kegan Dougal 21e56d2f53 Tweak RETRY_BACKOFF_RATELIMIT to take browser-request's CORS failures into account. 2015-11-05 15:48:48 +00:00
Kegsay 455ce26741 Merge pull request #40 from matrix-org/kegan/syncing
Syncing bugs/fixes
2015-11-05 14:53:47 +00:00
Steven Hammerton d241f5b3eb Add login with token method 2015-11-05 14:51:23 +00:00
David Baker d34f8eda1a Merge pull request #41 from matrix-org/implicit_read_receipts
Implicit read receipts
2015-11-05 14:42:48 +00:00
David Baker 483095c3da Fix PR comments 2015-11-05 14:41:35 +00:00
David Baker 856c34016d Fix event removal 2015-11-05 14:13:52 +00:00
David Baker ad80d4f059 fix lint errors 2015-11-05 13:57:21 +00:00
David Baker 0da547a239 Implicit read receipts
* Inject implicit read receipts into the timeline
 * Twiddle local echo a bit to make the implicit receipts match the various different stages of local echo.
2015-11-05 13:39:03 +00:00
Kegan Dougal 16278892d8 Modify how detection of the end of pagination is done
Synapse may filter down the events resulting in < 'limit' events being
returned *but it still has more events*. Change the check to see if the
request returned an empty array instead. This may add an extra HTTP hit.
2015-11-05 13:26:16 +00:00
Kegan Dougal 8500f404a9 Finish implementing UTs 2015-11-05 13:12:37 +00:00
Kegan Dougal 5d782a317c Add some sync emission tests. Emit after starting timers.
We want to emit AFTER starting the timers so tests can speed
up time. We also want to do this because clients may want to
retryImmediately() on sync errors (which would be lost unless
the timer had already been started)
2015-11-04 16:09:30 +00:00
Kegan Dougal af435204a0 More helpful logging 2015-11-04 15:40:42 +00:00