summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Cache the most recent serial for each roomMark Haines2015-05-181-6/+22
* Move updating the serial and state of the presence cache into a single functionMark Haines2015-05-181-17/+43
* Merge branch 'notifier_performance' into markjh/presence_performanceMark Haines2015-05-185-14/+28
|\
| * Merge branch 'develop' into notifier_performanceMark Haines2015-05-184-49/+233
| |\
| * \ Merge branch 'notifier_unify' into notifier_performanceMark Haines2015-05-142-20/+8
| |\ \
| * | | Fix v2 sync, update the last_notified_ms only if there was an active listenerMark Haines2015-05-141-1/+1
| * | | Don't bother checking for updates if the stream token hasn't advanced for a userMark Haines2015-05-134-13/+27
* | | | Add more doc string, reduce C+P boilerplate for getting room listMark Haines2015-05-181-6/+22
| |_|/ |/| |
* | | More whitespaceMark Haines2015-05-151-0/+1
* | | Add some missed argument types, cleanup the whitespace a bitMark Haines2015-05-141-6/+17
* | | More doc-stringsMark Haines2015-05-141-39/+202
* | | Remove unused arguments and doc PresenceHandler.push_update_to_clientsMark Haines2015-05-141-12/+8
* | | Treat setting your display name to the empty string as removing it (SYN-186).David Baker2015-05-141-0/+3
* | | Disallow whitespace in aliases here tooDavid Baker2015-05-141-0/+5
* | | Throw error when creating room if alias contains whitespace #SYN-335David Baker2015-05-141-0/+5
| |/ |/|
* | Don't talk to yourself when backfillingErik Johnston2015-05-121-0/+2
* | Revert "Improvement to performance of presence event stream handling"Mark Haines2015-05-121-20/+6
|/
* Merge pull request #147 from matrix-org/presence-performanceMark Haines2015-05-121-6/+20
|\
| * Use the presence cachemap ordering to early-abort the iteration loopPaul "LeoNerd" Evans2015-05-071-2/+7
| * Store presence cachemap in an ordered dict, so that the newer serials will be...Paul "LeoNerd" Evans2015-05-071-4/+13
* | Merge pull request #144 from matrix-org/erikj/logging_contextMark Haines2015-05-128-59/+66
|\ \
| * | Unwrap defer.gatherResults failuresErik Johnston2015-05-124-6/+9
| * | Fix up leak. Add warnings.Erik Johnston2015-05-084-21/+33
| * | PEP8Erik Johnston2015-05-081-1/+0
| * | Change the way we do logging contexts so that they survive divergencesErik Johnston2015-05-083-32/+25
| |/
* | s/backfil/backfill/Erik Johnston2015-05-121-4/+4
* | Typos everywhereErik Johnston2015-05-121-1/+1
* | And another typo.Erik Johnston2015-05-121-3/+3
* | Err, gatherResults doesn't take a dict...Erik Johnston2015-05-121-4/+7
* | Handle the case where the other side is unreachable when backfillingErik Johnston2015-05-121-14/+42
* | Make get_current_token accept a direction parameter, which tells whether the ...Erik Johnston2015-05-122-3/+5
* | Initial hack at wiring together pagination and backfillErik Johnston2015-05-112-3/+115
|/
* revert accidental bcrypt gensalt round reduction from loadtestingMark Haines2015-05-071-1/+1
* pynacl-0.3.0 was released so we can finally start using it directly from pypiMark Haines2015-05-071-1/+1
* That wasn't a deferredErik Johnston2015-05-012-4/+2
* Remove inlineCallbacks from non-generatorErik Johnston2015-05-011-2/+0
* Remove some run_on_reactorsErik Johnston2015-05-011-2/+0
* More missed get_user_by_id API changesDavid Baker2015-05-011-1/+1
* One too many lensErik Johnston2015-05-011-1/+1
* Change public room list to use defer.gatherResultsErik Johnston2015-05-011-5/+13
* This api now no longer returns an arrayDavid Baker2015-05-011-1/+1
* Make simple query rather than long one and then throw away half the resultsErik Johnston2015-04-301-2/+1
* Fix off by one in presence token handlingErik Johnston2015-04-291-1/+1
* Accept camelcase + underscores in binding tooDavid Baker2015-04-291-2/+17
* Fix includesDavid Baker2015-04-291-1/+2
* Accept both camelcase and underscore threepid creds for transitionDavid Baker2015-04-291-4/+19
* Ensure we never miss any presence updatesErik Johnston2015-04-281-1/+7
* Fix typoErik Johnston2015-04-281-1/+1
* Ensure the serial returned by presence is always an integerErik Johnston2015-04-281-3/+3
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-286-117/+434
|\
| * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-285-116/+432
| |\
| | * Add commentage.David Baker2015-04-271-0/+4
| | * Change to https for ID server communicationDavid Baker2015-04-241-3/+2
| | * Use underscores instead of camelcase for id server stuffDavid Baker2015-04-242-12/+12
| | * pep8David Baker2015-04-241-2/+2
| | * Merge branch 'develop' into csauthDavid Baker2015-04-242-11/+48
| | |\
| | * | Remove ultimately unused feature of saving params from the first call in the ...David Baker2015-04-231-2/+10
| | * | Password reset, finally.David Baker2015-04-171-1/+7
| | * | pep8David Baker2015-04-173-8/+5
| | * | make add3pid servlet workDavid Baker2015-04-171-0/+7
| | * | Merge branch 'develop' into csauthDavid Baker2015-04-175-48/+93
| | |\ \
| | * | | Need to yield the username check, otherwise very very weird things happen.David Baker2015-04-171-1/+1
| | * | | Oops, left debugging in.David Baker2015-04-161-6/+0
| | * | | Return user ID in use error straight awayDavid Baker2015-04-163-64/+65
| | * | | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-152-3/+9
| | * | | Regstration with email in v2David Baker2015-04-154-22/+116
| | * | | Completely replace fallback auth for C/S V2:David Baker2015-04-011-21/+77
| | * | | pep8David Baker2015-03-311-1/+1
| | * | | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-302-14/+87
| | * | | Delete pushers when changing passwordDavid Baker2015-03-261-0/+3
| | * | | pep8 / pyflakesDavid Baker2015-03-231-5/+1
| | * | | Implement password changing (finally) along with a start on making client/ser...David Baker2015-03-233-44/+116
| * | | | Merge branch 'develop' into invite_power_levelPaul "LeoNerd" Evans2015-04-271-7/+44
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Create an 'invite' powerlevel when making new roomsPaul "LeoNerd" Evans2015-04-211-1/+2
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-272-11/+48
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Remove users from the remote_offline_serials list (and clean up empty element...Paul "LeoNerd" Evans2015-04-231-1/+11
| * | | | Don't let the remote offline serial list grow arbitrarily largePaul "LeoNerd" Evans2015-04-231-0/+5
| * | | | Store a list of the presence serial number at which remote users went offline...Paul "LeoNerd" Evans2015-04-231-0/+21
| * | | | Generate presence event-stream JSON structures directlyPaul "LeoNerd" Evans2015-04-231-8/+9
| |/ / /
| * | / SYN-350: Don't ratelimit the individual events generated during room creationMark Haines2015-04-211-4/+4
| | |/ | |/|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-171-2/+14
|\| |
| * | Filter typing nofication events to only those rooms the requesting user is a ...Paul "LeoNerd" Evans2015-04-151-2/+14
| * | Have TypingNotificationEventSource.get_new_events_for_user() return a deferre...Paul "LeoNerd" Evans2015-04-151-1/+1
* | | PEP8Erik Johnston2015-04-161-1/+0
* | | Don't wait on federation_handler.handle_new_eventErik Johnston2015-04-151-3/+7
* | | Remove run_on_reactor()sErik Johnston2015-04-151-4/+0
* | | Do more parellelization for initialSyncErik Johnston2015-04-151-7/+11
* | | Parellelize initial syncErik Johnston2015-04-151-2/+8
* | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-081-4/+36
|\| |
| * | typoErik Johnston2015-04-081-1/+1
| * | Don't yield on notifying all listenersErik Johnston2015-04-081-4/+36
* | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-073-42/+43
|\| |
| * | Fix more AS sender ID thinkos.Kegan Dougal2015-04-011-1/+8
| * | Remove more reg/unreg methods. Read config not database for cache.Kegan Dougal2015-03-311-37/+0
| * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-264-9/+34
| |\ \
| | * | Reduce activity timer granularity to avoid too many quick updates (SYN-247)Paul "LeoNerd" Evans2015-03-231-0/+8
| | |/
| * | Set the service ID as soon as it is known.Kegan Dougal2015-03-161-1/+1
| * | Minor PR comment tweaks.Kegan Dougal2015-03-161-2/+8
| * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-165-11/+20
| |\ \
| * | | Use seconds; start gluing in the AS scheduler into the AS handler.Kegan Dougal2015-03-092-4/+21
* | | | Fix unicode database supportErik Johnston2015-03-251-1/+1
* | | | Sanitize RoomMemberStoreErik Johnston2015-03-231-19/+0
* | | | Sanitize TransactionStoreErik Johnston2015-03-231-1/+1
| |_|/ |/| |
* | | Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-181-0/+8
|\ \ \
| * | | Factor out user id validation checksErik Johnston2015-03-181-0/+8
* | | | Clean out event_forward_extremities table when the server rejoins the roomErik Johnston2015-03-181-0/+2
* | | | Merge pull request #110 from matrix-org/fix_banErik Johnston2015-03-162-8/+6
|\ \ \ \
| * | | | Revert incorrect changes to where we send eventsErik Johnston2015-03-161-3/+4
| * | | | Remove concept of context.auth_events, instead use context.current_stateErik Johnston2015-03-162-8/+6
| * | | | Send all membership events to the remote homeserverErik Johnston2015-03-161-4/+3
| | |/ / | |/| |
* | | | Don't block waiting on waking up all the listeners when sending an event.Erik Johnston2015-03-161-1/+10
| |_|/ |/| |
* | | Appease pep8Paul "LeoNerd" Evans2015-03-121-2/+3
* | | Use _ instead of . as a metric namespacing separator, for PrometheusPaul "LeoNerd" Evans2015-03-121-1/+1
* | | Add a scalar gauge metric on the size of the presence user cachemapPaul "LeoNerd" Evans2015-03-121-0/+7
| |/ |/|
* | Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This us...Erik Johnston2015-03-095-11/+12
|/
* When setting display name more graciously handle failures to update room state.Erik Johnston2015-03-061-7/+13
* Add some randomness to the user specified timeout on event streams to mitigat...Erik Johnston2015-03-061-0/+9
* Merge pull request #93 from matrix-org/application-services-exclusiveKegsay2015-03-022-7/+18
|\
| * Implement exclusive namespace checks.Kegan Dougal2015-02-272-7/+18
* | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-03-023-12/+27
|\ \
| * | Finish impl to get new events for AS. ASes should now be able to poll /eventsKegan Dougal2015-02-261-1/+3
| * | Add stub functions and work out execution flow to implement AS event stream p...Kegan Dougal2015-02-252-12/+25
| |/
| * %s for strings otherwise you end up sending 'u"foo"'David Baker2015-02-241-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-02-231-1/+1
|\|
| * Add missing comma so that it generates a dict and not a setErik Johnston2015-02-201-1/+1
* | Implement and use new batched get missing pduErik Johnston2015-02-231-0/+23
* | Initial stab at implementing a batched get_missing_pdus requestErik Johnston2015-02-191-4/+5
|/
* Merge branch 'consumeErrors' of github.com:matrix-org/synapse into developErik Johnston2015-02-172-5/+5
|\
| * We do want to consumeErrorErik Johnston2015-02-171-1/+1
| * Use consumeErrors=True on all DeferredLists.Erik Johnston2015-02-171-4/+4
* | Change some debug logging to infoErik Johnston2015-02-171-2/+4
* | Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into developErik Johnston2015-02-161-1/+1
|\|
| * resolve_events expect lists, not dictsErik Johnston2015-02-151-1/+1
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-131-1/+1
|\|
| * Fix wrong variable nameErik Johnston2015-02-131-1/+1
* | Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-135-47/+393
|\ \ | |/ |/|
| * PEP8-ifyKegan Dougal2015-02-111-3/+0
| * Notify ASes for events sent by other users in a room which an AS user is a pa...Kegan Dougal2015-02-111-5/+16
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-115-25/+50
| |\
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-093-62/+105
| |\ \
| * | | Fix bugs so lazy room joining works as intended.Kegan Dougal2015-02-092-9/+20
| * | | Register a user account for the AS when the AS registers. Add 'sender' column...Kegan Dougal2015-02-091-1/+7
| * | | Add errcodes for appservice registrations.Kegan Dougal2015-02-061-4/+7
| * | | Pyflakes: unused variable.Kegan Dougal2015-02-061-1/+1
| * | | Grant ASes the ability to delete aliases in their own namespace.Kegan Dougal2015-02-061-5/+23
| * | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-061-12/+31
| * | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-051-0/+20
| * | | Dependency inject ApplicationServiceApi when creating ApplicationServicesHand...Kegan Dougal2015-02-052-4/+6
| * | | Prevent user IDs in AS namespaces being created/deleted by humans.Kegan Dougal2015-02-051-0/+16
| * | | Prevent aliases in AS namespaces being created/deleted by users. Check with A...Kegan Dougal2015-02-051-9/+33
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-054-90/+143
| |\ \ \
| * | | | Fix user query checks. HS>AS pushing now works.Kegan Dougal2015-02-051-13/+31
| * | | | Glue AS work to general event notifications. Add more exception handling when...Kegan Dougal2015-02-051-14/+25
| * | | | Add unknown room alias check. Call it from directory_handler.get_associationKegan Dougal2015-02-052-43/+61
| * | | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when searc...Kegan Dougal2015-02-051-5/+19
| * | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-051-3/+6
| * | | | Impl push_bulk functionKegan Dougal2015-02-051-1/+1
| * | | | Modify API for SimpleHttpClient.get_json and update usages.Kegan Dougal2015-02-042-37/+52
| * | | | Add query_user/alias APIs.Kegan Dougal2015-02-041-10/+16
| * | | | Begin to add unit tests for appservice glue and regex testing.Kegan Dougal2015-02-041-2/+6
| * | | | Add stub ApplicationServiceApi and glue it with the handler.Kegan Dougal2015-02-041-3/+15
| * | | | Add appservice package and move ApplicationService into it.Kegan Dougal2015-02-031-1/+3
| * | | | Implement restricted namespace checks. Begin fleshing out the main hook for n...Kegan Dougal2015-02-031-0/+19
| * | | | Add namespace constants. Add restrict_to option to limit namespace checks.Kegan Dougal2015-02-031-10/+15
| * | | | Implement regex checks for app services.Kegan Dougal2015-02-031-2/+23
| * | | | Implement txns for AS (un)registration.Kegan Dougal2015-02-021-1/+2
| * | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-027-154/+848
| |\ \ \ \
| * | | | | Add basic application_services SQL, and hook up parts of the appservice store...Kegan Dougal2015-01-281-3/+4
| * | | | | Log when ASes are registered/unregistered.Kegan Dougal2015-01-271-0/+2
| * | | | | Use ApplicationService when registering.Kegan Dougal2015-01-271-8/+5
| * | | | | Add stub methods, TODOs and docstrings for application services.Kegan Dougal2015-01-271-3/+22
| * | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-272-0/+51
* | | | | | pyflakesErik Johnston2015-02-131-1/+1
* | | | | | When we see a difference in current state, actually use state conflict resolu...Erik Johnston2015-02-131-0/+34
* | | | | | Reindent code to be less human-readable to keep pep8 from complainingPaul "LeoNerd" Evans2015-02-121-1/+1
* | | | | | Appease pyflakesPaul "LeoNerd" Evans2015-02-121-1/+1
* | | | | | Can now remove the FIXME tooPaul "LeoNerd" Evans2015-02-121-10/+3
* | | | | | Only attempt to fetch presence state of JOINed members in room initialSync (S...Paul "LeoNerd" Evans2015-02-121-0/+1
* | | | | | Remove more debug loggingErik Johnston2015-02-111-2/+0
* | | | | | Remove debug loggingErik Johnston2015-02-112-12/+0
* | | | | | Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder...Erik Johnston2015-02-112-2/+17
| |_|_|_|/ |/| | | |
* | | | | Fix code-styleMark Haines2015-02-102-5/+5
* | | | | Code-style fixesMark Haines2015-02-102-6/+11
* | | | | Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into developErik Johnston2015-02-101-1/+6
|\ \ \ \ \
| * | | | | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the t...Mark Haines2015-02-061-1/+3
| * | | | | Explicitly list the RejectedReasons that we can proveErik Johnston2015-02-061-1/+6
* | | | | | During room intial sync, only calculate current state once.Erik Johnston2015-02-092-13/+28
| |_|_|_|/ |/| | | |
* | | | | don't give up if we can't create default avatars during testsMatthew Hodgson2015-02-071-9/+12
* | | | | ...and here's the actual impl. git fail.Matthew Hodgson2015-02-071-0/+14
* | | | | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the t...Mark Haines2015-02-061-1/+3
|/ / / /
* | | | Don't query auth if the only difference is events that were rejected due to a...Erik Johnston2015-02-061-56/+72
* | | | Make seen_ids a setErik Johnston2015-02-061-1/+3
* | | | Handle the fact the list.remove raises if element doesn't existErik Johnston2015-02-061-4/+10
| |_|/ |/| |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien...Erik Johnston2015-02-051-5/+12
|\ \ \
| * | | SYN-202: Log as WARN the 404 'Presence information not visible' errors instea...Erik Johnston2015-02-051-5/+12
| | |/ | |/|
* | | Pass through list of room hosts from room alias query to federation so that i...Erik Johnston2015-02-052-14/+18
* | | Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder...Erik Johnston2015-02-041-1/+3
|\ \ \
| * | | Change context.auth_events to what the auth_events would be bases on context....Erik Johnston2015-02-041-1/+3
* | | | Apply sanity to the transport client interface. Convert 'make_join' and 'send...Erik Johnston2015-02-041-2/+2
* | | | When returning lists of servers from alias lookups, put the current server fi...Erik Johnston2015-02-041-1/+10
|/ / /
* | | Rearrange persist_event so that do all the queries that need to be done befor...Erik Johnston2015-02-041-0/+2
* | | Neaten the handling of state and auth_chain up a bitErik Johnston2015-02-031-27/+30
* | | Don't completely die if get auth_chain or querying auth_chain requests failErik Johnston2015-02-031-63/+72
* | | Set combinations is | and not +Erik Johnston2015-02-031-2/+2
* | | SpellingErik Johnston2015-02-031-1/+1
* | | Give exception better messageErik Johnston2015-02-031-1/+1
* | | Add FIXME note.Erik Johnston2015-02-031-0/+2
* | | Return rejected events if asked for it over federation.Erik Johnston2015-02-031-0/+1
* | | Try to ensure we don't persist an event we have already persisted. In persist...Erik Johnston2015-02-031-14/+28
|/ /
* | Resign events when we return them via /query_auth/Erik Johnston2015-01-301-0/+9
* | Return empty list rather than None when there are no emphemeral events for a ...Mark Haines2015-01-301-1/+1
* | Fix bug where accepting invite over federation didn't work. Add logging.Erik Johnston2015-01-301-8/+49
* | Merge pull request #43 from matrix-org/rejectionsErik Johnston2015-01-301-119/+310
|\ \
| * | Only auth_events with event if event in event.auth_eventsErik Johnston2015-01-301-1/+3
| * | Fix bug where we superfluously asked for current state. Change API of /query_...Erik Johnston2015-01-301-33/+18
| * | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-305-43/+75
| |\ \
| * | | Update the current state of an event if we update auth events.Erik Johnston2015-01-301-1/+3
| * | | Fix regression where we no longer correctly handled the case of gaps in our e...Erik Johnston2015-01-301-2/+6
| * | | Initial implementation of auth conflict resolutionErik Johnston2015-01-291-75/+132
| * | | Start implementing auth conflict resErik Johnston2015-01-281-35/+176
* | | | Add doc string for __nonzero__ overrides for sync results, raise not implemen...Mark Haines2015-01-301-1/+8
* | | | Check if the user has joined the room between incremental syncsMark Haines2015-01-301-4/+27
* | | | Pass client info to the sync_configMark Haines2015-01-301-2/+3
* | | | Fix token formattingMark Haines2015-01-301-3/+3
* | | | Filter the recent events before applying the limit when doing an initial syncMark Haines2015-01-301-11/+10
* | | | Filter the recent events before applying the limit when doing an incremental ...Mark Haines2015-01-301-15/+38
* | | | Update todo for the filtering on syncMark Haines2015-01-291-1/+2
* | | | Fix indentMark Haines2015-01-291-1/+1
* | | | Move typing notifs to an "emphermal" event list on the room objectMark Haines2015-01-291-5/+7
* | | | Fix check for empty room updateMark Haines2015-01-291-1/+1
* | | | Fix v2 initial syncMark Haines2015-01-291-1/+2
* | | | Use get_room_events_stream to get changes to the rooms if the number of chang...Mark Haines2015-01-291-11/+45
* | | | Remove typing TODOMark Haines2015-01-291-1/+0
* | | | Add typing notifications to syncMark Haines2015-01-291-9/+21
* | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-284-34/+51
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-281-1/+11
| |\ \ \
| | * | | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-281-1/+11
| | | |/ | | |/|
| * | | Merge branch 'master' into developDavid Baker2015-01-281-1/+1
| |\ \ \
| | * | | Add matrix.org as a trusted ID server because it's now passed through on port...David Baker2015-01-281-1/+1
| * | | | Merge branch 'develop' into pushersDavid Baker2015-01-289-47/+68
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Reset badge count to zero when last active time is bumpedDavid Baker2015-01-281-0/+5
| * | | | Oops, remove debuggingDavid Baker2015-01-271-1/+0
| * | | | or of course we could just return the deferredDavid Baker2015-01-271-2/+1
| * | | | Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the...David Baker2015-01-271-0/+1
| * | | | Unbreak bad presence merge - don't add these blocks together with an and: the...David Baker2015-01-271-12/+14
| * | | | Merge branch 'develop' into pushersDavid Baker2015-01-224-12/+14
| |\ \ \ \
| * | | | | Don't make the pushers' event streams cause people to appear onlineDavid Baker2015-01-151-21/+22
* | | | | | Fix FormattingMark Haines2015-01-271-8/+5
* | | | | | Wait for events if the incremental sync is empty and a timeout is givenMark Haines2015-01-271-7/+12
* | | | | | Start implementing incremental initial syncMark Haines2015-01-271-25/+208