summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-282-55/+72
* Generate local thumbnails on a threadErik Johnston2015-07-231-34/+43
* Pick larger than desired thumbnail for 'crop'Erik Johnston2015-07-231-1/+2
* Disable receipts for nowMatrix2015-07-221-0/+2
* Query for all the ones we were asked about, not just the last...David Baker2015-07-211-1/+1
* Dodesn't seem to make any difference: guess it does work with the object refe...David Baker2015-07-211-1/+0
* I think this was what was intended...David Baker2015-07-211-0/+1
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-07-212-3/+3
|\
| * typoMatthew Hodgson2015-07-081-2/+2
| * Bump changelog and version to v0.9.3Erik Johnston2015-07-011-1/+1
| * Bumb versionErik Johnston2015-06-231-1/+1
* | s/take/claim/ for end to end key APIsMark Haines2015-07-202-8/+8
* | Improve namingDaniel Wagner-Hall2015-07-201-2/+2
* | Remove semicolon.Kegan Dougal2015-07-201-1/+1
* | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID.Kegan Dougal2015-07-201-0/+2
* | Up default cache size for _RoomStreamChangeCacheMatrix2015-07-181-1/+1
* | Don't do any database hits in receipt handling if from_key == to_keyMatrix2015-07-181-0/+3
* | Merge pull request #199 from matrix-org/erikj/receiptsErik Johnston2015-07-1616-35/+701
|\ \
| * | DocsErik Johnston2015-07-142-6/+36
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-1322-221/+1326
| |\ \
| * | | CommentsErik Johnston2015-07-132-4/+23
| * | | Handle error slightly betterErik Johnston2015-07-091-2/+2
| * | | Remove spurious commentErik Johnston2015-07-091-2/+0
| * | | Integer timestampsErik Johnston2015-07-091-1/+1
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-092-3/+8
| |\ \ \
| * | | | Change format of receipts to allow inclusion of dataErik Johnston2015-07-093-37/+42
| * | | | Add blist to dependenciesErik Johnston2015-07-081-0/+1
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-087-18/+62
| |\ \ \ \
| * | | | | Add a cache to fetching of receipt streamsErik Johnston2015-07-082-27/+96
| * | | | | Split receipt events up into one per roomErik Johnston2015-07-081-30/+21
| * | | | | Hook up receipts to v1 initialSyncErik Johnston2015-07-083-13/+77
| * | | | | Wire together receipts and the notifer/federationErik Johnston2015-07-074-33/+126
| * | | | | Fix various typosErik Johnston2015-07-074-8/+16
| * | | | | Add a ReceiptServletErik Johnston2015-07-072-1/+59
| * | | | | Add stream_id indexErik Johnston2015-07-021-1/+5
| * | | | | Consolidate duplicate code in notifierErik Johnston2015-07-024-28/+15
| * | | | | Add receipts_key to StreamTokenErik Johnston2015-07-023-3/+8
| * | | | | Add basic ReceiptHandlerErik Johnston2015-07-011-0/+130
| * | | | | Add basic storage functions for handling of receiptsErik Johnston2015-07-014-17/+186
| * | | | | Add tables for receiptsErik Johnston2015-06-302-1/+36
* | | | | | Merge pull request #203 from matrix-org/erikj/room_creation_presetsErik Johnston2015-07-162-19/+82
|\ \ \ \ \ \
| * | | | | | Implement specifying custom initial state for /createRoomErik Johnston2015-07-161-40/+60
| * | | | | | s/everyone_ops/original_invitees_have_ops/Erik Johnston2015-07-141-3/+3
| * | | | | | Capitalize contantsErik Johnston2015-07-142-6/+6
| * | | | | | Implement presets at room creationErik Johnston2015-07-132-22/+65
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #202 from matrix-org/erikj/power_level_sanityErik Johnston2015-07-161-16/+25
|\ \ \ \ \ \
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_leve...Erik Johnston2015-07-1312-218/+726
| |\| | | | |
| * | | | | | 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
* | | | | | | pep8 + debug lineDavid Baker2015-07-151-6/+8
* | | | | | | Add back in support for remembering parameters submitted to a user-interactiv...David Baker2015-07-152-4/+13
* | | | | | | bump up image quality a bit more as it looks crapMatthew Hodgson2015-07-141-1/+1
* | | | | | | Merge pull request #193 from matrix-org/erikj/bulk_persist_eventErik Johnston2015-07-147-376/+503
|\ \ \ \ \ \ \
| * | | | | | | Remove commented out codeErik Johnston2015-07-101-14/+0
| * | | | | | | Add bulk insert events APIErik Johnston2015-06-258-374/+521
* | | | | | | | Close, but no cigar.David Baker2015-07-141-2/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #196 from matrix-org/erikj/room_historyErik Johnston2015-07-108-4/+235
|\ \ \ \ \ \ \
| * | | | | | | Add commentErik Johnston2015-07-091-0/+4
| * | | | | | | Add m.room.history_visibility to newly created rooms' m.room.power_levelsErik Johnston2015-07-062-0/+2
| * | | | | | | Rename key and values for m.room.history_visibility. Support 'invited' valueErik Johnston2015-07-064-24/+61
| * | | | | | | Filter and redact events that the other server doesn't have permission to see...Erik Johnston2015-07-031-0/+44
| * | | | | | | Respect m.room.history_visibility in v2_alpha sync APIErik Johnston2015-07-031-0/+33
| * | | | | | | Add m.room.history_visibility to list of auth eventsErik Johnston2015-07-032-1/+3
| * | | | | | | Make v1 initial syncs respect room history ACLErik Johnston2015-07-021-17/+34
| * | | | | | | Add basic impl for room history ACL on GET /messages client APIErik Johnston2015-07-023-3/+95
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #194 from matrix-org/erikj/bulk_verify_sigsErik Johnston2015-07-104-214/+491
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Wait for previous attempts at fetching keys for a given server before trying ...Erik Johnston2015-06-261-15/+68
| * | | | | | Implement bulk verify_signed_json APIErik Johnston2015-06-264-217/+441
| | |/ / / / | |/| | | |
* | | | | | Uniquely name unique constraintErik Johnston2015-07-101-2/+2
* | | | | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-managementErik Johnston2015-07-105-2/+441
|\ \ \ \ \ \
| * | | | | | Assume that each device for a user has only one of each type of keyMark Haines2015-07-101-3/+3
| * | | | | | Don't bother with a timeout for one time keys on the server.Mark Haines2015-07-093-33/+13
| * | | | | | Only remove one time keys when new one time keys are addedMark Haines2015-07-081-7/+7
| * | | | | | Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-ma...Mark Haines2015-07-061-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Add client API for uploading and querying keys for end to end encryptionMark Haines2015-07-062-1/+290
| * | | | | | Add store for client end to end keysMark Haines2015-07-063-1/+171
* | | | | | | Small tweaks to SAML2 configuration.Erik Johnston2015-07-102-22/+34
* | | | | | | Merge pull request #201 from EricssonResearch/msba/saml2-developErik Johnston2015-07-105-3/+149
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Make SAML2 optional and add some references/commentsMuthu Subramanian2015-07-092-4/+23
| * | | | | | code beautifyMuthu Subramanian2015-07-091-9/+4
| * | | | | | code beautifyMuthu Subramanian2015-07-083-2/+3
| * | | | | | code beautifyMuthu Subramanian2015-07-081-10/+23
| * | | | | | Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-085-4/+122
| | |_|_|/ / | |/| | | |
* | | | | | We don't want semicolons.Erik Johnston2015-07-091-1/+1
* | | | | | remove the tls_certificate_chain_path param and simply support tls_certificat...Matthew Hodgson2015-07-092-24/+10
* | | | | | document tls_certificate_chain_path more clearlyMatthew Hodgson2015-07-091-0/+5
* | | | | | oops, context.tls_certificate_chain_file() expects a file, not a certificate.Matthew Hodgson2015-07-082-6/+3
* | | | | | typoMatthew Hodgson2015-07-081-1/+1
* | | | | | *cough*Matthew Hodgson2015-07-081-2/+3
* | | | | | add new optional config for tls_certificate_chain_path for folks with interme...Matthew Hodgson2015-07-082-3/+19
| |_|/ / / |/| | | |
* | | | | Don't 500 if a group is missing from the regexMark Haines2015-07-061-1/+1
| |/ / / |/| | |
* | | | Don't explode if we don't recognize one of the event_ids in the backfill requestErik Johnston2015-07-061-2/+4
* | | | If user supplies filename in URL when downloading from media repo, use that n...Erik Johnston2015-07-033-9/+14
* | | | Enforce ascii filenames for uploadsErik Johnston2015-06-303-1/+15
* | | | Add Content-Disposition headers to media repo v1 downloadsErik Johnston2015-06-303-7/+30
|/ / /
* / / Oops: underride rule had an identifier with override in it.David Baker2015-06-231-1/+1
|/ /
* / Batch SELECTs in _get_auth_chain_ids_txnErik Johnston2015-06-231-3/+11
|/
* Fix typoErik Johnston2015-06-191-1/+1
* Merge pull request #192 from matrix-org/erikj/fix_log_contextErik Johnston2015-06-193-52/+68
|\
| * Fix log context when sending requestsErik Johnston2015-06-193-52/+68
* | Merge pull request #190 from matrix-org/erikj/syn-412Erik Johnston2015-06-193-73/+78
|\ \ | |/ |/|
| * Add comment on cancellation of observersErik Johnston2015-06-191-0/+3
| * PEP8Erik Johnston2015-06-181-2/+3
| * DocumentationErik Johnston2015-06-181-4/+11
| * Don't bother proxying lookups on _NotificationListener to underlying deferredErik Johnston2015-06-181-10/+2
| * Refactor the notifier.wait_for_events code to be clearer. Add _NotifierUserSt...Erik Johnston2015-06-183-70/+73
| * Fix notifier leakErik Johnston2015-06-181-21/+20
* | Merge pull request #189 from matrix-org/erikj/room_init_syncErik Johnston2015-06-192-35/+45
|\ \
| * | Use another deferred listErik Johnston2015-06-161-18/+27
| * | Use DeferredListErik Johnston2015-06-161-9/+9
| * | Don't do unecessary db ops in presence.get_stateErik Johnston2015-06-162-14/+15
| |/
* | Merge pull request #187 from matrix-org/erikj/sanitize_loggingErik Johnston2015-06-197-127/+209
|\ \
| * | Remove stale debug linesErik Johnston2015-06-191-10/+0
| * | Add site_tag to loggerErik Johnston2015-06-191-2/+2
| * | Add IDs to outbound transactionsErik Johnston2015-06-191-53/+71
| * | Remove access_token from synapse.rest.client.v1.transactions {get,store}_resp...Erik Johnston2015-06-161-3/+3
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sanitize_l...Erik Johnston2015-06-152-1/+2
| |\|
| * | Disable twisted access logging. Move access logging to SynapseRequest objectErik Johnston2015-06-152-75/+79
| * | Log more when we have processed the requestErik Johnston2015-06-154-4/+23
| * | Create SynapseRequest that overrides __repr__ to not print access_tokenErik Johnston2015-06-152-17/+46
| * | Merge branch 'erikj/listeners_config' into erikj/sanitize_loggingErik Johnston2015-06-155-210/+327
| |\ \
| * | | Make http.server request logging more verbose, but redact access_tokensErik Johnston2015-06-151-2/+12
| * | | Log requests and responses sent via http.clientErik Johnston2015-06-151-3/+15
* | | | Make upload dir a configurable path.Eric Myhre2015-06-182-2/+6
* | | | Fix bug where synapse was sending AS user queries incorrectly.Kegan Dougal2015-06-171-1/+1
* | | | Correct -H SERVER_NAME in config-missing complaint messagePaul "LeoNerd" Evans2015-06-161-2/+2
| |_|/ |/| |
* | | Merge pull request #185 from matrix-org/erikj/listeners_configErik Johnston2015-06-155-210/+327
|\ \ \ | | |/ | |/|
| * | Remove redundant newlineErik Johnston2015-06-151-2/+1
| * | Document listener config. Remove deprecated config optionsErik Johnston2015-06-152-36/+42
| * | Add backwards compat support for metrics, manhole and webclient config optionsErik Johnston2015-06-123-16/+27
| * | PEP8Erik Johnston2015-06-121-3/+3
| * | Correctly handle x_forwaded listener optionErik Johnston2015-06-123-14/+31
| * | Use config.listenersErik Johnston2015-06-122-96/+168
| * | Fix up create_resource_treeErik Johnston2015-06-121-104/+100
| * | Begin changing the config formatErik Johnston2015-06-111-8/+24
* | | Bump versionErik Johnston2015-06-151-1/+1
* | | Bump versionErik Johnston2015-06-131-1/+1
* | | Add a dummy.sql into delta/20 as pip isn't packinging the pushers.pyErik Johnston2015-06-131-0/+1
| |/ |/|
* | Bump schema versionErik Johnston2015-06-111-1/+1
* | Bump versionErik Johnston2015-06-111-1/+1
|/
* Catch any exceptions in the pusher loop. Use a lower timeout for pushers so w...David Baker2015-06-051-112/+133
* pep8David Baker2015-06-041-1/+0
* Add script to (re)convert the pushers table to changing the unique key. Also ...David Baker2015-06-043-2/+79
* Merge pull request #175 from matrix-org/erikj/thumbnail_threadErik Johnston2015-06-031-45/+53
|\
| * Thumbnail images on a seperate threadErik Johnston2015-06-021-45/+53
* | Merge pull request #176 from matrix-org/erikj/backfill_authErik Johnston2015-06-032-8/+50
|\ \
| * | Rephrase log lineErik Johnston2015-06-021-1/+1
| * | Don't about JSON when warning about content tamperingErik Johnston2015-06-021-7/+4
| * | Add a timeoutErik Johnston2015-06-021-0/+1
| * | Handle the fact we might be missing auth eventsErik Johnston2015-06-021-15/+19
| * | Add some loggingErik Johnston2015-06-021-0/+5
| * | Correctly look up auth_eventsErik Johnston2015-06-021-9/+12
| * | Don't process events we've already processed. Remember to process state eventsErik Johnston2015-06-021-0/+22
| * | Correctly pass in auth_eventsErik Johnston2015-06-011-1/+11
| |/
* | Merge pull request #180 from matrix-org/erikj/prev_state_contextErik Johnston2015-06-032-5/+3
|\ \
| * | Don't needlessly compute prev_stateErik Johnston2015-06-032-5/+3
* | | Merge pull request #179 from matrix-org/erikj/state_group_outliersErik Johnston2015-06-032-4/+20
|\ \ \
| * | | CommentErik Johnston2015-06-031-0/+3
| * | | Don't needlessly compute contextErik Johnston2015-06-032-4/+17
| |/ /
* | | Merge pull request #178 from matrix-org/erikj/cache_state_groupsErik Johnston2015-06-032-22/+43
|\ \ \
| * | | Add cache to get_state_groupsErik Johnston2015-06-031-8/+12
| * | | Caches should be bound to instances.Erik Johnston2015-06-031-14/+31
| |/ /
* | | Merge pull request #177 from matrix-org/erikj/content_repo_http_clientErik Johnston2015-06-031-1/+2
|\ \ \
| * | | SYN-403: Make content repository use its own http client.Erik Johnston2015-06-031-1/+2
| |/ /
* | | Merge pull request #174 from matrix-org/erikj/compress_optionErik Johnston2015-06-032-2/+14
|\ \ \ | |/ / |/| |
| * | Add config option to disable compression of http responsesErik Johnston2015-06-012-2/+14
* | | Log where a request came from in federationErik Johnston2015-06-021-0/+2
| |/ |/|
* | Don't explode if we don't have the eventErik Johnston2015-06-011-1/+3
|/
* Merge pull request #170 from matrix-org/markjh/SYT-8-recaptchaMark Haines2015-05-292-1/+5
|\
| * Merge branch 'develop' into markjh/SYT-8-recaptchaMark Haines2015-05-295-16/+12
| |\
| * | Add config for setting the recaptcha verify api endpoint, so we can test it i...Mark Haines2015-05-292-3/+7
* | | Remove log lineErik Johnston2015-05-291-1/+0
* | | Don't copy twiceErik Johnston2015-05-291-1/+1
* | | Bump syutil versionErik Johnston2015-05-291-3/+3
* | | Add config option to turn off freezing events. Use new encode_json api and uj...Erik Johnston2015-05-298-17/+44
| |/ |/|
* | SYN-395: Fix CAPTCHA, don't double decode jsonErik Johnston2015-05-281-2/+3
* | Correctly pass connection pool parameterErik Johnston2015-05-282-2/+2
* | Merge pull request #168 from matrix-org/erikj/conn_poolErik Johnston2015-05-282-4/+9
|\ \
| * | Up maxPersistentPerHost countErik Johnston2015-05-282-0/+2
| * | Add connection pooling to SimpleHttpClientErik Johnston2015-05-281-2/+4
| * | Use connection pool for federation connectionsErik Johnston2015-05-281-2/+3
* | | Unused importErik Johnston2015-05-281-2/+0
* | | Remove a deep copyErik Johnston2015-05-281-9/+1
|/ /
* / Registration should be disabled by defaultErik Johnston2015-05-281-1/+1
|/
* Iterate over the user_streams not the user_idsMark Haines2015-05-261-1/+1
* Merge branch 'bugs/SYN-390' into release-v0.9.1Mark Haines2015-05-261-1/+1
|\
| * Take a dict of the rule, not the rule listMark Haines2015-05-261-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1Erik Johnston2015-05-261-4/+7
|\ \
| * | Merge pull request #166 from matrix-org/bugs/SYN-390Mark Haines2015-05-261-4/+7
| |\|
| | * SYN-390: Don't modify the dictionary returned from the database here eitherMark Haines2015-05-261-4/+7
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1Erik Johnston2015-05-261-5/+8
|\| |
| * | Merge pull request #165 from matrix-org/bugs/SYN-390Erik Johnston2015-05-261-5/+8
| |\|
| | * SYN-390: Don't modify the dictionary returned from the data storeMark Haines2015-05-261-5/+8
* | | Bump versionErik Johnston2015-05-221-1/+1
|/ /
* | Merge pull request #163 from matrix-org/markjh/presence_list_cacheMark Haines2015-05-222-17/+42
|\ \
| * | Add a cache for getting the presence list for a userMark Haines2015-05-222-17/+42
* | | Merge pull request #164 from matrix-org/markjh/pusher_performance_2Mark Haines2015-05-221-1/+17
|\ \ \
| * | | Add a cache for get_push rules for user, fix cache invalidationMark Haines2015-05-221-1/+17
* | | | Remove redundant for loopErik Johnston2015-05-221-3/+0
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_f...Erik Johnston2015-05-2221-119/+240
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #156 from matrix-org/erikj/join_perfMark Haines2015-05-226-41/+92
| |\ \ \
| | * | | Add doc stringsErik Johnston2015-05-223-0/+7
| * | | | Merge pull request #159 from matrix-org/erikj/metrics_interface_configMark Haines2015-05-222-3/+10
| |\ \ \ \
| | * | | | s/metric_interface/metric_bind_host/Erik Johnston2015-05-222-5/+5
| | * | | | Update log lineErik Johnston2015-05-221-1/+4
| | * | | | Enable changing the interface the metrics listener binds toErik Johnston2015-05-222-2/+6
| | | |/ / | | |/| |
| * | | | Merge pull request #157 from matrix-org/markjh/presence_performanceMark Haines2015-05-221-61/+102
| |\ \ \ \
| | * | | | Remove spurious TODO commentMark Haines2015-05-221-1/+0
| | * | | | Removed unused 'is_visible' methodMark Haines2015-05-201-27/+0
| | * | | | Clean up the presence_list checking logic a bitMark Haines2015-05-201-12/+9
| | * | | | Speed up the get_pagination_rows as wellMark Haines2015-05-181-3/+17
| | * | | | Cache the most recent serial for each roomMark Haines2015-05-181-6/+22
| | * | | | Move updating the serial and state of the presence cache into a single functionMark Haines2015-05-181-17/+43
| | * | | | Merge branch 'notifier_performance' into markjh/presence_performanceMark Haines2015-05-188-143/+267
| | |\ \ \ \
| | * | | | | Add more doc string, reduce C+P boilerplate for getting room listMark Haines2015-05-181-6/+22
| * | | | | | Merge pull request #160 from matrix-org/markjh/appservice_performanceMark Haines2015-05-222-8/+5
| |\ \ \ \ \ \
| | * | | | | | Remove unused importMark Haines2015-05-221-1/+1
| | * | | | | | Make the appservice use 'users_in_room' rather than get_room_members since it...Mark Haines2015-05-222-7/+4
| | | |_|/ / / | | |/| | | |
| * | | | | | Log origin and stats of incoming transactionsErik Johnston2015-05-221-0/+8
| * | | | | | Add txn_id to some log linesErik Johnston2015-05-221-6/+11
| * | | | | | Log less lines at INFO level, but include more helpful informationErik Johnston2015-05-221-6/+10
| * | | | | | Invalidate the get_latest_event_ids_in_room cache when deleting from event_fo...Mark Haines2015-05-221-0/+1
| |/ / / / /
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-05-2210-36/+87
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Bump versionErik Johnston2015-05-211-1/+1
| | * | | | Don't try to use a txn when not in one, remove spurious debug loggingMark Haines2015-05-212-5/+1
| | * | | | Add caches for things requested by the pushersMark Haines2015-05-217-33/+44
| | * | | | Add a cache for get_current_state with state_keyMark Haines2015-05-215-2/+46
* | | | | | Actually return something from lambdaErik Johnston2015-05-211-1/+1
* | | | | | Sort backfill eventsErik Johnston2015-05-211-1/+5
* | | | | | Remove dead codeErik Johnston2015-05-211-5/+0
* | | | | | Only get non-stateErik Johnston2015-05-211-1/+2
* | | | | | Skip events we've already seenErik Johnston2015-05-211-0/+3
* | | | | | Correctly prepopulate queueErik Johnston2015-05-211-2/+10
* | | | | | Don't prepopulate event_resultsErik Johnston2015-05-211-1/+1
* | | | | | Don't readd things that are already in event_resultsErik Johnston2015-05-211-1/+2
* | | | | | PriorityQueue gives lowest firstErik Johnston2015-05-211-2/+2
* | | | | | Correctly capture Queue.Empty exceptionErik Johnston2015-05-211-2/+5
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_f...Erik Johnston2015-05-211-0/+1
|\| | | | |
| * | | | | Oops, get_rooms_for_user returns a namedtuple, not a room_idMark Haines2015-05-211-0/+1
* | | | | | Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into erikj/ba...Erik Johnston2015-05-2112-188/+579
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-2112-188/+579
| |\| | | |
| | * | | | Merge pull request #155 from matrix-org/erikj/perfErik Johnston2015-05-2112-188/+579
| | |\ \ \ \
| | | * | | | s/for events/for requests for events/Erik Johnston2015-05-211-1/+1
| | | * | | | s/for events/for requests for events/Erik Johnston2015-05-211-1/+1
| | | * | | | Add commentsErik Johnston2015-05-211-3/+14
| | | * | | | Split up _get_events into defer and txn versionsErik Johnston2015-05-201-24/+35
| | | * | | | Make not return a deferred _get_event_from_row_txnErik Johnston2015-05-201-20/+5
| | | * | | | PEP8Erik Johnston2015-05-201-2/+2
| | | * | | | Split out _get_event_from_row back into defer and _txn versionErik Johnston2015-05-201-11/+57
| | | * | | | Comments and shuffle of functionsErik Johnston2015-05-181-38/+42
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 17:14:32 +0000