summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Update docstringErik Johnston2014-09-292-2/+3
* SYN-48: Delete dead codeErik Johnston2014-09-291-26/+0
* SYN-48: Fix typo. Get the whois for requested user rather tahan the requesterErik Johnston2014-09-291-1/+1
* SYN-48: Implement WHOIS rest servletErik Johnston2014-09-299-25/+190
* Add auth check to test if a user is an admin or not.Erik Johnston2014-09-292-0/+11
* SYN-48: Track User-Agents as well as IPs for client devices.Erik Johnston2014-09-294-5/+20
* Track the IP users connect with. Add an admin column to users table.Erik Johnston2014-09-266-9/+57
* Just use a yaml list for turn serversDavid Baker2014-09-251-1/+1
* Bump version and changelogErik Johnston2014-09-251-1/+1
* Merge branch 'deletions' of github.com:matrix-org/synapse into developErik Johnston2014-09-2515-26/+268
|\
| * Don't strip out null's in serialized events, as that is not need anymore and ...Erik Johnston2014-09-251-1/+2
| * Don't strip of False values from events when serializingErik Johnston2014-09-251-1/+1
| * Add LIMIT to scalar subqueryErik Johnston2014-09-253-5/+10
| * Rename deletions to redactionsErik Johnston2014-09-2416-74/+77
| * Make deleting deletes not undeleteErik Johnston2014-09-241-14/+4
| * Fix bug where we didn't correctly pull out the event_id of the deletionErik Johnston2014-09-242-3/+8
| * Fill out the prune_event method.Erik Johnston2014-09-241-6/+31
| * Add v4 deltas to current sql.Erik Johnston2014-09-243-1/+10
| * Rename 'pruned' to 'pruned_because'Erik Johnston2014-09-233-3/+3
| * SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops lev...Erik Johnston2014-09-234-6/+43
| * Add prune_event methodErik Johnston2014-09-231-0/+39
| * Make sure we don't persist the 'pruned' keyErik Johnston2014-09-231-1/+1
| * Add m.room.deletion. If an event is deleted it will be returned to clients 'p...Erik Johnston2014-09-239-21/+144
| * Add a deletions tableErik Johnston2014-09-221-0/+5
* | Fix bug where we tried to insert state events with null state keyErik Johnston2014-09-251-1/+2
* | Merge branch 'turn' into developDavid Baker2014-09-254-2/+105
|\ \
| * | Make turn server endpoint return an empty object if no turn servers toDavid Baker2014-09-252-2/+2
| * | The REST API spec only alows for returning a single server so name theDavid Baker2014-09-241-1/+1
| * | OopsDavid Baker2014-09-241-1/+1
| * | rename endpoint to better reflect what it is and allow specifying multiple urisDavid Baker2014-09-242-8/+6
| * | Use standard base64 encoding with padding to get the same result asDavid Baker2014-09-241-2/+5
| * | The config is not hierarchicalDavid Baker2014-09-231-3/+3
| * | Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/...David Baker2014-09-234-2/+104
* | | SYN-46: An invite received from fedearation didn't wake up the event stream f...Erik Johnston2014-09-251-1/+9
* | | Don't set the room name to be the room alias on room creation if the client d...Erik Johnston2014-09-241-11/+0
* | | SYN-70: And fix another bug where I can't typeErik Johnston2014-09-241-1/+1
* | | SYN-70: Fix typoErik Johnston2014-09-241-1/+1
* | | Bugfix for older Pythons that lack hmac.compare_digest()Paul "LeoNerd" Evans2014-09-231-1/+11
* | | Merge branch 'jira/SYN-60' into developPaul "LeoNerd" Evans2014-09-232-6/+44
|\ \ \
| * | | Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather th...Paul "LeoNerd" Evans2014-09-231-7/+26
| * | | Config values are almost never 'None', but they might be empty string. Detect...Paul "LeoNerd" Evans2014-09-231-1/+1
| * | | Make sure the config actually /has/ a captcha_bypass_secret set before trying...Paul "LeoNerd" Evans2014-09-231-2/+3
| * | | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared se...Paul "LeoNerd" Evans2014-09-232-6/+24
| |/ /
* / / Implemented /rooms/$roomid/state API.Kegan Dougal2014-09-232-6/+23
|/ /
* / Bump versions and changelog v0.3.3Erik Johnston2014-09-221-1/+1
|/
* SYN-47: Fix bug where we still returned events for rooms we had left.Erik Johnston2014-09-191-1/+1
* formattingKegan Dougal2014-09-191-5/+9
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-181-1/+1
|\
| * Bump Changelog and version v0.3.2Erik Johnston2014-09-181-1/+1
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-181-1/+1
|\|
| * Bump changelog and versions v0.3.1Erik Johnston2014-09-181-1/+1
* | Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into developErik Johnston2014-09-1811-115/+164
|\ \ | |/ |/|
| * Merge branch 'develop' into test-sqlite-memoryPaul "LeoNerd" Evans2014-09-1714-140/+500
| |\
| * | Print expected-vs-actual data types on typecheck failure from check_json()Paul "LeoNerd" Evans2014-09-171-1/+2
| * | Merge remote-tracking branch 'origin/develop' into test-sqlite-memoryPaul "LeoNerd" Evans2014-09-1513-19/+61
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into test-sqlite-memoryPaul "LeoNerd" Evans2014-09-125-95/+100
| |\ \ \
| * | | | More accurate docs / clearer paramter names in RoomMemberStorePaul "LeoNerd" Evans2014-09-121-6/+7
| * | | | Revert recent changes to RoomMemberStorePaul "LeoNerd" Evans2014-09-122-28/+10
| * | | | Now don't need the other logger.debug() call in _executePaul "LeoNerd" Evans2014-09-121-5/+0
| * | | | Logging of all SQL queries via the 'synapse.storage.SQL' loggerPaul "LeoNerd" Evans2014-09-121-2/+43
| * | | | Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_poolPaul "LeoNerd" Evans2014-09-128-33/+42
| * | | | Add a better _store_room_member_txn() method that takes separated fields inst...Paul "LeoNerd" Evans2014-09-111-8/+21
| * | | | Rename _store_room_member_txn to _store_room_member_from_event_txn so we can ...Paul "LeoNerd" Evans2014-09-112-2/+2
| * | | | prepare_database() on db_conn, not plain name, so we can pass in the connecti...Paul "LeoNerd" Evans2014-09-102-32/+35
| * | | | Make sure not to open our TCP ports until /after/ the DB is nicely prepared r...Paul "LeoNerd" Evans2014-09-101-1/+2
| * | | | No need for a tiny run() function any more, just use reactor.run() directlyPaul "LeoNerd" Evans2014-09-101-6/+2
| * | | | Move database preparing code out of homserver.py into storage where it belongsPaul "LeoNerd" Evans2014-09-103-64/+71
* | | | | Bump versionsErik Johnston2014-09-171-1/+1
* | | | | SYWEB-3 : Added 'visibility' key to rooms returned via /initialSyncKegan Dougal2014-09-171-0/+5
* | | | | SYN-40: When a user updates their displayname or avatar update all their join...Erik Johnston2014-09-171-3/+43
| |_|_|/ |/| | |
* | | | Comment out password reset for now, until the mechanism is fully discussed (I...Kegan Dougal2014-09-161-1/+1
* | | | Added support for the HS to send emails. Use it to send password resets. Adde...Kegan Dougal2014-09-164-2/+130
* | | | Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to...Kegan Dougal2014-09-162-1/+50
* | | | Fix bug where we didn't always get 'prev_content' keyErik Johnston2014-09-151-4/+1
* | | | Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than t...Erik Johnston2014-09-152-2/+4
* | | | Correctly handle receiving 'missing' Pdus from federation, rather than just d...Erik Johnston2014-09-152-12/+15
* | | | Improve logging in federation handler.Erik Johnston2014-09-151-1/+3
* | | | Fix 'age' key to update on retriesErik Johnston2014-09-153-8/+41
* | | | More helpful 400 error messages.Kegan Dougal2014-09-151-1/+5
* | | | Be consistent when associating keys with login types for registration/login.Kegan Dougal2014-09-151-1/+1
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into registration-api...Kegan Dougal2014-09-1510-15/+51
|\ \ \ \ | | |_|/ | |/| |
| * | | Correctly handle the 'age' key in events and pdusErik Johnston2014-09-1510-15/+51
* | | | Make captcha work again with the new registration logic.Kegan Dougal2014-09-151-0/+1
* | | | Split out password/captcha/email logic.Kegan Dougal2014-09-152-140/+217
* | | | Added LoginType constants. Created general structure for processing registrat...Kegan Dougal2014-09-152-20/+84
|/ / /
* | | Bump version and change logErik Johnston2014-09-121-1/+1
* | | Fix bug where we relied on the current_state_events being updated when we are...Erik Johnston2014-09-121-2/+2
* | | Fix bug where we no longer stored user_id on PdusErik Johnston2014-09-121-1/+7
| |/ |/|
* | Make the state resolution use actual power levels rather than taking them fro...Erik Johnston2014-09-124-82/+54
* | Fix bug where we incorrectly removed a remote host from the list of hosts in ...Erik Johnston2014-09-121-12/+45
* | Fix bug where we didn't return a tuple when expected.Erik Johnston2014-09-121-1/+1
|/
* Fix bug where we used an unbound local variable if we ended up rolling back t...Erik Johnston2014-09-091-4/+1
* Apparently we can't do txn.rollback(), so raise and catch an exception instead.Erik Johnston2014-09-081-11/+19
* Added num_joined_users key to /publicRooms for each room. Show this informati...Kegan Dougal2014-09-081-0/+6
* Handle the case where we don't have a common ancestorErik Johnston2014-09-081-9/+18
* Fix bug in state handling where we incorrectly identified a missing pdu. Upda...Erik Johnston2014-09-082-52/+49
* Rollback if we try and insert duplicate eventsErik Johnston2014-09-081-0/+1
* Fix race in presence handler where we evicted things from cache while handlin...Erik Johnston2014-09-081-2/+3
* Bump version and changelogErik Johnston2014-09-081-1/+1
* Fix bug where we used an event_id as a pdu_idErik Johnston2014-09-061-3/+5
* Added captcha support on both the HS and web client.Kegan Dougal2014-09-056-10/+182
|\
| * Reload captchas when they fail. Cleanup on success.Kegan Dougal2014-09-051-2/+2
| * 80 chars pleaseKegan Dougal2014-09-052-11/+23
| * Add config opion for XFF headers when performing ReCaptcha auth.Kegan Dougal2014-09-053-2/+12
| * Captchas now work on registration. Missing x-forwarded-for config arg support...Kegan Dougal2014-09-054-7/+115
| * Added a captcha config to the HS, to enable registration captcha checking and...Kegan Dougal2014-09-054-2/+44
* | Fix generation of event ids so that they are consistent between local and rem...Erik Johnston2014-09-061-1/+4
* | When getting a state event also include the previous contentErik Johnston2014-09-065-13/+43
* | Add support for inviting people when you create a roomErik Johnston2014-09-061-0/+26
* | Validate power levels event changes. Change error messages to be more helpful...Erik Johnston2014-09-051-10/+37
* | Generate m.room.aliases event when the HS creates a room aliasErik Johnston2014-09-0510-18/+94
|/
* Empty string is not a valid JSON object, so don't return them in HTTP responses.Erik Johnston2014-09-053-7/+7
* AUth the contents of power level eventsErik Johnston2014-09-051-1/+72
* Change the default power levels to be 0, 50 and 100Erik Johnston2014-09-052-10/+10
* Bump versions. Update change logs.Erik Johnston2014-09-031-1/+1
* Added a TODO note about YAML modeline for editorsPaul "LeoNerd" Evans2014-09-031-0/+3
* Error code must be an integerErik Johnston2014-09-031-1/+1
* Import SynapseErrorErik Johnston2014-09-031-0/+1
* Handle timeouts slightly nicer.Erik Johnston2014-09-031-1/+5
* Don't do auth for change_membership in federation handler, it doesn't work an...Erik Johnston2014-09-031-2/+3
* When creating a room and a user supplies a room_alias but no name, use the ro...Erik Johnston2014-09-031-0/+11
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-09-0398-350/+757
|\
| * Add support to _simple_insert() to do INSERT OR REPLACEPaul "LeoNerd" Evans2014-09-031-4/+6
| * Implement a kick apiErik Johnston2014-09-031-2/+5
| * Default PID file should be 'homeserver.pid' to match the other 'homeserver.*'...Paul "LeoNerd" Evans2014-09-031-1/+1
| * fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org has...Matthew Hodgson2014-09-0397-97/+97
| * Limit the size of uploadsMark Haines2014-09-033-1/+55
| * Bubble up SynapseErrors so expected failures aren't masked.Kegan Dougal2014-09-031-0/+2
| * Add exception handling to directory servlet, so we don't 500. Mark directory ...Kegan Dougal2014-09-031-2/+16
| * Fix up directory server to not require uploading room hosts. Update the room ...Erik Johnston2014-09-032-2/+11
| * Handle new state events which don't have a common ancestorErik Johnston2014-09-031-0/+12
| * Snapshot prev_state for generic eventsErik Johnston2014-09-031-1/+6
| * Kill the statePaul "LeoNerd" Evans2014-09-032-31/+6
| * Bugfix for back-pagination of presencePaul "LeoNerd" Evans2014-09-031-0/+2
| * Make retrying requests on DNS failures configurable, and turn off retrying on...Kegan Dougal2014-09-032-7/+24
| * Store SQL DDL deltas as well; attempt to upgrade the database on startup if i...Paul "LeoNerd" Evans2014-09-032-7/+183
| * hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately.Kegan Dougal2014-09-031-1/+6
| * Implement presence state visibilty limiting when polling eventsource for streamPaul "LeoNerd" Evans2014-09-031-9/+57
| * Don't eat federation transmit errors during unit tests; fix remote presence E...Paul "LeoNerd" Evans2014-09-031-1/+0
| * Make sure to print exceptions properly from notifier failuresPaul "LeoNerd" Evans2014-09-031-1/+6
| * Updated feedback api docs and fixed feedback content template bugKegan Dougal2014-09-031-2/+1
| * apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in i...Kegan Dougal2014-09-031-0/+8
| * Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-09-037-174/+222
| |\
| | * Edited /presence REST servlet to raise SynapseErrors to return a standard err...Kegan Dougal2014-09-031-7/+12
| | * Update API docs to use 'presence' key not 'state'. Fixed error messages when ...Kegan Dougal2014-09-031-1/+1
| | * Fixed /presence APIs to urldecode user IDs.Kegan Dougal2014-09-031-1/+5
| | * Fixed GET /events/$id to be not broken.Kegan Dougal2014-09-031-1/+3
| | * move contentrepo class to it's own fileMark Haines2014-09-033-163/+194
| | * URL decode user IDs for /profile REST path segments.Kegan Dougal2014-09-031-0/+6
| * | Add option to change content repo locationErik Johnston2014-09-033-4/+20
| |/
| * Rename the 'do_users_share_a_room' to something slightly less verb-soundingPaul "LeoNerd" Evans2014-09-032-2/+2
| * Allow optional non-suppression of exceptions through the DistributorPaul "LeoNerd" Evans2014-09-031-4/+13
| * Neater is_presence_visible() codePaul "LeoNerd" Evans2014-09-031-9/+8
* | Add support for registering with a threepid to the HS (get credentials from t...David Baker2014-09-033-9/+100
|/
* Merge branch 'master' into developErik Johnston2014-09-032-3/+3
|\
| * Bump version and changelogErik Johnston2014-09-021-1/+1
| * Update default endpoint port to match the default ports in the configErik Johnston2014-09-021-2/+2
* | Add ban support: /rooms/$roomid/ban with { user_id : foo }Kegan Dougal2014-09-031-2/+2
* | Add copyright notices and fix pyflakes errorsMark Haines2014-09-037-7/+59
* | Set status message for ratelimit error responsesMark Haines2014-09-033-6/+12
* | Merge branch 'ratelimiting' into developMark Haines2014-09-039-8/+141
|\ \ | |/ |/|
| * Raise LimitExceedError when the ratelimiting is throttling requestsMark Haines2014-09-032-11/+29
| * rate limiting for message sendingMark Haines2014-09-024-4/+7
| * Add ratelimiting configMark Haines2014-09-021-0/+21
| * Add ratelimiting function to basehandlerMark Haines2014-09-025-1/+27
| * Test ratelimiterMark Haines2014-09-021-19/+48
| * Ratelimiter objectMark Haines2014-09-021-0/+36
* | Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0Erik Johnston2014-09-022-3/+20
|\ \
| * | v0.1.2 v0.1.2David Baker2014-08-291-1/+1
| * | Version bump for bug fix. v0.1.1Erik Johnston2014-08-291-1/+1
| * | When notifying listeners, don't do so in a serial fashionErik Johnston2014-08-291-2/+19
| * | Bump version and change log v0.1.0Erik Johnston2014-08-291-1/+1
* | | Order matters when adding REST servletsPaul "LeoNerd" Evans2014-09-021-21/+21
* | | Fix bug where we didn't correctly store the ops power levels event.Erik Johnston2014-09-023-1/+9
* | | Add rest endpoint for the whole user profileDavid Baker2014-09-021-0/+21
* | | Safer handling of incoming presence EDUs that may or maynot contain 'presence...Paul "LeoNerd" Evans2014-09-021-3/+13
* | | 'continue' to go to the next item in a for loop, not 'break'Paul "LeoNerd" Evans2014-09-021-1/+1
* | | By default, only room ops can change the name and topic.Erik Johnston2014-09-021-0/+2
| |/ |/|
* | Remove option for disabling webclient because it was confusingMark Haines2014-09-021-4/+1
* | Implement auth for kicking.Erik Johnston2014-09-021-3/+10
* | Add message to assertionErik Johnston2014-09-021-1/+1
* | Default HTTP and HTTPS ports to 8008 and 8448Erik Johnston2014-09-021-2/+4
* | os.makedirs is almost but not entirely unlike mkdir -pMark Haines2014-09-021-1/+2
* | Fix typo when reading TLS configMark Haines2014-09-021-1/+1
* | Make the config directory if the directory doesn't exisit when generating configMark Haines2014-09-021-0/+1
* | More helpful error messages for missing configMark Haines2014-09-023-6/+29
* | Add support for setting room name and topic when creating roomsErik Johnston2014-09-021-4/+29
* | given everything's apparently gone https:// by default for c-s, change this h...Matthew Hodgson2014-09-011-1/+5
* | Add unsecure listener port to homeserverMark Haines2014-09-012-8/+17
* | enable ECDHE ciphersMark Haines2014-09-011-0/+6
* | Reënable presence visibility permission checking now it's not used on redund...Paul "LeoNerd" Evans2014-09-011-4/+0
* | No need to test is_presence_visible in _start_polling_local because we know i...Paul "LeoNerd" Evans2014-09-011-4/+0
* | specify metavars in argparseMatthew Hodgson2014-09-011-2/+3
* | Use yaml for config fileMark Haines2014-09-011-11/+6
* | Don't set a 'default' key in the creation eventErik Johnston2014-09-011-1/+0
* | Use pregenerated DH params when generating configMark Haines2014-09-011-7/+29
* | That was a breaking db change. You need to recreate the databases. (In realit...Erik Johnston2014-09-011-1/+1
* | Don't put required power levels on permission state eventsErik Johnston2014-09-011-2/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-0115-246/+634
|\ \
| * | Fix SSL for federation http clientMark Haines2014-09-012-2/+2
| * | Enable SSL for s2s http clientMark Haines2014-09-012-3/+7
| * | Add server TLS context factoryMark Haines2014-09-011-0/+23
| * | Merge branch 'develop' into server2server_tlsMark Haines2014-09-012-0/+14
| |\ \
| * | | Listen using SSLMark Haines2014-09-012-2/+8
| * | | Merge branch 'develop' into server2server_tlsMark Haines2014-09-012-34/+84
| |\ \ \
| * | | | Fix homeserver config parsingMark Haines2014-09-017-34/+45
| * | | | Merge branch 'develop' into server2server_tlsMark Haines2014-09-019-178/+196
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into server2server_tlsMark Haines2014-08-3118-333/+652
| |\ \ \ \ \
| | * | | | | Add config tree to synapse. Add support for reading config from a fileMark Haines2014-08-319-231/+441
| | | |_|_|/ | | |/| | |
| * | | | | Add store for server certificates and keysMark Haines2014-08-283-1/+135
* | | | | | Add all the necessary checks to make banning work.Erik Johnston2014-09-016-6/+54
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-013-34/+98
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Bump a user's presence last_active time every time they send a message to a roomPaul "LeoNerd" Evans2014-09-012-0/+10
| * | | | | Perform room unit tests with 'local' users actually in the right domain ;)Paul "LeoNerd" Evans2014-09-011-0/+4
| | |_|_|/ | |/| | |
| * | | | Rename API-visible 'mtime' presence field to 'last_active'; slightly differen...Paul "LeoNerd" Evans2014-09-011-23/+49
| * | | | Rename 'state' presence key to the much more obvious 'presence'; maintain a l...Paul "LeoNerd" Evans2014-09-012-12/+36
| | |_|/ | |/| |
* | | | Add beginnings of ban support.Erik Johnston2014-09-018-29/+122
* | | | Implement power level lists, default power levels and send_evnet_level/add_st...Erik Johnston2014-09-017-48/+218
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-019-178/+196
|\| | |
| * | | missed a s#/matrix#/_matrix/gMatthew Hodgson2014-08-311-1/+1
| * | | change the world: make the default matrix API URL prefix /_matrix rather than...Matthew Hodgson2014-08-311-4/+4
| * | | Bugfixes on presence pushes on user joining:Paul "LeoNerd" Evans2014-08-291-9/+8
| * | | Renamed get_current_token_part to get_current_keyPaul "LeoNerd" Evans2014-08-294-10/+10
| * | | Have EventSource's get_new_events_for_user() API work only on keys within tha...Paul "LeoNerd" Evans2014-08-295-30/+33
| * | | TypingNotificationEventSource has to return proper tokens, not int 0Paul "LeoNerd" Evans2014-08-291-2/+2
| * | | Rename 'events_key' to 'room_key' so it matches the name of the event sourcePaul "LeoNerd" Evans2014-08-294-10/+10
| * | | Define a new event stream data source for typing notifications (currently null)Paul "LeoNerd" Evans2014-08-293-8/+28
| * | | Avoid hardcoding names of individual stream token keys in its own implementat...Paul "LeoNerd" Evans2014-08-291-9/+3
| * | | Use str.join() properlyPaul "LeoNerd" Evans2014-08-291-2/+1
| * | | Move the *EventSource classes into the handlers they relate to, so it's easie...Paul "LeoNerd" Evans2014-08-293-127/+130
| | |/ | |/|
* | | Start adding storage for new events.Erik Johnston2014-08-293-0/+121
* | | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-08-2914-145/+234
|\| |
| * | Get the equalities right.Erik Johnston2014-08-292-4/+10
| * | Merge branch 'presence_logging' into developErik Johnston2014-08-296-91/+189
| |\ \
| | * | Fix a couple of bugs in presence handler related to pushing updatesto the cor...Erik Johnston2014-08-292-18/+43
| | * | Turn of trace_function loggingErik Johnston2014-08-282-10/+10
| | * | Only poll remote users if they are in our presence list, rather than in a com...Erik Johnston2014-08-281-53/+66
| | * | Don't query the rooms members table so much by using the new notifier api tha...Erik Johnston2014-08-282-62/+46
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into presence_loggingErik Johnston2014-08-288-47/+39
| | |\ \
| | * | | Up timeout to 10 minutesErik Johnston2014-08-281-1/+1
| | * | | And more logging.Erik Johnston2014-08-282-1/+3
| | * | | Add more logging. Up the event stream timer to 10sErik Johnston2014-08-282-1/+4
| | * | | Add logging to try and figure out what is going on with the presence stuffErik Johnston2014-08-284-3/+66
| * | | | Fix FederationHandler to event.originMark Haines2014-08-281-1/+1
| * | | | Initial room event stream token must be s0, not s1, or everyone will miss the...Paul "LeoNerd" Evans2014-08-281-1/+1
| | |/ / | |/| |
| * | | Only send presence "poll"/"unpoll" EDUs when changing from/to zero remotesPaul "LeoNerd" Evans2014-08-281-2/+14
| * | | Avoid AlreadyCalledError from EDU sending failuresPaul "LeoNerd" Evans2014-08-281-1/+2
| * | | Re-enable presence, un-skip presence testsPaul "LeoNerd" Evans2014-08-281-8/+0
| | |/ | |/|
| * | Remove get_state_for_room function from federation handlerMark Haines2014-08-281-15/+11
| * | use @wraps to set the __name__ __module__ and __doc__ correctly for logged fu...Mark Haines2014-08-281-0/+2