summary refs log tree commit diff
path: root/synapse/api (follow)
Commit message (Expand)AuthorAgeFilesLines
* Check room exists when authenticating an event, by asserting they reference a...Erik Johnston2015-09-011-0/+8
* Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-251-3/+1
* Re-wrap lineDaniel Wagner-Hall2015-08-251-3/+1
* Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-251-10/+7
* Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-202-0/+3
|\
| * Add m.room.avatar to default power levels. Change default required power leve...Erik Johnston2015-08-201-0/+1
| * Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-201-0/+1
| |\
| | * Add canonical alias to the default power levelsErik Johnston2015-08-191-0/+1
| * | Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+1
| |\ \ | | |/ | |/|
| | * Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-041-0/+1
* | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-201-3/+3
|/ /
* | Set request.authenticated_entity for application servicesErik Johnston2015-08-181-0/+3
* | Add missing space because linterDaniel Wagner-Hall2015-08-111-1/+1
* | Minor docs cleanupDaniel Wagner-Hall2015-08-111-2/+7
* | Remove redundant if-guardDaniel Wagner-Hall2015-08-111-13/+12
|/
* Merge pull request #203 from matrix-org/erikj/room_creation_presetsErik Johnston2015-07-161-0/+5
|\
| * Capitalize contantsErik Johnston2015-07-141-2/+2
| * Implement presets at room creationErik Johnston2015-07-131-0/+5
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_leve...Erik Johnston2015-07-132-1/+4
|\|
| * Add m.room.history_visibility to newly created rooms' m.room.power_levelsErik Johnston2015-07-061-0/+1
| * Add m.room.history_visibility to list of auth eventsErik Johnston2015-07-031-1/+1
| * Add basic impl for room history ACL on GET /messages client APIErik Johnston2015-07-021-0/+2
* | Sanitize power level checksErik Johnston2015-07-101-15/+21
* | You shouldn't be able to ban/kick users with higher power levelsErik Johnston2015-07-101-2/+5
|/
* Log more when we have processed the requestErik Johnston2015-06-151-0/+2
* TypoErik Johnston2015-05-011-1/+1
* Remove some run_on_reactorsErik Johnston2015-05-011-3/+0
* Don't log all auth events every time we call auth.checkErik Johnston2015-05-011-1/+4
* Don't wait for storage of access_tokenErik Johnston2015-05-011-1/+1
* Merge branch 'develop' into key_distributionMark Haines2015-04-293-19/+40
|\
| * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-283-19/+32
| |\
| | * Merge branch 'develop' into csauthDavid Baker2015-04-242-60/+32
| | |\
| | * | Dedicated error code for failed 3pid auth verificationDavid Baker2015-04-231-0/+1
| | * | Add an error code to 'missing token' response.David Baker2015-04-232-1/+3
| | * | Merge branch 'develop' into csauthDavid Baker2015-04-171-14/+11
| | |\ \
| | * | | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-151-0/+1
| | * | | Add app service auth back in to v2 registerDavid Baker2015-04-021-3/+1
| | * | | Add shared secret auth into register v2 and switch the script over.David Baker2015-04-021-1/+3
| | * | | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-301-0/+2
| | * | | unused importDavid Baker2015-03-241-1/+1
| | * | | 1) Pushers are now associated with an access tokenDavid Baker2015-03-241-18/+25
| * | | | Merge branch 'develop' into invite_power_levelPaul "LeoNerd" Evans2015-04-272-38/+14
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Also remember to check 'invite' level for changesPaul "LeoNerd" Evans2015-04-211-0/+1
| * | | | Initial implementation of an 'invite' power_levelPaul "LeoNerd" Evans2015-04-211-0/+7
* | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-242-60/+32
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | No commas here, otherwise our error string constants become tuples.David Baker2015-04-241-2/+2
| * | | | Neater fetching of user's auth level in a room - squash to int() at access ti...Paul "LeoNerd" Evans2015-04-221-35/+12
| * | | | Appease pep8Paul "LeoNerd" Evans2015-04-221-1/+0
| |/ / /
| * | | Much neater fetching of defined powerlevels from m.room.power_levels state eventPaul "LeoNerd" Evans2015-04-211-31/+21
| * | | Remove debugging print statement accidentally committedPaul "LeoNerd" Evans2015-04-211-1/+0
| * | | Sanitise a user's powerlevel to an int() before numerical comparison, because...Paul "LeoNerd" Evans2015-04-211-0/+7
| | |/ | |/|
* | | Merge branch 'develop' into key_distributionMark Haines2015-04-201-13/+10
|\| |
| * | Neater implementation of membership change auth checks, ensuring we can't for...Paul "LeoNerd" Evans2015-04-151-18/+10
| * | Ensure that non-room-members cannot ban others, even if they do have enough p...Paul "LeoNerd" Evans2015-04-151-0/+5
* | | Add a version 2 of the key server apiMark Haines2015-04-141-0/+1
|/ /
* / Fix a bug which causes a send event level of 0 to not be honoured.Kegan Dougal2015-04-071-1/+1
|/
* Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-181-0/+1
|\
| * Implement registering with shared secret.Erik Johnston2015-03-131-0/+1
* | @cached() annotate get_user_by_token() - achieves a minor DB performance impr...Paul "LeoNerd" Evans2015-03-171-1/+1
* | Remove concept of context.auth_events, instead use context.current_stateErik Johnston2015-03-161-6/+0
* | Make context.auth_events grap auth events from current state. Otherwise auth ...Erik Johnston2015-03-161-1/+7
* | Respect ban membershipErik Johnston2015-03-161-5/+17
|/
* Add RegisterFallbackResource to /_matrix/static/client/registerKegan Dougal2015-02-231-0/+1
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-111-7/+14
|\
| * During room intial sync, only calculate current state once.Erik Johnston2015-02-091-7/+14
* | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-091-18/+16
* | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-062-1/+14
* | Add m.login.application_service registration procedure.Kegan Dougal2015-02-051-0/+1
* | 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-052-9/+13
|\|
| * Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder...Erik Johnston2015-02-041-6/+6
| |\
| | * Change context.auth_events to what the auth_events would be bases on context....Erik Johnston2015-02-041-6/+6
| * | Apply sanity to the transport client interface. Convert 'make_join' and 'send...Erik Johnston2015-02-041-1/+7
| |/
| * Keep around the old (buggy) version of the prune_event function so that we ca...Erik Johnston2015-02-031-2/+0
* | Merge branch 'develop' into application-servicesKegan Dougal2015-02-024-20/+297
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-301-0/+229
| |\
| | * Use 'in' to test if the key exists, remove unused _filters_for_userMark Haines2015-01-301-6/+2
| | * Unused importMark Haines2015-01-301-2/+0
| | * Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-112/+108
| | * Merge branch 'develop' into client_v2_filterMark Haines2015-01-291-0/+1
| | |\
| | * | Fix code-styleMark Haines2015-01-291-13/+6
| | * | Merge changes from developMark Haines2015-01-292-3/+38
| | |\ \
| | * | | Add basic filtering public API unit tests. Use defers in the right places.Kegan Dougal2015-01-291-4/+7
| | * | | Implement filter algorithm. Add basic event type unit tests to assert it works.Kegan Dougal2015-01-291-0/+49
| | * | | Add filtering public API; outline filtering algorithm.Kegan Dougal2015-01-291-8/+52
| | * | | Add filtering.filter_events function, with stub passes_filter function.Kegan Dougal2015-01-291-0/+15
| | * | | Add filter JSON sanity checks.Kegan Dougal2015-01-281-4/+105
| | * | | Move storage of user filters into real datastore layer; now have to mock it o...Paul "LeoNerd" Evans2015-01-271-23/+4
| | * | | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-271-2/+14
| | * | | Initial trivial implementation of an actual 'Filtering' object; move storage ...Paul "LeoNerd" Evans2015-01-271-0/+41
| * | | | Fix bug where we superfluously asked for current state. Change API of /query_...Erik Johnston2015-01-301-0/+2
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-303-3/+40
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Code style fixes.Mark Haines2015-01-291-0/+1
| | | |/ | | |/|
| | * | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-281-3/+8
| | |\ \
| | | * | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ...Mark Haines2015-01-281-2/+2
| | | * | Add a : to the doc string after the type of the return valueMark Haines2015-01-281-1/+1
| | | * | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-281-3/+5
| | | * | Return the device_id from get_auth_by_reqMark Haines2015-01-281-2/+5
| | | |/
| | * | Merge branch 'develop' into pushersDavid Baker2015-01-282-4/+6
| | |\|
| | * | Add slightly pedantic trailing slash error.David Baker2015-01-231-1/+6
| | * | right super() paramDavid Baker2015-01-231-1/+1
| | * | As yet fairly untested GET API for push rulesDavid Baker2015-01-221-1/+13
| | * | Oops: second part of commit dc938606David Baker2015-01-221-0/+12
| | * | Merge branch 'develop' into pushersDavid Baker2015-01-136-6/+6
| | |\ \
| | * \ \ Merge branch 'develop' into pushersDavid Baker2014-12-189-632/+73
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into pushersDavid Baker2014-12-022-73/+78
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' into pushersDavid Baker2014-11-204-4/+9
| | |\ \ \ \ \
| | * | | | | | Start creating a module to do generic notifications (just prints them to stdo...David Baker2014-11-191-0/+1
| * | | | | | | Start implementing auth conflict resErik Johnston2015-01-282-17/+27
* | | | | | | | Add stub application services REST API.Kegan Dougal2015-01-271-0/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-231-0/+1
|/ / / / / /
* | | | | / Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-231-4/+5
| |_|_|_|/ |/| | | |
* | | | | SYN-154: Tweak how the m.room.create check is done.Kegan Dougal2015-01-071-10/+1
* | | | | SYN-154: Better error messages when joining an unknown room by ID.Kegan Dougal2015-01-071-1/+10
* | | | | Update copyright noticesMark Haines2015-01-066-6/+6
| |_|_|/ |/| | |
* | | | Kill off synapse.api.events.*Erik Johnston2014-12-166-580/+1
* | | | Make auth module use EventTypes constantsErik Johnston2014-12-121-27/+23
* | | | Validate message, topic and name event contentsErik Johnston2014-12-121-0/+5
* | | | Fix stream test. Make sure we add join to auth_events for invitiationsErik Johnston2014-12-121-0/+6
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-112-0/+2
|\ \ \ \
| * | | | Limit the size of images that are thumbnailed serverside. Limit the size of f...Mark Haines2014-12-111-0/+1
| * | | | Merge branch 'develop' into media_repositoryMark Haines2014-12-102-72/+77
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Get uploads working with new media repoMark Haines2014-12-021-0/+1
* | | | | PEP8Erik Johnston2014-12-091-1/+1
* | | | | Remove unused importErik Johnston2014-12-081-1/+0
* | | | | Various typos and bug fixes.Erik Johnston2014-12-081-7/+9
* | | | | Start making more things use EventContext rather than event.*Erik Johnston2014-12-051-13/+20
* | | | | Begin converting things to use the new Event structureErik Johnston2014-12-041-9/+2
* | | | | WIP for new way of managing events.Erik Johnston2014-12-032-6/+16
* | | | | Change DomainSpecificString so that it doesn't use a HomeServer objectErik Johnston2014-12-021-1/+1
| |/ / / |/| | |
* | | | Fix bugs when joining a remote room that has dodgy event graphs. This should ...Erik Johnston2014-11-271-2/+8
* | | | Fix bugs in invite/join dances.Erik Johnston2014-11-252-70/+69
|/ / /
* | / Add missing None checkErik Johnston2014-11-241-1/+1
| |/ |/|
* | Fix pep8 codestyle warningsMark Haines2014-11-202-2/+2
* | Use module loggers rather than the root logger. Exceptions caused by bad clie...Mark Haines2014-11-202-2/+7
|/
* Only users can set state events which have their own user_idErik Johnston2014-11-191-0/+20
* replace user_id with senderMark Haines2014-11-191-1/+3
* SYN-144: Remove bad keys from pdu json objects, convert age_ts to ageMark Haines2014-11-181-1/+12
* Null check when determining default power levelsMark Haines2014-11-181-1/+2
* Fix auth to correctly handle initial creation of roomsErik Johnston2014-11-181-3/+21
* Merge PDUs and Events into one objectMark Haines2014-11-142-0/+8
* Fix bugs with invites/joins across federatiom.Erik Johnston2014-11-121-3/+16
* Fix typo in validatorErik Johnston2014-11-111-2/+8
* Add EventValidator moduleErik Johnston2014-11-111-0/+81
* Add an EventValidator. Fix bugs in auth ++ storageErik Johnston2014-11-102-66/+11
* PEP8Erik Johnston2014-11-102-2/+2
* Fix backfill to work. Add auth to backfill requestErik Johnston2014-11-101-0/+6
* Notify users about invites.Erik Johnston2014-11-101-7/+9
* Fix invite authErik Johnston2014-11-101-3/+5
* Finish redaction algorithm.Erik Johnston2014-11-102-15/+28
* Add hash of current state to eventsErik Johnston2014-11-071-0/+1
* Fix joining over federationErik Johnston2014-11-072-3/+52
* Start implementing auth chainsErik Johnston2014-11-072-3/+2
* Neaten things up a bitErik Johnston2014-11-071-5/+2
* Amalgamate all power levels.Erik Johnston2014-11-065-190/+86
* Don't send prev_state to clients anymoreErik Johnston2014-11-061-1/+1
* Implement new replace_state and changed prev_stateErik Johnston2014-11-061-0/+1
* Fix auth checks to all use the given old_event_stateErik Johnston2014-11-051-24/+31
* Move FederationError to synapse.api.errorsErik Johnston2014-11-041-0/+34
* Fix bugs in generating event signatures and hashingErik Johnston2014-11-031-0/+1
* Rename PDU fields to match that of events.Erik Johnston2014-11-031-1/+1
* Add 'origin' key to eventsErik Johnston2014-11-031-0/+4
* Fix bug in redaction auth.Erik Johnston2014-10-311-2/+2
* Convert event ids to be of the form :example.comErik Johnston2014-10-301-1/+5
* Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho...Erik Johnston2014-10-303-3/+4
|\
| * Fix pep8 warningsMark Haines2014-10-303-3/+4
* | Begin implementing all the PDU storage stuff in Events landErik Johnston2014-10-281-1/+3
* | Merge branch 'event_signing' of github.com:matrix-org/synapse into federation...Erik Johnston2014-10-272-9/+16
|\ \
| * | Merge branch 'develop' into event_signingMark Haines2014-10-171-2/+2
| |\|
| * | Include hashes of previous pdus when referencing themMark Haines2014-10-161-1/+1
| * | persist hashes and origin signatures for PDUsMark Haines2014-10-151-8/+15
* | | Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho...Erik Johnston2014-10-271-2/+2
|\ \ \ | | |/ | |/|
| * | SPEC-7: Rename 'ts' to 'origin_server_ts'Mark Haines2014-10-171-2/+2
| |/
* | Fix bug where people could join private roomsErik Johnston2014-10-171-39/+47
* | Use state groups to get current state. Make join dance actually work.Erik Johnston2014-10-171-0/+5
* | Finish implementing the new join dance.Erik Johnston2014-10-172-3/+20
* | Start implementing the invite/join dance. Continue moving auth to use event.s...Erik Johnston2014-10-161-10/+6
* | Begin making auth use event.old_state_eventsErik Johnston2014-10-151-43/+70
|/
* Respond with more helpful error messages for unsigned requestsMark Haines2014-10-131-0/+1
* Merge branch 'develop' into server2server_signingMark Haines2014-09-305-14/+150
|\
| * Update docstringErik Johnston2014-09-291-1/+1
| * SYN-48: Implement WHOIS rest servletErik Johnston2014-09-291-9/+19
| * Add auth check to test if a user is an admin or not.Erik Johnston2014-09-291-0/+3
| * SYN-48: Track User-Agents as well as IPs for client devices.Erik Johnston2014-09-291-1/+10
| * Track the IP users connect with. Add an admin column to users table.Erik Johnston2014-09-261-1/+9
| * Merge branch 'deletions' of github.com:matrix-org/synapse into developErik Johnston2014-09-255-6/+112
| |\
| | * Don't strip out null's in serialized events, as that is not need anymore and ...Erik Johnston2014-09-251-1/+2
| | * Don't strip of False values from events when serializingErik Johnston2014-09-251-1/+1
| | * Rename deletions to redactionsErik Johnston2014-09-245-18/+18
| | * Fill out the prune_event method.Erik Johnston2014-09-241-6/+31
| | * Rename 'pruned' to 'pruned_because'Erik Johnston2014-09-231-1/+1
| | * SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops lev...Erik Johnston2014-09-231-3/+31
| | * Add prune_event methodErik Johnston2014-09-231-0/+39
| | * Add m.room.deletion. If an event is deleted it will be returned to clients 'p...Erik Johnston2014-09-233-3/+16
| * | SYN-70: And fix another bug where I can't typeErik Johnston2014-09-241-1/+1
| * | SYN-70: Fix typoErik Johnston2014-09-241-1/+1
| |/
* / Add a _matrix/key/v1 resource with the verification keys of the local serverMark Haines2014-09-231-1/+2
|/
* Merge branch 'develop' into test-sqlite-memoryPaul "LeoNerd" Evans2014-09-172-4/+11
|\
| * Fix bug where we didn't always get 'prev_content' keyErik Johnston2014-09-151-4/+1
| * Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than t...Erik Johnston2014-09-151-0/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into registration-api...Kegan Dougal2014-09-152-0/+21
| |\
| * | Added LoginType constants. Created general structure for processing registrat...Kegan Dougal2014-09-151-0/+9
* | | Print expected-vs-actual data types on typecheck failure from check_json()Paul "LeoNerd" Evans2014-09-171-1/+2
| |/ |/|
* | Correctly handle the 'age' key in events and pdusErik Johnston2014-09-152-0/+21
|/
* Added captcha support on both the HS and web client.Kegan Dougal2014-09-051-0/+15
|\
| * Captchas now work on registration. Missing x-forwarded-for config arg support...Kegan Dougal2014-09-051-1/+15
| * Added a captcha config to the HS, to enable registration captcha checking and...Kegan Dougal2014-09-051-0/+1
* | Fix generation of event ids so that they are consistent between local and rem...Erik Johnston2014-09-061-1/+4
* | When getting a state event also include the previous contentErik Johnston2014-09-061-1/+6
* | Validate power levels event changes. Change error messages to be more helpful...Erik Johnston2014-09-051-10/+37
* | Generate m.room.aliases event when the HS creates a room aliasErik Johnston2014-09-052-1/+13
|/
* AUth the contents of power level eventsErik Johnston2014-09-051-1/+72
* Change the default power levels to be 0, 50 and 100Erik Johnston2014-09-051-2/+2
* fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org has...Matthew Hodgson2014-09-039-9/+9
* Updated feedback api docs and fixed feedback content template bugKegan Dougal2014-09-031-2/+1
* Add copyright notices and fix pyflakes errorsMark Haines2014-09-031-1/+15
* Set status message for ratelimit error responsesMark Haines2014-09-031-0/+2
* Merge branch 'ratelimiting' into developMark Haines2014-09-032-7/+93
|\
| * Raise LimitExceedError when the ratelimiting is throttling requestsMark Haines2014-09-031-7/+27
| * Add ratelimiting function to basehandlerMark Haines2014-09-021-0/+1
| * Test ratelimiterMark Haines2014-09-021-19/+48
| * Ratelimiter objectMark Haines2014-09-021-0/+36
* | Fix bug where we didn't correctly store the ops power levels event.Erik Johnston2014-09-021-0/+5
|/
* Implement auth for kicking.Erik Johnston2014-09-021-3/+10
* Add all the necessary checks to make banning work.Erik Johnston2014-09-012-2/+40
* Add beginnings of ban support.Erik Johnston2014-09-014-2/+30
* Implement power level lists, default power levels and send_evnet_level/add_st...Erik Johnston2014-09-013-17/+97
* Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-011-4/+4
|\
| * change the world: make the default matrix API URL prefix /_matrix rather than...Matthew Hodgson2014-08-311-4/+4
* | Create the correct events with the right configuration when creating a new room.Erik Johnston2014-08-284-2/+50
|/
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-273-493/+0
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-271-0/+2
| |\
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-262-9/+11
| |\ \
| * | | WIP: Completely change how event streaming and pagination work. This reflects...Erik Johnston2014-08-263-497/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-262-5/+1
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-266-21/+32
| |\ \ \ \
| * | | | | Use new StreamToken in pagination configErik Johnston2014-08-211-5/+9
* | | | | | add _get_room_member, fix datastore methodsMark Haines2014-08-271-1/+3
* | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-273-9/+13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Modified /join/$identifier to support $identifier being a room ID in addition...Kegan Dougal2014-08-271-0/+2
| | |_|_|/ | |/| | |
| * | | | Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expand...Kegan Dougal2014-08-262-9/+11
| | |_|/ | |/| |
* | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-267-30/+37
|\| | |
| * | | Fix pyflakes errorsMark Haines2014-08-262-5/+1
| | |/ | |/|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-261-1/+1
| |\ \
| | * | Add 'state_key' to valid_keysErik Johnston2014-08-261-0/+1
| | * | Send down state_key to clientsErik Johnston2014-08-261-1/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-262-1/+7
| |\| |
| | * | Add ts field to all events.Erik Johnston2014-08-211-1/+6
| | * | Stop internal keys from getting into SynapseEventsErik Johnston2014-08-211-0/+1
| | |/