summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #95 from matrix-org/serialize_transaction_processingErik Johnston2015-03-021-20/+12
|\
| * If we're yielding don't add errbackErik Johnston2015-03-021-7/+3
| * Process transactions serially.Erik Johnston2015-03-021-14/+10
* | Merge pull request #92 from matrix-org/application-services-event-streamKegsay2015-03-029-39/+272
|\ \ | |/ |/|
| * PEP8Kegan Dougal2015-03-021-1/+1
| * Wrap all of get_app_service_rooms in a txn.Kegan Dougal2015-03-026-88/+67
| * JOIN state_events rather than parsing unrecognized_keys to pull out member st...Kegan Dougal2015-03-022-11/+5
| * Modify _simple_select_list to allow an empty WHERE clause. Use it for get_all...Kegan Dougal2015-03-024-17/+21
| * PR tweaks: set earlier on and use 'as json' for compatKegan Dougal2015-03-023-16/+12
| * PEP8Kegan Dougal2015-02-271-1/+0
| * Fix unit testsKegan Dougal2015-02-271-0/+3
| * Notify appservices of invites mid-poll.Kegan Dougal2015-02-271-1/+29
| * Check for membership invite events correctly.Kegan Dougal2015-02-261-2/+21
| * Update CHANGESKegan Dougal2015-02-261-0/+2
| * Finish impl to get new events for AS. ASes should now be able to poll /eventsKegan Dougal2015-02-262-8/+58
| * Finish impl to extract all room IDs an AS may be interested in when polling t...Kegan Dougal2015-02-262-6/+36
| * PEP8 and pyflakesKegan Dougal2015-02-252-6/+3
| * Comment unused variables.Kegan Dougal2015-02-251-2/+2
| * Fix alias query.Kegan Dougal2015-02-251-6/+5
| * Add support for extracting matching room_ids and room_aliases for a given AS.Kegan Dougal2015-02-253-2/+82
| * Add stub functions and work out execution flow to implement AS event stream p...Kegan Dougal2015-02-254-12/+65
* | SYWEB-278 Don't allow rules with no rule_id.David Baker2015-02-251-1/+1
|/
* turns uris config options should append since it's a listDavid Baker2015-02-241-1/+1
* Fix YAML syntax of turn config exampleDavid Baker2015-02-241-1/+1
* tabs/spacesDavid Baker2015-02-241-8/+8
* Use standard form submission so the go button on the keyboard works.David Baker2015-02-241-3/+3
* Merge pull request #91 from matrix-org/registration-fallback-ios-displayKegsay2015-02-242-0/+5
|\
| * Fallback registration page: oops. Removed dev test.manuroe2015-02-241-1/+1
| * Fallback registration page: added the classic viewport meta to fix the displa...manuroe2015-02-242-1/+6
|/
* %s for strings otherwise you end up sending 'u"foo"'David Baker2015-02-241-1/+1
* Merge pull request #89 from matrix-org/registration-fallbackErik Johnston2015-02-2412-1/+433
|\
| * Update CHANGES and UPGRADEKegan Dougal2015-02-242-0/+21
| * Set user-visible error when the server is misconfigured.Kegan Dougal2015-02-241-0/+1
| * Trailing commaKegan Dougal2015-02-231-1/+1
| * Add jqueryKegan Dougal2015-02-231-0/+4
| * Get everything workingKegan Dougal2015-02-232-24/+113
| * Add core registration html/jsKegan Dougal2015-02-236-0/+309
| * Actually treat this as static content, not random Resources.Kegan Dougal2015-02-234-31/+7
| * Add RegisterFallbackResource to /_matrix/static/client/registerKegan Dougal2015-02-234-0/+32
* | Use OrderedDict for @cached backing store, so we can evict the oldest key unb...Paul "LeoNerd" Evans2015-02-231-7/+4
* | Use cache.pop() instead of a separate membership test + del []Paul "LeoNerd" Evans2015-02-232-2/+8
* | Fix code style warningMark Haines2015-02-231-1/+1
* | Remove unused importMark Haines2015-02-231-2/+0
* | Merge remote-tracking branch 'origin/develop' into performance-cache-improvem...Paul "LeoNerd" Evans2015-02-238-3/+54
|\|
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-202-2/+2
| |\
| | * Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse v0.7.1-r1Erik Johnston2015-02-202-2/+2
| | |\
| | | * Change version schemeErik Johnston2015-02-201-1/+1
| | | * Bump versionErik Johnston2015-02-201-1/+1
| | | * Add missing comma so that it generates a dict and not a setErik Johnston2015-02-201-1/+1
| | |/
| * | Merge pull request #84 from matrix-org/disable_registrationErik Johnston2015-02-205-1/+43
| |\ \ | | |/ | |/|
| | * Always allow AS to registerErik Johnston2015-02-201-3/+5
| | * Update testsErik Johnston2015-02-192-0/+2
| | * Disable registration if config option was set.Erik Johnston2015-02-191-0/+4
| | * Add config option to disable registration.Erik Johnston2015-02-192-1/+35
| |/
| * Update CHANGES.rst with missing changes v0.7.1Erik Johnston2015-02-191-0/+9
| * Merge branch 'release-v0.7.1' of github.com:matrix-org/synapseErik Johnston2015-02-1955-308/+2548
| |\
* | | Pull the _get_event_cache.setdefault() call out of the try block, as it doesn...Paul "LeoNerd" Evans2015-02-231-1/+2
* | | Use the @cached decorator to implement the destination_retry_timings cachePaul "LeoNerd" Evans2015-02-231-9/+5
* | | RoomMemberStore no longer needs a _user_rooms_cache memberPaul "LeoNerd" Evans2015-02-231-5/+0
* | | Allow @cached-wrapped functions to have a prefill method for setting entriesPaul "LeoNerd" Evans2015-02-232-8/+29
* | | Squash out the now-redundant ApplicationServicesCache object classPaul "LeoNerd" Evans2015-02-231-20/+8
* | | Remove a TODO notePaul "LeoNerd" Evans2015-02-191-1/+0
* | | Take named arguments to @cached() decorator, add a 'max_entries' limitPaul "LeoNerd" Evans2015-02-193-16/+114
* | | Move @cached decorator out into synapse.storage._base; add minimal docsPaul "LeoNerd" Evans2015-02-192-27/+36
* | | Pull out the 'get_rooms_for_user' cache logic into a reüsable @cached decoratorPaul "LeoNerd" Evans2015-02-191-24/+29
| |/ |/|
* | Update release dateErik Johnston2015-02-191-1/+1
* | Send room ID in http notifications so clients know which room to go to if the...David Baker2015-02-191-0/+1
* | Update CHANGESErik Johnston2015-02-181-0/+11
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-188-41/+106
|\ \
| * \ Merge pull request #82 from matrix-org/git_tag_versionErik Johnston2015-02-187-38/+103
| |\ \
| | * | Conform to header spec take twoErik Johnston2015-02-181-1/+1
| | * | Make /keys/ return correct Server versionErik Johnston2015-02-181-1/+5
| | * | Make version_string conform to User-Agent and Server specErik Johnston2015-02-181-1/+1
| | * | pyflakesErik Johnston2015-02-181-1/+0
| | * | Use git aware version string in User-Agent and Server headersErik Johnston2015-02-185-36/+33
| | * | When computing git version run git commands in same dir as source filesErik Johnston2015-02-181-0/+5
| | * | Generate a version string that includes git details if run from git checkoutErik Johnston2015-02-181-1/+61
| * | | Bump matrix-angular-sdk versionErik Johnston2015-02-181-3/+3
| |/ /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-183-9/+33
|\| |
| * | Merge pull request #80 from matrix-org/restrict-destinationsErik Johnston2015-02-181-3/+27
| |\ \
| | * | Restrict the destinations that synapse can talk toMark Haines2015-02-181-3/+27
| * | | Merge pull request #81 from matrix-org/bugs/SYN-282Erik Johnston2015-02-181-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | SYN-282: Don't log tracebacks for client errorsMark Haines2015-02-181-1/+1
| |/ /
| * | Fix syntaxMark Haines2015-02-181-1/+1
| * | Move pynacl to the top of the depedency link list so that it isMark Haines2015-02-181-5/+5
* | | Add errback to all deferreds in transaction_queueErik Johnston2015-02-181-14/+23
* | | Remove unused importErik Johnston2015-02-181-2/+0
* | | Discard destination 'localhost'Erik Johnston2015-02-181-2/+2
* | | Don't send failure to selfErik Johnston2015-02-181-0/+3
* | | Remove spurious comma. Remove temp run_on_reactorErik Johnston2015-02-181-2/+1
* | | Temporarily add a run_on_reactor() callErik Johnston2015-02-181-0/+3
* | | Don't convert DNSLookupError to a 4xx SynapseErrorErik Johnston2015-02-181-1/+1
* | | Bump versionErik Johnston2015-02-181-1/+1
|/ /
* | Add .__name__ after type(e)Erik Johnston2015-02-181-2/+2
* | Fix up ResponseNeverReceived to strErik Johnston2015-02-181-9/+11
* | Fix pyflakesErik Johnston2015-02-181-1/+0
* | strings.join() expects iterable of stringsErik Johnston2015-02-181-1/+1
* | s/self._clock/self.clock/Erik Johnston2015-02-181-1/+1
* | Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into d...Erik Johnston2015-02-184-107/+252
|\ \
| * | More docsErik Johnston2015-02-181-1/+5
| * | Docs.Erik Johnston2015-02-181-1/+33
| * | Try to only back off if we think we failed to connect to the remoteErik Johnston2015-02-173-89/+95
| * | Only update destination_retry_timings if we have succeeded when retryingErik Johnston2015-02-171-0/+3
| * | Remove spurious selfErik Johnston2015-02-171-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into keyclient_retry_...Erik Johnston2015-02-171-1/+2
| |\ \
| * | | Add per server retry limiting.Erik Johnston2015-02-174-122/+205
| * | | Rate limit retries when fetching server keys.Erik Johnston2015-02-171-55/+71
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-02-188-57/+214
|\ \ \ \
| * \ \ \ Merge pull request #77 from matrix-org/failuresErik Johnston2015-02-184-17/+50
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-172-2/+3
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Remove debug raiseErik Johnston2015-02-171-7/+0
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-171-2/+4
| | |\ \ \ \
| | * | | | | Remove unused importErik Johnston2015-02-171-1/+0
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-1734-92/+1909
| | |\ \ \ \ \
| | * | | | | | Consume errors in time_bound_deferredErik Johnston2015-02-171-2/+0
| | * | | | | | Make matrixfederationclient log more nicelyErik Johnston2015-02-171-11/+12
| | * | | | | | Format the response of transaction request in a nicer wayErik Johnston2015-02-172-6/+35
| | * | | | | | Actually respond with JSON to incoming transactionErik Johnston2015-02-171-0/+2
| | * | | | | | Handle recieving failures in transactionsErik Johnston2015-02-171-1/+12
| * | | | | | | Merge pull request #79 from matrix-org/get_pdu_limitingErik Johnston2015-02-184-40/+164
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Rename _fail_fetch_pdu_cache to _get_pdu_cacheErik Johnston2015-02-182-9/+9
| | * | | | | | Fix typo in function nameErik Johnston2015-02-171-1/+1
| | * | | | | | ExpiringCache: purge every 1/2 intervalErik Johnston2015-02-171-1/+1
| | * | | | | | Start the get_pdu cacheErik Johnston2015-02-171-0/+1
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into get_pdu_limitingErik Johnston2015-02-171-5/+8
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Cache results of get_pdu.Erik Johnston2015-02-161-3/+39
| | * | | | | | Factor out ExpiringCache from StateHandlerErik Johnston2015-02-162-37/+124
* | | | | | | | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into developErik Johnston2015-02-172-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge pull request #75 from matrix-org/dont_write_bytecodeErik Johnston2015-02-172-2/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Don't write bytecodeErik Johnston2015-02-172-2/+4
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #76 from matrix-org/consumeErrorsErik Johnston2015-02-176-10/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
* | | | | | | Use absolute path when loading delta sql filesErik Johnston2015-02-171-1/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Bump schema versionErik Johnston2015-02-172-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into developErik Johnston2015-02-176-10/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | We do want to consumeErrorErik Johnston2015-02-171-1/+1
| * | | | Use consumeErrors=True on all DeferredLists.Erik Johnston2015-02-175-9/+11
| |/ / /
| * | | Merge pull request #73 from matrix-org/hotfixes-v0.7.0f v0.7.0fErik Johnston2015-02-162-2/+2
| |\ \ \
* | | | | Change some debug logging to infoErik Johnston2015-02-171-2/+4
| |_|_|/ |/| | |
* | | | Merge pull request #74 from matrix-org/federation_min_depth_fixErik Johnston2015-02-161-5/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Mark old events as outliers.Erik Johnston2015-02-161-1/+7
| * | | Don't return anything from _handle_new_pdu, since we ignore the return value ...Erik Johnston2015-02-161-4/+1
|/ / /
* | | Fix contrib/graph/graph2.py to handle FrozenDictErik Johnston2015-02-161-1/+2
* | | Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into developErik Johnston2015-02-163-3/+3
|\ \ \ | | |/ | |/|
| * | Bump versionErik Johnston2015-02-151-1/+1
| * | resolve_events expect lists, not dictsErik Johnston2015-02-151-1/+1
| |/
| * we federate on port 8448 nowadays...Matthew Hodgson2015-02-141-1/+1
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-131-1/+1
|\|
| * Merge branch 'hotfixes-0.7.0e' of github.com:matrix-org/synapse v0.7.0eErik Johnston2015-02-133-13/+13
| |\
| | * Bump versionErik Johnston2015-02-131-1/+1
* | | Merge branch 'hotfixes-0.7.0e' into developDavid Baker2015-02-132-12/+12
|\ \ \ | | |/ | |/|
| * | Update pushers by app id and pushkey, not user id and pushkeyDavid Baker2015-02-132-12/+12
| |/
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-132-2/+2
|\|
| * Bump version v0.7.0dErik Johnston2015-02-131-1/+1
| * Fix wrong variable nameErik Johnston2015-02-131-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse v0.7.0cErik Johnston2015-02-134-26/+68
| |\
* | \ Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-1332-76/+1892
|\ \ \
| * | | Fix tests which broke when event caching was introduced.Kegan Dougal2015-02-111-1/+4
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-1135-387/+404
| |\ \ \
| * | | | Minor tweaks based on PR feedback.Kegan Dougal2015-02-112-4/+5
| * | | | Fix newline on __init__Kegan Dougal2015-02-111-1/+0
| * | | | PEP8-ifyKegan Dougal2015-02-114-9/+1
| * | | | Add newline to EOFKegan Dougal2015-02-111-0/+1
| * | | | Notify ASes for events sent by other users in a room which an AS user is a pa...Kegan Dougal2015-02-114-11/+56
| * | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-1126-115/+240
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-0919-137/+323
| |\ \ \ \ \
| * | | | | | Fix bugs so lazy room joining works as intended.Kegan Dougal2015-02-093-12/+23
| * | | | | | Remove unused imports.Kegan Dougal2015-02-091-2/+2
| * | | | | | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-095-20/+164
| * | | | | | Register a user account for the AS when the AS registers. Add 'sender' column...Kegan Dougal2015-02-095-4/+14
| * | | | | | 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-062-7/+52
| * | | | | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-064-24/+63
| * | | | | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-053-1/+44
| * | | | | | Dependency inject ApplicationServiceApi when creating ApplicationServicesHand...Kegan Dougal2015-02-053-11/+9
| * | | | | | Add delta sql file.Kegan Dougal2015-02-051-0/+33
| * | | | | | 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-051-4/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-055-163/+222
| |\ \ \ \ \ \ \
| * | | | | | | | Fix unit tests.Kegan Dougal2015-02-051-0/+6
| * | | | | | | | Add CS extension for masquerading as users within the namespaces specified by...Kegan Dougal2015-02-051-0/+23
| * | | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-0527-401/+716
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix user query checks. HS>AS pushing now works.Kegan Dougal2015-02-052-21/+44
| * | | | | | | | | Serialize events before sending to ASesKegan Dougal2015-02-051-0/+10
| * | | | | | | | | Fix unit tests.Kegan Dougal2015-02-051-2/+5
| * | | | | | | | | Glue AS work to general event notifications. Add more exception handling when...Kegan Dougal2015-02-054-16/+42
| * | | | | | | | | Add unit test for appservice_handler.query_room_alias_existsKegan Dougal2015-02-051-1/+30
| * | | | | | | | | 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-052-5/+20
| * | | | | | | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-057-20/+35
| * | | | | | | | | Impl push_bulk functionKegan Dougal2015-02-052-2/+19
| * | | | | | | | | Add SimpleHttpClient.put_json with the same semantics as get_json.Kegan Dougal2015-02-041-2/+46
| * | | | | | | | | Update user/alias query APIs to use new format of SimpleHttpClient.get_jsonKegan Dougal2015-02-042-8/+10
| * | | | | | | | | Modify API for SimpleHttpClient.get_json and update usages.Kegan Dougal2015-02-043-47/+61
| * | | | | | | | | Add query_user/alias APIs.Kegan Dougal2015-02-042-14/+59
| * | | | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-047-5/+101
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-044-9/+207
| * | | | | | | | | | Begin to add unit tests for appservice glue and regex testing.Kegan Dougal2015-02-045-4/+158
| * | | | | | | | | | Add stub ApplicationServiceApi and glue it with the handler.Kegan Dougal2015-02-044-4/+39
| * | | | | | | | | | Add appservice package and move ApplicationService into it.Kegan Dougal2015-02-034-105/+138
| * | | | | | | | | | Implement restricted namespace checks. Begin fleshing out the main hook for n...Kegan Dougal2015-02-032-5/+35
| * | | | | | | | | | Add namespace constants. Add restrict_to option to limit namespace checks.Kegan Dougal2015-02-032-27/+39
| * | | | | | | | | | Everyone loves SQL typosKegan Dougal2015-02-031-1/+1
| * | | | | | | | | | Implement regex checks for app services.Kegan Dougal2015-02-032-29/+67
| * | | | | | | | | | Add defers in the right places.Kegan Dougal2015-02-021-0/+2
| * | | | | | | | | | Implement txns for AS (un)registration.Kegan Dougal2015-02-023-23/+102
| * | | | | | | | | | Actually merge into develop.Kegan Dougal2015-02-021-8/+1
| * | | | | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-0277-1554/+6385
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice store...Kegan Dougal2015-01-285-16/+117
| * | | | | | | | | | | Remove unused importKegan Dougal2015-01-281-2/+0
| * | | | | | | | | | | Log when ASes are registered/unregistered.Kegan Dougal2015-01-272-1/+5
| * | | | | | | | | | | Use ApplicationService when registering.Kegan Dougal2015-01-273-20/+17
| * | | | | | | | | | | Add stub methods, TODOs and docstrings for application services.Kegan Dougal2015-01-272-5/+72
| * | | | | | | | | | | Add AS specific classes with docstrings.Kegan Dougal2015-01-271-1/+59
| * | | | | | | | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-276-5/+107
| * | | | | | | | | | | Parse /register and /unregister request JSON.Kegan Dougal2015-01-271-2/+78
| * | | | | | | | | | | Add stub application services REST API.Kegan Dougal2015-01-277-1/+135
* | | | | | | | | | | | Merge pull request #72 from matrix-org/in_memory_sqlite_for_testingMark Haines2015-02-132-10/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Prepare the database whenever a connection is opened from the db_pool so that...Mark Haines2015-02-132-10/+7
* | | | | | | | | | | | Bump versionErik Johnston2015-02-131-1/+1
* | | | | | | | | | | | Merge pull request #71 from matrix-org/auth-conflict-resErik Johnston2015-02-132-14/+63
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | pyflakesErik Johnston2015-02-131-1/+1
| * | | | | | | | | | | When we see a difference in current state, actually use state conflict resolu...Erik Johnston2015-02-132-14/+63
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Bump version v0.7.0bErik Johnston2015-02-131-1/+1
* | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-133-18/+39
|\| | | | | | | | | |
| * | | | | | | | | | Reindent code to be less human-readable to keep pep8 from complainingPaul "LeoNerd" Evans2015-02-121-1/+1
| * | | | | | | | | | Only attempt to fetch presence state of JOINed members in room initialSync (S...Paul "LeoNerd" Evans2015-02-121-0/+1
| * | | | | | | | | | Merge pull request #70 from matrix-org/exception-fixesMatthew Hodgson2015-02-123-18/+39
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix loggingErik Johnston2015-02-121-1/+4
| | * | | | | | | | | | Remove unused functionErik Johnston2015-02-121-12/+0
| | * | | | | | | | | | Parrellize fetching of eventsErik Johnston2015-02-121-3/+11
| | * | | | | | | | | | Correctly handle all the places that can throw exceptionsErik Johnston2015-02-124-15/+37
* | | | | | | | | | | | 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
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-122-8/+7
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #69 from matrix-org/hotfixes-v0.7.0a v0.7.0aErik Johnston2015-02-122-8/+7
|/| | | | | | | | | |
| * | | | | | | | | | Bump versionErik Johnston2015-02-121-1/+1
| * | | | | | | | | | Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0aErik Johnston2015-02-121-7/+6
|/| | | | | | | | | |
| * | | | | | | | | | Get an auth query one at a timeErik Johnston2015-02-121-7/+6
* | | | | | | | | | | Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse v0.7.0Erik Johnston2015-02-12178-4381/+9450
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Expand on cachingErik Johnston2015-02-121-1/+7
| * | | | | | | | | | | Add note about alpha csv2 apisErik Johnston2015-02-121-2/+3
| * | | | | | | | | | | TypoesErik Johnston2015-02-121-2/+2
| * | | | | | | | | | | Add note about push supportErik Johnston2015-02-121-0/+1
| * | | | | | | | | | | Bump webclient versionErik Johnston2015-02-121-3/+3
| * | | | | | | | | | | Use consistent style of headingErik Johnston2015-02-121-2/+2