summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* PEP8Kegan Dougal2015-02-271-1/+0
* Notify appservices of invites mid-poll.Kegan Dougal2015-02-271-1/+29
* Check for membership invite events correctly.Kegan Dougal2015-02-261-2/+21
* 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
* turns uris config options should append since it's a listDavid Baker2015-02-241-1/+1
* %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-243-1/+9
|\
| * Trailing commaKegan Dougal2015-02-231-1/+1
| * 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-231-2/+1
* | 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-235-3/+43
|\|
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik 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
| * | Always allow AS to registerErik Johnston2015-02-201-3/+5
| * | 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
| |/
* | 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-231-8/+15
* | 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-192-16/+25
* | 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
|/
* Send room ID in http notifications so clients know which room to go to if the...David Baker2015-02-191-0/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-187-39/+98
|\
| * Merge pull request #82 from matrix-org/git_tag_versionErik Johnston2015-02-186-36/+95
| |\
| | * 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-184-34/+25
| | * 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
| * | 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-1726-90/+1375
| | |\ \ \ \
| | * | | | | 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
* | | | | | | 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
| |/ / /
* | | / Change some debug logging to infoErik Johnston2015-02-171-2/+4
| |_|/ |/| |
* | | 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
| |/ |/|
* | Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into developErik Johnston2015-02-162-2/+2
|\|
| * Bump versionErik Johnston2015-02-151-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
|\|
| * 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 pull request #50 from matrix-org/application-servicesMark Haines2015-02-1325-75/+1360
|\ \
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-118-25/+202
| |\ \
| * | | 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-113-11/+31
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-1124-79/+214
| |\ \ \
| * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-0917-137/+238
| |\ \ \ \
| * | | | | Fix bugs so lazy room joining works as intended.Kegan Dougal2015-02-093-12/+23
| * | | | | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-092-19/+19
| * | | | | 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-052-4/+6
| * | | | | 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-0524-400/+642
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | Glue AS work to general event notifications. Add more exception handling when...Kegan Dougal2015-02-054-16/+42
| * | | | | | | | 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-056-16/+29
| * | | | | | | | 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-044-1/+96
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-041-4/+14
| * | | | | | | | | Begin to add unit tests for appservice glue and regex testing.Kegan Dougal2015-02-042-4/+18
| * | | | | | | | | 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-0264-1233/+5153
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
* | | | | | | | | | | 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-132-16/+34
|\| | | | | | | | | |
| * | | | | | | | | | 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
| * | | | | | | | | | 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-123-13/+32
* | | | | | | | | | | 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
|/ / / / / / / / / /
* | | | | | | | | | 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
* | | | | | | | | | | Bump webclient versionErik Johnston2015-02-121-3/+3
* | | | | | | | | | | Set database schema version in deltaErik Johnston2015-02-121-0/+2
* | | | | | | | | | | Bump versionErik Johnston2015-02-121-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Convert get_rooms to use runInteraction so the transacion has a more helpful ...Erik Johnston2015-02-111-30/+37
* | | | | | | | | | Use encode_canonical_json for http clientErik Johnston2015-02-111-1/+3
* | | | | | | | | | Use encode_canonical_json for pushesErik Johnston2015-02-111-1/+3
* | | | | | | | | | Update dependency linksErik Johnston2015-02-111-2/+2
* | | | | | | | | | Merge pull request #61 from matrix-org/timeout-federation-requestsErik Johnston2015-02-113-2/+63
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix so timing out connections to actually work.Erik Johnston2015-02-112-9/+45
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati...Erik Johnston2015-02-116-6/+151
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federati...Erik Johnston2015-02-11100-2099/+6821
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | PEP8Erik Johnston2015-02-111-1/+0
| * | | | | | | | | | | | Move time_bound_deferred into ClockErik Johnston2015-02-113-24/+22
| * | | | | | | | | | | | Time out HTTP federation requestsErik Johnston2015-02-102-2/+29
* | | | | | | | | | | | | Merge pull request #62 from matrix-org/state-chacheErik Johnston2015-02-112-3/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1110-18/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1012-38/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-101-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove unnecessary loggingErik Johnston2015-02-101-6/+1
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-101-26/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-101-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1016-73/+206
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Oops, we do want to defer.return regardless of whether we are caching or notErik Johnston2015-02-101-1/+1
| * | | | | | | | | | | | | | | | | | | Move construction of object within if blockErik Johnston2015-02-101-6/+6
| * | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-061-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Bug fixes.Erik Johnston2015-02-062-27/+57
| * | | | | | | | | | | | | | | | | | | | Bugfix cache layerErik Johnston2015-02-062-11/+22
| * | | | | | | | | | | | | | | | | | | | Add cache layer to state group resolutionErik Johnston2015-02-062-1/+72
* | | | | | | | | | | | | | | | | | | | | Bump syutil versionErik Johnston2015-02-111-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejsonErik Johnston2015-02-117-23/+201
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Allow newer versions of syutilMark Haines2015-02-111-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'bugs/SYN-264' into developPaul "LeoNerd" Evans2015-02-111-18/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Added another TODO notePaul "LeoNerd" Evans2015-02-111-0/+3
| | * | | | | | | | | | | | | | | | | | | Cache the result of a get_rooms_for_user query, to make user_rooms_intersect(...Paul "LeoNerd" Evans2015-02-111-7/+34
| | * | | | | | | | | | | | | | | | | | | First step of making user_rooms_intersect() faster - implement in intersectio...Paul "LeoNerd" Evans2015-02-111-18/+20
| | | |_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Invalidate the cache for an event if it is redactedMark Haines2015-02-111-0/+2
| * | | | | | | | | | | | | | | | | | | Fix formattingMark Haines2015-02-111-2/+0
| * | | | | | | | | | | | | | | | | | | Add a cache for get_eventMark Haines2015-02-114-3/+39
| * | | | | | | | | | | | | | | | | | | Add a lru cache classMark Haines2015-02-111-0/+110
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | pyflakesErik Johnston2015-02-112-2/+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-116-13/+36
* | | | | | | | | | | | | | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-1121-21/+21
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | / / / / / / / / / Fix bug where variable was not always definedErik Johnston2015-02-111-2/+1
| |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Bump versionErik Johnston2015-02-101-1/+1
| * | | | | | | | | | | | | | | Fix prune_events to work with nested dictsErik Johnston2015-02-101-2/+4
| * | | | | | | | | | | | | | | Ver bumpErik Johnston2015-02-041-1/+1
| * | | | | | | | | | | | | | | Pull in python_dependencies.py from developErik Johnston2015-02-041-0/+122
* | | | | | | | | | | | | | | | Merge branch 'develop' into single_source_version_and_dependenciesMark Haines2015-02-107-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix code-styleMark Haines2015-02-107-12/+12
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | Single source version and python dependencies, prevent people accidentally in...Mark Haines2015-02-101-3/+3
|/ / / / / / / / / / / / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 20:29:45 +0000