summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Cache get_recent_events_for_roomErik Johnston2015-08-071-2/+2
|
* Remove unncessary cacheErik Johnston2015-08-071-1/+0
|
* Change Cache to not use *args in its interfaceErik Johnston2015-08-0711-87/+73
|
* Store absence of state in cacheErik Johnston2015-08-071-6/+16
|
* Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-061-3/+27
|\
| * DocsErik Johnston2015-08-061-0/+3
| |
| * Remove failed deferreds from cacheErik Johnston2015-08-061-1/+7
| |
| * Re-implement DEBUG_CACHES flagErik Johnston2015-08-061-2/+17
| |
* | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-063-19/+22
|\|
| * Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferredsErik Johnston2015-08-068-140/+305
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-068-140/+305
| | |\ | | | | | | | | | | | | erikj/cached_keyword_args
| * | | Make @cached cache deferreds rather than the deferreds' valuesErik Johnston2015-08-063-19/+22
| |/ /
* | | Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse ↵Erik Johnston2015-08-056-23/+45
|\| | | | | | | | | | | into erikj/dictionary_cache
| * | Add support for using keyword arguments with cached functionsErik Johnston2015-07-276-23/+45
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-052-5/+5
|\ \ \ | | |/ | |/| | | | erikj/dictionary_cache
| * | Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'Erik Johnston2015-08-051-2/+2
| | |
| * | Use LRU cache by defaultErik Johnston2015-08-051-3/+3
| | |
* | | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-057-110/+195
| | |
* | | Move DictionaryCacheErik Johnston2015-08-042-1/+1
| | |
* | | Add basic dictionary cacheErik Johnston2015-08-042-0/+195
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perfErik Johnston2015-08-042-2/+3
|\| |
| * | Don't try & check the username if we don't have one (which we won't if it's ↵David Baker2015-08-031-1/+2
| | | | | | | | | | | | been saved in the auth layer)
| * | Add vector.im as trusted ID serverDavid Baker2015-08-031-1/+1
| | |
* | | Add commentErik Johnston2015-08-041-0/+15
| | |
* | | Speed up event filtering (for ACL) logicErik Johnston2015-08-045-43/+102
|/ /
* | Merge pull request #210 from matrix-org/reg-v2a-password-skipDavid Baker2015-07-293-55/+208
|\ \ | | | | | | v2_alpha /register fixes for Application Services
| * | Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-292-5/+9
| | | | | | | | | | | | Namely this means using registration_handler.appservice_register.
| * | Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-283-55/+204
| | | | | | | | | | | | | | | | | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
* | | improve OS X instructions and remove all the leading $'s to make it easier ↵Matthew Hodgson2015-07-291-45/+47
|/ / | | | | | | to c+p commands
* | Merge pull request #207 from ↵Erik Johnston2015-07-271-34/+43
|\ \ | |/ |/| | | | | matrix-org/erikj/generate_local_thumbnails_on_thread Generate local thumbnails on a thread
| * Generate local thumbnails on a threadErik Johnston2015-07-231-34/+43
|/
* Merge pull request #205 from matrix-org/erikj/pick_largest_thumbnailMark Haines2015-07-231-1/+2
|\ | | | | Pick larger than desired thumbnail for 'crop'
| * 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 ↵David Baker2015-07-211-1/+0
| | | | reference
* 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-214-4/+30
|\
| * typoMatthew Hodgson2015-07-081-2/+2
| |
| * Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3Erik Johnston2015-07-0125-481/+787
| |\
| | * Bump changelog and version to v0.9.3Erik Johnston2015-07-012-2/+7
| | |
| | * Update change log v0.9.3-rc1Erik Johnston2015-06-231-0/+18
| | |
| | * Bumb versionErik Johnston2015-06-231-1/+1
| | |
| * | clarify readme a bit moreMatthew Hodgson2015-06-271-1/+4
| | |
* | | s/take/claim/ for end to end key APIsMark Haines2015-07-202-8/+8
| | |
* | | Merge pull request #204 from illicitonion/developErik Johnston2015-07-201-2/+2
|\ \ \ | | | | | | | | Improve naming
| * | | 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-1619-48/+724
|\ \ \ | | | | | | | | Implement read receipts.
| * | | DocsErik Johnston2015-07-142-6/+36
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-1323-221/+1329
| |\ \ \
| * | | | 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
| | | | | | |
| * | | | | | Fix test.Erik Johnston2015-07-071-1/+11
| | | | | | |
| * | | | | | 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-025-38/+25
| | | | | | |
| * | | | | | Add receipts_key to StreamTokenErik Johnston2015-07-024-5/+10
| | | | | | |
| * | | | | | 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 presets at room creation
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change power level semantics.
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-07-1312-218/+726
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/power_level_sanity
| * | | | | | | 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 ↵David Baker2015-07-152-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user-interactive auth call.
* | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add bulk insert events API
| * | | | | | | | 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 ability to restrict room history.
| * | | | | | | | 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 ↵Erik Johnston2015-07-031-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see during backfill
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Implement bulk verify_signed_json API
| * | | | | | | Wait for previous attempts at fetching keys for a given server before trying ↵Erik Johnston2015-06-261-15/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to fetch more
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Client end to end key management API
| * | | | | | | 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 ↵Mark Haines2015-07-061-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | markjh/client-end-to-end-key-management
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.
* | | | | | | | | Add Muthu Subramanian to AUTHORSErik Johnston2015-07-101-0/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #201 from EricssonResearch/msba/saml2-developErik Johnston2015-07-105-3/+149
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Integrate SAML2 basic authentication - uses pysaml2
| * | | | | | | | 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 ↵Matthew Hodgson2015-07-092-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tls_certificate_path pointing to a file containing a chain of certificates
* | | | | | | | 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 ↵Matthew Hodgson2015-07-082-3/+19
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | intermediary SSL certs
* | | | | | | Merge pull request #197 from matrix-org/mjark/missing_regex_groupErik Johnston2015-07-071-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | Don't 500 if a group is missing from the regex match
| * | | | | 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
| | | | |
* | | | | Merge pull request #195 from matrix-org/erikj/content_dispositionErik Johnston2015-07-035-15/+57
|\ \ \ \ \ | |/ / / / |/| | | | Add Content-Disposition headers to media repo downloads
| * | | | If user supplies filename in URL when downloading from media repo, use that ↵Erik Johnston2015-07-033-9/+14
| | | | | | | | | | | | | | | | | | | | name in Content Disposition
| * | | | 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 requests
| * | 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
|\ \ \ | |/ / |/| | Fix notifier leak
| * | 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 ↵Erik Johnston2015-06-183-70/+73
| | | | | | | | | | | | _NotifierUserStream.new_listener that accpets a token to avoid races.
| * | Fix notifier leakErik Johnston2015-06-181-21/+20
| | |
* | | Merge pull request #189 from matrix-org/erikj/room_init_syncErik Johnston2015-06-192-35/+45
|\ \ \ | | | | | | | | Improve room init sync speed.
| * | | 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
|\ \ \ | | | | | | | | Sanitize logging
| * | | 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 ↵Erik Johnston2015-06-161-3/+3
| | | | | | | | | | | | | | | | {get,store}_response logging
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-06-153-5/+11
| |\| | | | | | | | | | | | | | erikj/sanitize_logging
| * | | 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-156-210/+329
| |\ \ \
| * | | | 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
| | | | |
* | | | | Add Eric Myhre to AUTHORSErik Johnston2015-06-191-0/+4
| | | | |
* | | | | Merge pull request #191 from heavenlyhash/configurable-upload-dirErik Johnston2015-06-192-2/+6
|\ \ \ \ \ | | | | | | | | | | | | Make upload dir a configurable path.
| * | | | | Make upload dir a configurable path.Eric Myhre2015-06-182-2/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes SYN-425. Signed-off-by: Eric Myhre <hash@exultant.us>
* | | | | Fix bug where synapse was sending AS user queries incorrectly.Kegan Dougal2015-06-172-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug introduced in 92b20713d7c6346aeb20dc09963081e472752bb5 which reversed the comparison when checking if a user existed in the users table. Added UTs to prevent this happening again.
* | | | | 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-156-210/+329
|\ \ \ \ | | |/ / | |/| | Change listener config.
| * | | 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
| | | |
| * | | Fix testsErik Johnston2015-06-121-0/+2
| | | |
| * | | 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
| | | |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-06-153-5/+11
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge pull request #186 from matrix-org/hotfixes-v0.9.2-r2 v0.9.2-r2Erik Johnston2015-06-153-1/+7
| |\ \ | | | | | | | | Hotfixes v0.9.2-r2
| | * | ChangelogErik Johnston2015-06-151-0/+5
| | | |
| | * | Bump versionErik Johnston2015-06-151-1/+1
| | | |
| | * | Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2Erik Johnston2015-06-153-5/+6
| |/| | |/|/ /
| * | Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 v0.9.2-r1Erik Johnston2015-06-132-1/+2
| |\ \ | | | | | | | | Hotfixes v0.9.2-r1
| | * | 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
| |/ /
| * | Merge branch 'release-v0.9.2' v0.9.2Erik Johnston2015-06-1233-281/+547
| |\ \
| | * | Mention config option nameErik Johnston2015-06-121-1/+1
| | | |
| | * | s/some/certainErik Johnston2015-06-121-1/+1
| | | |
| | * | Update change logErik Johnston2015-06-121-3/+3
| | | |
| * | | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse v0.9.1Erik Johnston2015-05-2664-1280/+2527
| |\ \ \
* | \ \ \ Merge pull request #183 from intelfx/install-python-schema-deltasMatthew Hodgson2015-06-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | MANIFEST.in: include python schema delta scripts
| * | | | | MANIFEST.in: include python schema delta scripts (we now have one in 20/)Ivan Shapovalov2015-06-131-0/+1
|/ / / / /
* | | | | Merge branch 'release-v0.9.2' into developErik Johnston2015-06-113-2/+25
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Update change logErik Johnston2015-06-111-0/+23
| | | |
| * | | 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 ↵David Baker2015-06-051-112/+133
| | | | | | | | | | | | we can see if they're actually still running.
* | | 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
| | | | | | | | | | | | give the python db upgrade scripts the database engine so they can convert parameter strings, and add *args **kwargs to the upgrade function so we can add more args in future and previous scripts will ignore them.
* | | Merge pull request #175 from matrix-org/erikj/thumbnail_threadErik Johnston2015-06-031-45/+53
|\ \ \ | | | | | | | | Thumbnail images on a seperate thread
| * | | 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
|\ \ \ \ | | | | | | | | | | Improve backfill.
| * | | | 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-033-5/+5
|\ \ \ \ | | | | | | | | | | Don't needlessly compute prev_state
| * | | | Don't needlessly compute prev_stateErik Johnston2015-06-033-5/+5
| | | | |
* | | | | Merge pull request #179 from matrix-org/erikj/state_group_outliersErik Johnston2015-06-033-6/+22
|\ \ \ \ \ | | | | | | | | | | | | Don't compute EventContext for outliers.
| * | | | | CommentErik Johnston2015-06-031-0/+3
| | | | | |
| * | | | | Don't needlessly compute contextErik Johnston2015-06-033-6/+19
| |/ / / /
* | | | | Merge pull request #178 from matrix-org/erikj/cache_state_groupsErik Johnston2015-06-034-58/+93
|\ \ \ \ \ | | | | | | | | | | | | Add cache to get_state_groups.
| * | | | | Add cache to get_state_groupsErik Johnston2015-06-031-8/+12
| | | | | |
| * | | | | Caches should be bound to instances.Erik Johnston2015-06-033-50/+81
| |/ / / / | | | | | | | | | | | | | | | | | | | | Before, caches were global and so different instances of the stores would share caches. This caused problems in the unit tests.
* | | | | 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.
| * | | | | 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 responses
| * | | | 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 #172 from intelfx/contrib-systemdErik Johnston2015-05-311-0/+2
|\ \ \ | | | | | | | | contrib/systemd: log_config.yaml: do not disable existing loggers
| * | | contrib/systemd: log_config.yaml: do not disable existing loggersIvan Shapovalov2015-05-311-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | It turned out that merely configuring the root logger is not enough for "catch-all" semantics. The logging subsystem also needs to be told not to disable existing loggers (so that their messages will get propagated to handlers up the logging hierarchy, not just silently discarded). Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
* | | Merge pull request #170 from matrix-org/markjh/SYT-8-recaptchaMark Haines2015-05-292-1/+5
|\ \ \ | | | | | | | | Allow endpoint for verifying recaptcha to be configured
| * \ \ Merge branch 'develop' into markjh/SYT-8-recaptchaMark Haines2015-05-295-16/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py
| * | | | Add config for setting the recaptcha verify api endpoint, so we can test it ↵Mark Haines2015-05-292-3/+7
| | | | | | | | | | | | | | | | | | | | in sytest
* | | | | Remove log lineErik Johnston2015-05-291-1/+0
| | | | |
* | | | | Don't copy twiceErik Johnston2015-05-291-1/+1
| | | | |
* | | | | Merge pull request #169 from matrix-org/erikj/ultrajsonErik Johnston2015-05-298-20/+47
|\ \ \ \ \ | |_|/ / / |/| | | | Use ultrajson when possible. Add option to turn off freezing of events.
| * | | | Bump syutil versionErik Johnston2015-05-291-3/+3
| | | | |
| * | | | Add config option to turn off freezing events. Use new encode_json api and ↵Erik Johnston2015-05-298-17/+44
|/ / / / | | | | | | | | | | | | ujson.loads
* | | | 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
|\ \ \ \ | | | | | | | | | | Make HTTP clients use connection pools.
| * | | | 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
| | | | |
* | | | | Merge pull request #167 from matrix-org/erikj/deep_copy_removalErik Johnston2015-05-281-11/+1
|\ \ \ \ \ | |/ / / / |/| | | | Remove a deep copy
| * | | | 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
|/ / /
* | | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse into developErik Johnston2015-05-264-3/+30
|\ \ \ | | |/ | |/|
| * | changelogErik Johnston2015-05-261-2/+2
| | |
| * | 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
| | | |
| * | | changelogErik Johnston2015-05-261-1/+1
| | | |
| * | | changelogErik Johnston2015-05-261-2/+4
| | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-23 22:45:15 +0000