summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | | | | | | | | Application Services
| * | | 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 ↵Kegan Dougal2015-02-114-11/+56
| | | | | | | | | | | | | | | | | | | | part of.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens)
| * | | | | | Register a user account for the AS when the AS registers. Add 'sender' ↵Kegan Dougal2015-02-095-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | column to AS table.
| * | | | | | 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 a new errcode type M_EXCLUSIVE when users try to create aliases inside AS namespaces, and when ASes try to create aliases outside their own namespace.
| * | | | | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-053-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows known application services to register any user ID under their own user namespace(s).
| * | | | | | Dependency inject ApplicationServiceApi when creating ↵Kegan Dougal2015-02-053-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationServicesHandler.
| * | | | | | 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 ↵Kegan Dougal2015-02-051-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ASes when queried for room aliases via federation.
| * | | | | | 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 ↵Kegan Dougal2015-02-051-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by the AS.
| * | | | | | | | 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 ↵Kegan Dougal2015-02-054-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when poking ASes.
| * | | | | | | | | 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 ↵Kegan Dougal2015-02-052-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | searching for services by alias.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would only return the HTTP body as JSON, and discard other response information (e.g. the HTTP response code). This has now been changed to throw a CodeMessageException on a non-2xx response, with the response code and body, which can then be parsed as JSON. Affected modules include: - Registration/Login (when using an email for IS auth)
| * | | | | | | | | 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 ↵Kegan Dougal2015-02-032-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifying application services.
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose handler.get_services_for_event which manages the checks for all services.
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
| * | | | | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵Kegan Dougal2015-01-285-16/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it.
| * | | | | | | | | | | 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...
| * | | | | | | | | | | Prepare the database whenever a connection is opened from the db_pool so ↵Mark Haines2015-02-132-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that in-memory databases will work
* | | | | | | | | | | | Bump versionErik Johnston2015-02-131-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #71 from matrix-org/auth-conflict-resErik Johnston2015-02-132-14/+63
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | When we see a difference in current state, actually use state conflict resolution algorithm
| * | | | | | | | | | | pyflakesErik Johnston2015-02-131-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | When we see a difference in current state, actually use state conflict ↵Erik Johnston2015-02-132-14/+63
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolution algorithm
* | | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SYN-202)
| * | | | | | | | | | Merge pull request #70 from matrix-org/exception-fixesMatthew Hodgson2015-02-123-18/+39
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Exception fixes
| | * | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-02-121-0/+1
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (SYN-202)
* | | | | | | | | | | 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
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfixes v0.7.0a
| * | | | | | | | | | 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
| | | | | | | | | | | |
| * | | | | | | | | | | Change develop to v0.7.0Erik Johnston2015-02-121-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | More rst fixes. Expand on JSON library changeErik Johnston2015-02-121-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Fix rst formattingErik Johnston2015-02-121-36/+36
| | | | | | | | | | | |
| * | | | | | | | | | | Update CHANGES.rstErik Johnston2015-02-121-3/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Fix rstErik Johnston2015-02-121-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Update UPGRADES to mention updated dependenciesErik Johnston2015-02-121-0/+14
| | | | | | | | | | | |
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Timeout federation requests
| | * | | | | | | | | | Fix so timing out connections to actually work.Erik Johnston2015-02-112-9/+45
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-1133-368/+353
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout-federation-requests
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-11172-3943/+8780
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout-federation-requests
| | * | | | | | | | | | | | 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-113-4/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | State chache
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-1112-54/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ 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-1018-73/+291
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py synapse/state.py
| | * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix testsErik Johnston2015-02-091-1/+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
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #66 from matrix-org/use-simplejsonErik Johnston2015-02-1126-35/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use simplejson
| | * | | | | | | | | | | | | | | | | | | | Bump syutil versionErik Johnston2015-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejsonErik Johnston2015-02-1110-25/+261
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-02-111-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_rooms_intersect() much lighter in the read-common case
| | * | | | | | | | | | | | | | | | | | | First step of making user_rooms_intersect() faster - implement in ↵Paul "LeoNerd" Evans2015-02-111-18/+20
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intersection logic in Python code terms of a DB query that is cacheable per user
| * | | | | | | | | | | | | | | | | | | Merge pull request #65 from matrix-org/get_event_cacheMark Haines2015-02-118-6/+210
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an in-memory cache for get_event in the storage layer
| | * | | | | | | | | | | | | | | | | | | 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-116-5/+43
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Add a lru cache classMark Haines2015-02-112-0/+166
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | 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 ↵Erik Johnston2015-02-116-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSONEncoder that understands FrozenDict
| | | | * | | | | | | | | | | | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-1121-21/+21
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Mention new libs in CHANGESErik Johnston2015-02-111-0/+2
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge pull request #63 from matrix-org/homeserver_test_setupMark Haines2015-02-1125-360/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | Factor out some of the common homeserver setup code
| | * | | | | | | | | | | | | | | | | Factor out some of the common homeserver setup code into aMark Haines2015-02-1125-360/+140
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup_test_homeserver function in utils.
| * | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f v0.6.1fErik Johnston2015-02-103-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfixes v0.6.1f
| * | | | | | | | | | | | | | | | Bump versionErik Johnston2015-02-102-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix prune_events to work with nested dictsErik Johnston2015-02-101-2/+4
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Pin the twisted version so that it doesn't pull in twisted 15. v0.6.1eErik Johnston2015-02-041-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #48 from matrix-org/hotfixes-v0.6.1eMatthew Hodgson2015-02-044-7/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfixes v0.6.1e
| * | | | | | | | | | | | | | | | Ver bumpErik Johnston2015-02-042-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Pull in python_dependencies.py from developErik Johnston2015-02-041-0/+122
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Bluntly port changes of README from develop to masterErik Johnston2015-02-041-5/+14
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Revert "Pull in python_dependencies.py from develop"Erik Johnston2015-02-041-122/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 47b1e1491f7f98b57f4b6894f0d4d333e64bf721.
* | | | | | | | | | | | | | | | | Pull in python_dependencies.py from developErik Johnston2015-02-041-0/+122
|/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #60 from matrix-org/single_source_version_and_dependenciesMark Haines2015-02-103-39/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single source version and dependencies
| | * | | | | | | | | | | | | | | Rename path to path_segments to make it clearer that it is a listMark Haines2015-02-101-4/+4
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'develop' into single_source_version_and_dependenciesMark Haines2015-02-107-12/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix code-styleMark Haines2015-02-107-12/+12
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add the 'setup_requires' and allow easy_install since jenkins uses themMark Haines2015-02-101-14/+5
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Single source version and python dependencies, prevent people accidentally ↵Mark Haines2015-02-103-44/+43
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installing with easy_install, use scripts rather than entry_points to install synctl
| * | | | | | | | | | | | | | Log all the exits from _attempt_new_transactionErik Johnston2015-02-101-2/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Code-style fixesMark Haines2015-02-1011-36/+57
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Sign auth_chains when returned by /state/ requestsErik Johnston2015-02-101-0/+11
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #58 from matrix-org/get_event_countersMark Haines2015-02-101-26/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | Add performance counters for different stages of loading events
| | * | | | | | | | | | | Fix pyflakesMark Haines2015-02-101-3/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add performance counters for different stages of loading eventsMark Haines2015-02-101-24/+60
| | | | | | | | | | | | |
| * | | | | | | | | | | | yaml.load expects strings to be a yaml rather than fileErik Johnston2015-02-101-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use yaml logging config format because it is much nicerErik Johnston2015-02-101-1/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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 ↵Mark Haines2015-02-061-1/+3
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room
| | * | | | | | | | | Explicitly list the RejectedReasons that we can proveErik Johnston2015-02-061-1/+6
| | | | | | | | | | |
| * | | | | | | | | | Convert directory paths to absolute paths before daemonizingMark Haines2015-02-091-2/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #56 from matrix-org/room_initial_sync_perfMark Haines2015-02-094-21/+43
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | During room intial sync, only calculate current state once.
| | * | | | | | | | | | During room intial sync, only calculate current state once.Erik Johnston2015-02-094-21/+43
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #57 from matrix-org/transaction_countersErik Johnston2015-02-091-2/+31
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Transaction counters
| | * | | | | | | | | | Use the transaction 'desc' rather than 'name', increment the txn_ids inMark Haines2015-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | txn names
| | * | | | | | | | | | FormattingMark Haines2015-02-091-1/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Performance counters for database transaction namesMark Haines2015-02-091-1/+31
| | |/ / / / / / / / /
| * | | | | | | | | | Need to use re.search if looking for matches not at the start of the string. ↵David Baker2015-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also comparisons with None should be 'is'.
| * | | | | | | | | | oopsMatthew Hodgson2015-02-091-1/+1
| | | | | | | | | | |
| * | | | | | | | | | oopsMatthew Hodgson2015-02-091-1/+1
| | | | | | | | | | |
| * | | | | | | | | | only do word-boundary patches on bodies for nowMatthew Hodgson2015-02-092-2/+5
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #55 from matrix-org/profilingErik Johnston2015-02-096-6/+60
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Profiling
| | * | | | | | | | | Fix typoErik Johnston2015-02-091-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Add looping_call to ClockErik Johnston2015-02-091-1/+9
| | | | | | | | | | |
| | * | | | | | | | | Log database time every 10s and log as percentageErik Johnston2015-02-091-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Time how long we're spending on the database threadErik Johnston2015-02-092-0/+27
| | | | | | | | | | |
| | * | | | | | | | | Log when we receive a request, when we send a response and how long it took ↵Erik Johnston2015-02-094-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to process it.
| * | | | | | | | | | Fix server default rule injection (downwards, not upwards!)David Baker2015-02-091-6/+6
| |/ / / / / / / / /
| * | | | | | | | | glob *s should probably be non-greedyMatthew Hodgson2015-02-081-1/+1
| | | | | | | | | |
| * | | | | | | | | oopsMatthew Hodgson2015-02-081-1/+1
| | | | | | | | | |
| * | | | | | | | | kill off fnmatch in favour of word-boundary based push alerts (untested)Matthew Hodgson2015-02-081-12/+20
| | | | | | | | | |
| * | | | | | | | | Merge pull request #53 from matrix-org/default_avatar_identiconsMatthew Hodgson2015-02-073-25/+88
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | create identicons for new users by default as default avatars
| | * | | | | | | | | don't give up if we can't create default avatars during testsMatthew Hodgson2015-02-071-9/+12
| | | | | | | | | | |
| | * | | | | | | | | add some options and docMatthew Hodgson2015-02-071-5/+20
| | | | | | | | | | |
| | * | | | | | | | | ...and here's the actual impl. git fail.Matthew Hodgson2015-02-072-25/+46
| | | | | | | | | | |
| | * | | | | | | | | create identicons for new users by default as default avatars, and provide ↵Matthew Hodgson2015-02-071-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script to update existing avatarless users
| * | | | | | | | | | clean up TurnedToDust's ArchLinux notes a bitMatthew Hodgson2015-02-071-18/+26
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #52 from TurnedToDust/patch-2Matthew Hodgson2015-02-071-0/+38
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | Thanks Dust - this is great :) will merge to develop and tweak it slightly there.
| | * | | | | | | | | Update to README.rstTurnedToDust2015-02-061-0/+38
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | Added Documentation regarding ArchLinux
| * | | | | | | | | thou shalt specify a content-lengthMatthew Hodgson2015-02-071-0/+1
| | | | | | | | | |
| * | | | | | | | | i hate weakly typed languagesMatthew Hodgson2015-02-071-1/+1
| |/ / / / / / / /
| * / / / / / / / SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵Mark Haines2015-02-061-1/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | topological token to a stream token before passing it to get_recent_events_for_room
| * | | | | | | Move delta/v13.sql to delta/v12.sqlErik Johnston2015-02-062-24/+11
| | | | | | | |
| * | | | | | | Don't query auth if the only difference is events that were rejected due to ↵Erik Johnston2015-02-061-56/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | auth.
| * | | | | | | Make seen_ids a setErik Johnston2015-02-061-1/+3
| | | | | | | |
| * | | | | | | Return body of response in HttpResponseExceptionErik Johnston2015-02-061-1/+2
| | | | | | | |
| * | | | | | | Handle the fact the list.remove raises if element doesn't existErik Johnston2015-02-061-4/+10
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | priority class now dealt with in namespaced rule_idDavid Baker2015-02-051-4/+0
| | |_|_|_|/ | |/| | | |
| * | | | | Give server default rules the 'default' attribute and fix various brokenness.David Baker2015-02-053-3/+9
| | | | | |
| * | | | | Server default rules now of all kinds rather than all being at lowest prio.David Baker2015-02-054-51/+98
| | | | | |
| * | | | | namespace rule IDs to be unique within their scope and rule type.David Baker2015-02-051-123/+129
| | |_|_|/ | |/| | |
| * | | | Merge branch 'federation_client_retries' of github.com:matrix-org/synapse ↵Erik Johnston2015-02-058-89/+169
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into develop
| | * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-053-5/+82
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | federation_client_retries
| | * | | | | Connection errors in twisted aren't RuntimeErrorsErik Johnston2015-02-051-2/+2
| | | | | | |
| | * | | | | Pass through list of room hosts from room alias query to federation so that ↵Erik Johnston2015-02-053-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it can retry against different room hosts
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-0416-49/+146
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | federation_client_retries
| | * \ \ \ \ \ Merge branch 'signature_failures' of github.com:matrix-org/synapse into ↵Erik Johnston2015-02-043-9/+15
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | federation_client_retries
| | * | | | | | | Apply sanity to the transport client interface. Convert 'make_join' and ↵Erik Johnston2015-02-046-71/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'send_join' to accept iterables of destinations
| | * | | | | | | When returning lists of servers from alias lookups, put the current server ↵Erik Johnston2015-02-041-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first in the list
| | * | | | | | | Retry make_joinErik Johnston2015-02-041-7/+12
| | | | | | | | |
| * | | | | | | | Merge pull request #47 from matrix-org/signature_failuresErik Johnston2015-02-059-272/+429
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | | Federation fixes.
| | * | | | | | Change context.auth_events to what the auth_events would be bases on ↵Erik Johnston2015-02-043-9/+15
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | context.current_state, rather than based on the auth_events from the event.
| | * | | | | Brief comment on why we do some things on every call to persist_event and ↵Erik Johnston2015-02-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not others
| | * | | | | Fix state resolution to remember join_rules is a type of auth event.Erik Johnston2015-02-041-1/+13
| | | | | | |
| | * | | | | Rearrange persist_event so that do all the queries that need to be done ↵Erik Johnston2015-02-043-72/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | before returning early if we have already persisted that event.
| | * | | | | Add doc to get_eventErik Johnston2015-02-031-0/+15
| | | | | | |
| | * | | | | New lineErik Johnston2015-02-031-1/+1
| | | | | | |
| | * | | | | Neaten the handling of state and auth_chain up a bitErik Johnston2015-02-031-27/+30
| | | | | | |
| | * | | | | Actually, the old prune_event function was non-deterministic, so no point ↵Erik Johnston2015-02-032-91/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | keeping it around :(
| | * | | | | Remove unused importsErik Johnston2015-02-031-5/+0
| | | | | | |
| | * | | | | Add new FederationBaseErik Johnston2015-02-031-0/+126
| | | | | | |
| | * | | | | Keep around the old (buggy) version of the prune_event function so that we ↵Erik Johnston2015-02-034-137/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | can use it to check signatures for events on old servers
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-25 01:54:51 +0000