summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
| | | * | | | Remove unused metricErik Johnston2015-05-181-1/+0
| | | * | | | Remove rejected events if we don't want rejected eventsErik Johnston2015-05-181-0/+3
| | | * | | | Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/...Erik Johnston2015-05-187-229/+301
| | | |\ \ \ \
| | | * | | | | Remove pointless newlineErik Johnston2015-05-181-1/+0
| | | * | | | | Newline, remove debug loggingErik Johnston2015-05-183-4/+1
| | | * | | | | Remove debug loggingErik Johnston2015-05-181-8/+0
| | | * | | | | PEP8Erik Johnston2015-05-152-2/+1
| | | * | | | | Revert limiting of fetching, it didn't help perf.Erik Johnston2015-05-151-9/+2
| | | * | | | | init jErik Johnston2015-05-151-0/+1
| | | * | | | | Don't completely drain the listErik Johnston2015-05-151-2/+9
| | | * | | | | Don't fetch prev_content for current_stateErik Johnston2015-05-151-1/+1
| | | * | | | | Err, defer.gatherResults ftwErik Johnston2015-05-151-21/+12
| | | * | | | | Make store.get_current_state fetch events asynclyErik Johnston2015-05-152-4/+4
| | | * | | | | Remove more debug loggingErik Johnston2015-05-151-2/+0
| | | * | | | | Remove debug loggingErik Johnston2015-05-151-11/+3
| | | * | | | | preserve log contextErik Johnston2015-05-151-1/+2
| | | * | | | | Add a waitErik Johnston2015-05-152-3/+12
| | | * | | | | Srsly. Don't use closures. BaaaaaadErik Johnston2015-05-151-10/+8
| | | * | | | | Correctly pass through paramsErik Johnston2015-05-151-3/+3
| | | * | | | | Sort out error handlingErik Johnston2015-05-151-25/+22
| | | * | | | | Fix daedlockErik Johnston2015-05-156-83/+120
| | | * | | | | Remove race conditionErik Johnston2015-05-144-96/+157
| | | * | | | | Call from right threadErik Johnston2015-05-141-1/+3
| | | * | | | | Count and loopErik Johnston2015-05-142-37/+35
| | | * | | | | Don't start up more fetch_eventsErik Johnston2015-05-141-0/+1
| | | * | | | | Awful idea for speeding up fetching of eventsErik Johnston2015-05-143-40/+139
| | | * | | | | Turn off preemptive transactionsErik Johnston2015-05-141-17/+7
| | | * | | | | PEP8Erik Johnston2015-05-141-2/+1
| | | * | | | | Move from _base to eventsErik Johnston2015-05-142-232/+247
| | | * | | | | Jump out earlyErik Johnston2015-05-141-0/+6
| | | * | | | | Actually, we probably want to run this in a transactionErik Johnston2015-05-141-15/+12
| | | * | | | | Preemptively jump into a transaction if we ask for get_prev_contentErik Johnston2015-05-141-12/+22
| | | * | | | | loop -> gatherResultsErik Johnston2015-05-141-10/+14
| | | * | | | | Err, we probably want a bigger limitErik Johnston2015-05-141-1/+1
| | | * | | | | Move fetching of events into their own transactionsErik Johnston2015-05-144-53/+45
| | | * | | | | Refactor _get_eventsErik Johnston2015-05-143-253/+123
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/perfErik Johnston2015-05-142-2/+13
| | | |\ \ \ \ \
| | | * | | | | | Add index on eventsErik Johnston2015-05-132-1/+20
| | | * | | | | | Actually use async methodErik Johnston2015-05-131-3/+1
| | | * | | | | | Fetch events from events_id in their own transactionsErik Johnston2015-05-133-18/+168
| | | * | | | | | TypoErik Johnston2015-05-131-1/+1
| | | * | | | | | Don't insert NoneErik Johnston2015-05-131-1/+4
| | | * | | | | | Don't return NoneErik Johnston2015-05-131-1/+1
| | | * | | | | | Limit batch sizeErik Johnston2015-05-131-5/+10
| | | * | | | | | Fetch events in bulkErik Johnston2015-05-132-34/+63
| | | * | | | | | Don't fetch redaction and rejection stuff for each event, so we can use index...Erik Johnston2015-05-132-6/+24
| | | * | | | | | Temp turn off checking for rejections and redactionsErik Johnston2015-05-131-5/+2
| | | * | | | | | defer.gatherResults loopErik Johnston2015-05-131-1/+7
| | | * | | | | | Batch fetching of events for state groupsErik Johnston2015-05-131-1/+24
| | | * | | | | | Load events for state group seperatelyErik Johnston2015-05-132-5/+11
| | * | | | | | | Handle the case when things return empty but non none thingsErik Johnston2015-05-191-2/+2
| | * | | | | | | Don't always hit get_server_verify_key_v1_directErik Johnston2015-05-191-5/+10
* | | | | | | | | Fix _get_backfill_events to return events in the correct orderErik Johnston2015-05-201-27/+28
* | | | | | | | | Actually fetch state for new backwards extremeties when backfilling.Erik Johnston2015-05-202-62/+108
* | | | | | | | | Ensure event_results is a setErik Johnston2015-05-191-1/+1
|/ / / / / / / /
* | | | | | | | Add None checkErik Johnston2015-05-191-1/+1
* | | | | | | | Fix event_backwards_extrem insertion to ignore outliersErik Johnston2015-05-191-2/+3
* | | | | | | | Add a timeout param to get_eventErik Johnston2015-05-194-16/+25
* | | | | | | | Handle the case when things return empty but non none thingsErik Johnston2015-05-191-2/+2
* | | | | | | | Don't apply new room join hack if depth > 5Erik Johnston2015-05-191-3/+6
* | | | | | | | Don't always hit get_server_verify_key_v1_directErik Johnston2015-05-191-5/+10
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-191-2/+8
|\| | | | | | |
| * | | | | | | Disable GZip encoding on static file resources as per commentDavid Baker2015-05-191-1/+7
| * | | | | | | SYN-383: Actually, we expect this value to be a dictErik Johnston2015-05-191-1/+2
| * | | | | | | Revert accidental commitErik Johnston2015-05-191-3/+3
* | | | | | | | SYN-383: Actually, we expect this value to be a dictErik Johnston2015-05-191-1/+2
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-192-4/+4
|\| | | | | | |
| * | | | | | | SYN-383: Handle the fact the server might not have signed thingsErik Johnston2015-05-192-4/+4
| * | | | | | | Don't reuse var namesErik Johnston2015-05-191-2/+2
* | | | | | | | Don't reuse var namesErik Johnston2015-05-191-2/+2
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-191-18/+18
|\| | | | | | |
| * | | | | | | SYN-383: Fix parsing of verify_keys and catching of _DefGen_ReturnErik Johnston2015-05-191-18/+18
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perfErik Johnston2015-05-199-144/+270
|\| | | | | | |
| * | | | | | | SYN-383: Extract the response list from 'server_keys' in the response JSON as...Mark Haines2015-05-191-1/+3
| * | | | | | | Merge pull request #152 from matrix-org/notifier_performanceMark Haines2015-05-188-143/+267
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |