summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Remove unused importErik Johnston2015-08-171-2/+0
* Remove added unused methodsErik Johnston2015-08-171-7/+0
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-1710-147/+105
|\
| * Fix bug where we were leaking None into state event listsErik Johnston2015-08-171-2/+3
| * Merge pull request #221 from matrix-org/authDaniel Wagner-Hall2015-08-149-145/+102
| |\
| | * Merge password checking implementationsDaniel Wagner-Hall2015-08-121-20/+15
| | * Merge branch 'develop' into authDaniel Wagner-Hall2015-08-123-55/+49
| | |\
| | | * Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-08-125-71/+70
| | | |\
| | * | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-129-131/+93
| | * | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-111-2/+2
| | |\| |
| | | * | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
* | | | | Batch _get_linearized_receipts_for_roomsErik Johnston2015-08-141-15/+64
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-133-51/+18
|\| | | |
| * | | | Merge pull request #219 from matrix-org/erikj/dictionary_cacheErik Johnston2015-08-1327-356/+928
| |\ \ \ \
| | * | | | Remove pointless mapErik Johnston2015-08-131-7/+3
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-131-0/+3
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #224 from matrix-org/erikj/reactor_metricsErik Johnston2015-08-131-0/+29
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into erikj/reactor_metricsMark Haines2015-08-132-1/+3
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Add max-line-length to the flake8 section of setup.cfgMark Haines2015-08-131-0/+3
| | | * | | | Remove some vertical spaceErik Johnston2015-08-131-36/+9
| | | * | | | Replace list comprehensionErik Johnston2015-08-131-8/+3
* | | | | | | Add metrics to the receipts cacheErik Johnston2015-08-132-0/+13
* | | | | | | Re-enable receiptsErik Johnston2015-08-131-2/+0
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-131-1/+0
|\| | | | |
| * | | | | PEP8Erik Johnston2015-08-131-1/+0
* | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cacheErik Johnston2015-08-131-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Don't time getDelayedCallsErik Johnston2015-08-131-1/+1
* | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cacheErik Johnston2015-08-135-56/+60
|\| | | | |
| * | | | | Add some metrics about the reactorErik Johnston2015-08-131-0/+29
| |/ / / /
| * | | | Merge pull request #173 from matrix-org/markjh/twisted-15Mark Haines2015-08-123-55/+29
| |\ \ \ \
| | * | | | Depend on Twisted>=15.1 rather than pining to a particular versionMark Haines2015-08-122-2/+2
| | * | | | Merge branch 'develop' into markjh/twisted-15Mark Haines2015-08-1296-1673/+4524
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Bump the version of twisted needed for setup_requires to 15.2.1Mark Haines2015-06-151-1/+1
| | * | | | Merge branch 'develop' into markjh/twisted-15Mark Haines2015-06-0111-21/+53
| | |\ \ \ \
| | * | | | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ...Mark Haines2015-06-012-51/+26
| * | | | | | Merge pull request #223 from matrix-org/markjh/enable_demo_registrationErik Johnston2015-08-121-1/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | enable registration in the demo serversMark Haines2015-08-121-1/+2
| |/ / / / /
* | | | | | CommentErik Johnston2015-08-121-1/+2
* | | | | | Explain why we're prefilling dict with NonesErik Johnston2015-08-121-0/+4
* | | | | | Better variable nameErik Johnston2015-08-121-5/+5
* | | | | | Split _get_state_for_group_from_cache into twoErik Johnston2015-08-121-32/+53
* | | | | | Fix _filter_events_for_clientErik Johnston2015-08-122-6/+2
* | | | | | DocstringErik Johnston2015-08-121-0/+27
* | | | | | Simplify staggered deferred listsErik Johnston2015-08-121-2/+2
* | | | | | Use list comprehension instead of filterErik Johnston2015-08-122-20/+6
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-123-61/+57
|\| | | | |
| * | | | | Merge pull request #220 from matrix-org/markjh/generate_keysErik Johnston2015-08-121-45/+36
| |\ \ \ \ \
| | * | | | | Fix the --generate-keys option. Make it do the same thing as --generate-confi...Mark Haines2015-08-121-45/+36
| * | | | | | Merge pull request #216 from matrix-org/authDaniel Wagner-Hall2015-08-122-16/+21
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Add missing space because linterDaniel Wagner-Hall2015-08-111-1/+1
| | * | | | | Minor docs cleanupDaniel Wagner-Hall2015-08-112-3/+9
| | * | | | | Remove redundant if-guardDaniel Wagner-Hall2015-08-111-13/+12
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-124-13/+18
|\| | | | |
| * | | | | Merge pull request #182 from matrix-org/manu/fix_no_rate_limit_in_federation_...Mark Haines2015-08-122-10/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix the cleanup script to use the right $DIRMark Haines2015-08-121-2/+2
| | * | | | Federation demo start.sh: Fixed --no-rate-limit param in the scriptmanuroe2015-06-042-10/+13
| * | | | | Merge pull request #218 from matrix-org/mockfixErik Johnston2015-08-111-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
| |/ / / /
| * | | | Use TypeError instead of ValueError and give a nicer error mesasgeMark Haines2015-08-101-1/+3
* | | | | Wire up the dictionarycache to the metricsErik Johnston2015-08-123-45/+41
* | | | | Move all the caches into their own package, synapse.util.cachesErik Johnston2015-08-1123-352/+408
* | | | | CommentsErik Johnston2015-08-112-3/+13
* | | | | CommentErik Johnston2015-08-111-0/+2
* | | | | DocsErik Johnston2015-08-111-0/+9
* | | | | Remove debug loggersErik Johnston2015-08-112-6/+0
* | | | | Fix application of ACLsErik Johnston2015-08-114-17/+33
* | | | | Fix state cacheErik Johnston2015-08-111-36/+49
* | | | | Clean up StateStoreErik Johnston2015-08-101-62/+11
* | | | | Remove unused functionErik Johnston2015-08-101-7/+0
* | | | | CommentsErik Johnston2015-08-101-0/+6
* | | | | CommentsErik Johnston2015-08-101-0/+3
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-100-0/+0
|\| | | |
| * | | | Merge pull request #215 from matrix-org/erikj/cache_varargs_interfaceErik Johnston2015-08-1012-72/+73
| |\ \ \ \
* | \ \ \ \ Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...Erik Johnston2015-08-101-5/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Rename keyargs to args in CacheDescriptorErik Johnston2015-08-101-5/+5
* | | | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...Erik Johnston2015-08-101-9/+9
|\| | | | |
| * | | | | Rename keyargs to args in CacheErik Johnston2015-08-101-9/+9
* | | | | | Do bounds checkErik Johnston2015-08-101-1/+4
* | | | | | Line lengthErik Johnston2015-08-101-1/+2
* | | | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse...Erik Johnston2015-08-071-1/+0
|\| | | | |
| * | | | | Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er...Erik Johnston2015-08-071-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er...Erik Johnston2015-08-071-3/+4
| |\ \ \ \ \ \
| * | | | | | | Remove unnecessary cacheErik Johnston2015-08-071-2/+1
| * | | | | | | Change Cache to not use *args in its interfaceErik Johnston2015-08-0711-67/+69
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-075-4/+27
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #212 from matrix-org/erikj/cache_deferredsErik Johnston2015-08-073-19/+47
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | s/observed/observer/Erik Johnston2015-08-071-3/+3
| | | |/ / / / | | |/| | | |
| | * | | | | Propogate stale cache errors to calling functionsErik Johnston2015-08-071-3/+4
| | |/ / / /
| * | | | | Merge pull request #213 from matrix-org/paul/SYN-420Paul Evans2015-08-074-1/+23
| |\ \ \ \ \
| | * | | | | Don't complain about extra .pyc files we find while hunting for database schemasPaul "LeoNerd" Evans2015-08-071-0/+5
| | * | | | | Add a --generate-keys optionPaul "LeoNerd" Evans2015-08-071-0/+9
| | * | | | | Only print the pidfile path on startup if requested by a commandline flagPaul "LeoNerd" Evans2015-08-072-1/+9
| |/ / / / /
| * | | | | Merge pull request #209 from matrix-org/erikj/cached_keyword_argsErik Johnston2015-08-066-23/+45
| |\ \ \ \ \
* | | | | | | Batch up various DB requests for event -> stateErik Johnston2015-08-071-77/+142
* | | | | | | Implement a CacheListDescriptorErik Johnston2015-08-071-0/+106
* | | | | | | Don't be too enthusiatic with defer.gatherResultsErik Johnston2015-08-071-4/+8
* | | | | | | 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 erikj/cached_key...Erik Johnston2015-08-068-140/+305
| | |\| | | |
| * | | | | | 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 int...Erik Johnston2015-08-056-23/+45
|\| | | | |
| * | | | | Add support for using keyword arguments with cached functionsErik Johnston2015-07-276-23/+45
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-052-5/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 b...David Baker2015-08-031-1/+2
| * | | | | 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
|\ \ \ \ \
| * | | | | Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-292-5/+9
| * | | | | Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-283-55/+204
* | | | | | improve OS X instructions and remove all the leading $'s to make it easier to...Matthew Hodgson2015-07-291-45/+47
|/ / / / /
* | | | | Merge pull request #207 from matrix-org/erikj/generate_local_thumbnails_on_th...Erik Johnston2015-07-271-34/+43
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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'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-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 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
|\ \ \ \ \ \
| * | | | | | 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 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
* | | | | | | | | | | | Add Muthu Subramanian to AUTHORSErik Johnston2015-07-101-0/+3
* | | | | | | | | | | | 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
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | 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 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-15 16:16:45 +0000