| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove added unused methods | Erik Johnston | 2015-08-17 | 1 | -7/+0 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t... | Erik Johnston | 2015-08-17 | 10 | -147/+105 |
|\ |
|
| * | Fix bug where we were leaking None into state event lists | Erik Johnston | 2015-08-17 | 1 | -2/+3 |
| * | Merge pull request #221 from matrix-org/auth | Daniel Wagner-Hall | 2015-08-14 | 9 | -145/+102 |
| |\ |
|
| | * | Merge password checking implementations | Daniel Wagner-Hall | 2015-08-12 | 1 | -20/+15 |
| | * | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-12 | 1 | -45/+36 |
| | |\ |
|
| | * | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 9 | -131/+93 |
* | | | | Batch _get_linearized_receipts_for_rooms | Erik Johnston | 2015-08-14 | 1 | -15/+64 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t... | Erik Johnston | 2015-08-13 | 2 | -51/+15 |
|\| | | |
|
| * | | | Remove pointless map | Erik Johnston | 2015-08-13 | 1 | -7/+3 |
| * | | | Remove some vertical space | Erik Johnston | 2015-08-13 | 1 | -36/+9 |
| * | | | Replace list comprehension | Erik Johnston | 2015-08-13 | 1 | -8/+3 |
* | | | | Add metrics to the receipts cache | Erik Johnston | 2015-08-13 | 2 | -0/+13 |
* | | | | Re-enable receipts | Erik Johnston | 2015-08-13 | 1 | -2/+0 |
|/ / / |
|
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... | Erik Johnston | 2015-08-13 | 1 | -1/+0 |
|\ \ \ |
|
| * | | | PEP8 | Erik Johnston | 2015-08-13 | 1 | -1/+0 |
* | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache | Erik Johnston | 2015-08-13 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Don't time getDelayedCalls | Erik Johnston | 2015-08-13 | 1 | -1/+1 |
* | | | | | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache | Erik Johnston | 2015-08-13 | 3 | -54/+57 |
|\| | | | |
|
| * | | | | Add some metrics about the reactor | Erik Johnston | 2015-08-13 | 1 | -0/+29 |
| |/ / / |
|
| * | | | Depend on Twisted>=15.1 rather than pining to a particular version | Mark Haines | 2015-08-12 | 1 | -1/+1 |
| * | | | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-08-12 | 79 | -1560/+4136 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-06-01 | 10 | -21/+51 |
| |\ \ \ |
|
| * | | | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ... | Mark Haines | 2015-06-01 | 2 | -51/+26 |
* | | | | | Comment | Erik Johnston | 2015-08-12 | 1 | -1/+2 |
* | | | | | Explain why we're prefilling dict with Nones | Erik Johnston | 2015-08-12 | 1 | -0/+4 |
* | | | | | Better variable name | Erik Johnston | 2015-08-12 | 1 | -5/+5 |
* | | | | | Split _get_state_for_group_from_cache into two | Erik Johnston | 2015-08-12 | 1 | -32/+53 |
* | | | | | Fix _filter_events_for_client | Erik Johnston | 2015-08-12 | 2 | -6/+2 |
* | | | | | Docstring | Erik Johnston | 2015-08-12 | 1 | -0/+27 |
* | | | | | Simplify staggered deferred lists | Erik Johnston | 2015-08-12 | 1 | -2/+2 |
* | | | | | Use list comprehension instead of filter | Erik Johnston | 2015-08-12 | 2 | -20/+6 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... | Erik Johnston | 2015-08-12 | 3 | -61/+57 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Merge pull request #220 from matrix-org/markjh/generate_keys | Erik Johnston | 2015-08-12 | 1 | -45/+36 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Fix the --generate-keys option. Make it do the same thing as --generate-confi... | Mark Haines | 2015-08-12 | 1 | -45/+36 |
| * | | | | Add missing space because linter | Daniel Wagner-Hall | 2015-08-11 | 1 | -1/+1 |
| * | | | | Minor docs cleanup | Daniel Wagner-Hall | 2015-08-11 | 2 | -3/+9 |
| * | | | | Remove redundant if-guard | Daniel Wagner-Hall | 2015-08-11 | 1 | -13/+12 |
| |/ / / |
|
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... | Erik Johnston | 2015-08-12 | 1 | -1/+3 |
|\| | | |
|
| * | | | Use TypeError instead of ValueError and give a nicer error mesasge | Mark Haines | 2015-08-10 | 1 | -1/+3 |
| * | | | Merge pull request #215 from matrix-org/erikj/cache_varargs_interface | Erik Johnston | 2015-08-10 | 11 | -66/+67 |
| |\ \ \ |
|
* | | | | | Wire up the dictionarycache to the metrics | Erik Johnston | 2015-08-12 | 3 | -45/+41 |
* | | | | | Move all the caches into their own package, synapse.util.caches | Erik Johnston | 2015-08-11 | 20 | -347/+405 |
* | | | | | Comments | Erik Johnston | 2015-08-11 | 2 | -3/+13 |
* | | | | | Comment | Erik Johnston | 2015-08-11 | 1 | -0/+2 |
* | | | | | Docs | Erik Johnston | 2015-08-11 | 1 | -0/+9 |
* | | | | | Remove debug loggers | Erik Johnston | 2015-08-11 | 2 | -6/+0 |
* | | | | | Fix application of ACLs | Erik Johnston | 2015-08-11 | 4 | -17/+33 |
* | | | | | Fix state cache | Erik Johnston | 2015-08-11 | 1 | -36/+49 |
* | | | | | Clean up StateStore | Erik Johnston | 2015-08-10 | 1 | -62/+11 |
* | | | | | Remove unused function | Erik Johnston | 2015-08-10 | 1 | -7/+0 |
* | | | | | Comments | Erik Johnston | 2015-08-10 | 1 | -0/+6 |
* | | | | | Comments | Erik Johnston | 2015-08-10 | 1 | -0/+3 |
* | | | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse... | Erik Johnston | 2015-08-10 | 1 | -5/+5 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Rename keyargs to args in CacheDescriptor | Erik Johnston | 2015-08-10 | 1 | -5/+5 |
* | | | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse... | Erik Johnston | 2015-08-10 | 1 | -9/+9 |
|\| | | | |
|
| * | | | | Rename keyargs to args in Cache | Erik Johnston | 2015-08-10 | 1 | -9/+9 |
* | | | | | Do bounds check | Erik Johnston | 2015-08-10 | 1 | -1/+4 |
* | | | | | Line length | Erik Johnston | 2015-08-10 | 1 | -1/+2 |
* | | | | | Merge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse... | Erik Johnston | 2015-08-07 | 1 | -1/+0 |
|\| | | | |
|
| * | | | | Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er... | Erik Johnston | 2015-08-07 | 1 | -3/+3 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er... | Erik Johnston | 2015-08-07 | 1 | -3/+4 |
| |\ \ \ \ \ |
|
| * | | | | | | Remove unnecessary cache | Erik Johnston | 2015-08-07 | 1 | -2/+1 |
| * | | | | | | Change Cache to not use *args in its interface | Erik Johnston | 2015-08-07 | 10 | -61/+63 |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... | Erik Johnston | 2015-08-07 | 5 | -4/+27 |
|\ \ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | Merge pull request #212 from matrix-org/erikj/cache_deferreds | Erik Johnston | 2015-08-07 | 2 | -15/+40 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | * | | | | | s/observed/observer/ | Erik Johnston | 2015-08-07 | 1 | -3/+3 |
| | | |/ / /
| | |/| | | |
|
| | * | | | | Propogate stale cache errors to calling functions | Erik Johnston | 2015-08-07 | 1 | -3/+4 |
| | |/ / / |
|
| * | | | | Don't complain about extra .pyc files we find while hunting for database schemas | Paul "LeoNerd" Evans | 2015-08-07 | 1 | -0/+5 |
| * | | | | Add a --generate-keys option | Paul "LeoNerd" Evans | 2015-08-07 | 1 | -0/+9 |
| * | | | | Only print the pidfile path on startup if requested by a commandline flag | Paul "LeoNerd" Evans | 2015-08-07 | 2 | -1/+9 |
* | | | | | Batch up various DB requests for event -> state | Erik Johnston | 2015-08-07 | 1 | -77/+142 |
* | | | | | Implement a CacheListDescriptor | Erik Johnston | 2015-08-07 | 1 | -0/+106 |
* | | | | | Don't be too enthusiatic with defer.gatherResults | Erik Johnston | 2015-08-07 | 1 | -4/+8 |
* | | | | | Cache get_recent_events_for_room | Erik Johnston | 2015-08-07 | 1 | -2/+2 |
* | | | | | Remove unncessary cache | Erik Johnston | 2015-08-07 | 1 | -1/+0 |
* | | | | | Change Cache to not use *args in its interface | Erik Johnston | 2015-08-07 | 10 | -81/+67 |
* | | | | | Store absence of state in cache | Erik Johnston | 2015-08-07 | 1 | -6/+16 |
* | | | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache | Erik Johnston | 2015-08-06 | 1 | -3/+27 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Docs | Erik Johnston | 2015-08-06 | 1 | -0/+3 |
| * | | | | Remove failed deferreds from cache | Erik Johnston | 2015-08-06 | 1 | -1/+7 |
| * | | | | Re-implement DEBUG_CACHES flag | Erik Johnston | 2015-08-06 | 1 | -2/+17 |
* | | | | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache | Erik Johnston | 2015-08-06 | 2 | -15/+15 |
|\| | | | |
|
| * | | | | Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds | Erik Johnston | 2015-08-06 | 6 | -95/+124 |
| |\| | | |
|
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_key... | Erik Johnston | 2015-08-06 | 6 | -95/+124 |
| | |\ \ \ |
|
| * | | | | | Make @cached cache deferreds rather than the deferreds' values | Erik Johnston | 2015-08-06 | 2 | -15/+15 |
| |/ / / / |
|
* | | | | | Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse int... | Erik Johnston | 2015-08-05 | 6 | -23/+45 |
|\| | | | |
|
| * | | | | Add support for using keyword arguments with cached functions | Erik Johnston | 2015-07-27 | 6 | -23/+45 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... | Erik Johnston | 2015-08-05 | 2 | -5/+5 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room' | Erik Johnston | 2015-08-05 | 1 | -2/+2 |
| * | | | | Use LRU cache by default | Erik Johnston | 2015-08-05 | 1 | -3/+3 |
* | | | | | Use dictionary cache to do group -> state fetching | Erik Johnston | 2015-08-05 | 6 | -109/+194 |
* | | | | | Move DictionaryCache | Erik Johnston | 2015-08-04 | 1 | -0/+0 |
* | | | | | Add basic dictionary cache | Erik Johnston | 2015-08-04 | 1 | -0/+94 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf | Erik Johnston | 2015-08-04 | 2 | -2/+3 |
|\| | | | |
|
| * | | | | Don't try & check the username if we don't have one (which we won't if it's b... | David Baker | 2015-08-03 | 1 | -1/+2 |
| * | | | | Add vector.im as trusted ID server | David Baker | 2015-08-03 | 1 | -1/+1 |
* | | | | | Add comment | Erik Johnston | 2015-08-04 | 1 | -0/+15 |
* | | | | | Speed up event filtering (for ACL) logic | Erik Johnston | 2015-08-04 | 5 | -43/+102 |
|/ / / / |
|
* | | | | Use the same reg paths as register v1 for ASes. | Kegan Dougal | 2015-07-29 | 1 | -4/+6 |
* | | | | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 2 | -55/+72 |
* | | | | Generate local thumbnails on a thread | Erik Johnston | 2015-07-23 | 1 | -34/+43 |
|/ / / |
|
* | | | Pick larger than desired thumbnail for 'crop' | Erik Johnston | 2015-07-23 | 1 | -1/+2 |
* | | | Disable receipts for now | Matrix | 2015-07-22 | 1 | -0/+2 |
* | | | Query for all the ones we were asked about, not just the last... | David Baker | 2015-07-21 | 1 | -1/+1 |
* | | | Dodesn't seem to make any difference: guess it does work with the object refe... | David Baker | 2015-07-21 | 1 | -1/+0 |
* | | | I think this was what was intended... | David Baker | 2015-07-21 | 1 | -0/+1 |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-07-21 | 2 | -3/+3 |
|\ \ \ |
|
| * | | | typo | Matthew Hodgson | 2015-07-08 | 1 | -2/+2 |
| * | | | Bump changelog and version to v0.9.3 | Erik Johnston | 2015-07-01 | 1 | -1/+1 |
| * | | | Bumb version | Erik Johnston | 2015-06-23 | 1 | -1/+1 |
* | | | | s/take/claim/ for end to end key APIs | Mark Haines | 2015-07-20 | 2 | -8/+8 |
* | | | | Improve naming | Daniel Wagner-Hall | 2015-07-20 | 1 | -2/+2 |
* | | | | Remove semicolon. | Kegan Dougal | 2015-07-20 | 1 | -1/+1 |
* | | | | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID. | Kegan Dougal | 2015-07-20 | 1 | -0/+2 |
* | | | | Up default cache size for _RoomStreamChangeCache | Matrix | 2015-07-18 | 1 | -1/+1 |
* | | | | Don't do any database hits in receipt handling if from_key == to_key | Matrix | 2015-07-18 | 1 | -0/+3 |
* | | | | Merge pull request #199 from matrix-org/erikj/receipts | Erik Johnston | 2015-07-16 | 16 | -35/+701 |
|\ \ \ \ |
|
| * | | | | Docs | Erik Johnston | 2015-07-14 | 2 | -6/+36 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 22 | -221/+1326 |
| |\ \ \ \ |
|
| * | | | | | Comments | Erik Johnston | 2015-07-13 | 2 | -4/+23 |
| * | | | | | Handle error slightly better | Erik Johnston | 2015-07-09 | 1 | -2/+2 |
| * | | | | | Remove spurious comment | Erik Johnston | 2015-07-09 | 1 | -2/+0 |
| * | | | | | Integer timestamps | Erik Johnston | 2015-07-09 | 1 | -1/+1 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-09 | 2 | -3/+8 |
| |\ \ \ \ \ |
|
| * | | | | | | Change format of receipts to allow inclusion of data | Erik Johnston | 2015-07-09 | 3 | -37/+42 |
| * | | | | | | Add blist to dependencies | Erik Johnston | 2015-07-08 | 1 | -0/+1 |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-08 | 7 | -18/+62 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Add a cache to fetching of receipt streams | Erik Johnston | 2015-07-08 | 2 | -27/+96 |
| * | | | | | | | Split receipt events up into one per room | Erik Johnston | 2015-07-08 | 1 | -30/+21 |
| * | | | | | | | Hook up receipts to v1 initialSync | Erik Johnston | 2015-07-08 | 3 | -13/+77 |
| * | | | | | | | Wire together receipts and the notifer/federation | Erik Johnston | 2015-07-07 | 4 | -33/+126 |
| * | | | | | | | Fix various typos | Erik Johnston | 2015-07-07 | 4 | -8/+16 |
| * | | | | | | | Add a ReceiptServlet | Erik Johnston | 2015-07-07 | 2 | -1/+59 |
| * | | | | | | | Add stream_id index | Erik Johnston | 2015-07-02 | 1 | -1/+5 |
| * | | | | | | | Consolidate duplicate code in notifier | Erik Johnston | 2015-07-02 | 4 | -28/+15 |
| * | | | | | | | Add receipts_key to StreamToken | Erik Johnston | 2015-07-02 | 3 | -3/+8 |
| * | | | | | | | Add basic ReceiptHandler | Erik Johnston | 2015-07-01 | 1 | -0/+130 |
| * | | | | | | | Add basic storage functions for handling of receipts | Erik Johnston | 2015-07-01 | 4 | -17/+186 |
| * | | | | | | | Add tables for receipts | Erik Johnston | 2015-06-30 | 2 | -1/+36 |
* | | | | | | | | Merge pull request #203 from matrix-org/erikj/room_creation_presets | Erik Johnston | 2015-07-16 | 2 | -19/+82 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Implement specifying custom initial state for /createRoom | Erik Johnston | 2015-07-16 | 1 | -40/+60 |
| * | | | | | | | | s/everyone_ops/original_invitees_have_ops/ | Erik Johnston | 2015-07-14 | 1 | -3/+3 |
| * | | | | | | | | Capitalize contants | Erik Johnston | 2015-07-14 | 2 | -6/+6 |
| * | | | | | | | | Implement presets at room creation | Erik Johnston | 2015-07-13 | 2 | -22/+65 |
| | |_|_|/ / / /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #202 from matrix-org/erikj/power_level_sanity | Erik Johnston | 2015-07-16 | 1 | -16/+25 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_leve... | Erik Johnston | 2015-07-13 | 12 | -218/+726 |
| |\| | | | | | | |
|
| * | | | | | | | | Sanitize power level checks | Erik Johnston | 2015-07-10 | 1 | -15/+21 |
| * | | | | | | | | You shouldn't be able to ban/kick users with higher power levels | Erik Johnston | 2015-07-10 | 1 | -2/+5 |
* | | | | | | | | | pep8 + debug line | David Baker | 2015-07-15 | 1 | -6/+8 |
* | | | | | | | | | Add back in support for remembering parameters submitted to a user-interactiv... | David Baker | 2015-07-15 | 2 | -4/+13 |
* | | | | | | | | | bump up image quality a bit more as it looks crap | Matthew Hodgson | 2015-07-14 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #193 from matrix-org/erikj/bulk_persist_event | Erik Johnston | 2015-07-14 | 7 | -376/+503 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Remove commented out code | Erik Johnston | 2015-07-10 | 1 | -14/+0 |
| * | | | | | | | | | Add bulk insert events API | Erik Johnston | 2015-06-25 | 8 | -374/+521 |
* | | | | | | | | | | Close, but no cigar. | David Baker | 2015-07-14 | 1 | -2/+2 |
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Merge pull request #196 from matrix-org/erikj/room_history | Erik Johnston | 2015-07-10 | 8 | -4/+235 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Add comment | Erik Johnston | 2015-07-09 | 1 | -0/+4 |
| * | | | | | | | | | Add m.room.history_visibility to newly created rooms' m.room.power_levels | Erik Johnston | 2015-07-06 | 2 | -0/+2 |
| * | | | | | | | | | Rename key and values for m.room.history_visibility. Support 'invited' value | Erik Johnston | 2015-07-06 | 4 | -24/+61 |
| * | | | | | | | | | Filter and redact events that the other server doesn't have permission to see... | Erik Johnston | 2015-07-03 | 1 | -0/+44 |
| * | | | | | | | | | Respect m.room.history_visibility in v2_alpha sync API | Erik Johnston | 2015-07-03 | 1 | -0/+33 |
| * | | | | | | | | | Add m.room.history_visibility to list of auth events | Erik Johnston | 2015-07-03 | 2 | -1/+3 |
| * | | | | | | | | | Make v1 initial syncs respect room history ACL | Erik Johnston | 2015-07-02 | 1 | -17/+34 |
| * | | | | | | | | | Add basic impl for room history ACL on GET /messages client API | Erik Johnston | 2015-07-02 | 3 | -3/+95 |
| | |_|/ / / / / /
| |/| | | | | | | |
|
* | | | | | | | | | Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs | Erik Johnston | 2015-07-10 | 4 | -214/+491 |
|\ \ \ \ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Wait for previous attempts at fetching keys for a given server before trying ... | Erik Johnston | 2015-06-26 | 1 | -15/+68 |
| * | | | | | | | | Implement bulk verify_signed_json API | Erik Johnston | 2015-06-26 | 4 | -217/+441 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | Uniquely name unique constraint | Erik Johnston | 2015-07-10 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management | Erik Johnston | 2015-07-10 | 5 | -2/+441 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Assume that each device for a user has only one of each type of key | Mark Haines | 2015-07-10 | 1 | -3/+3 |
| * | | | | | | | | Don't bother with a timeout for one time keys on the server. | Mark Haines | 2015-07-09 | 3 | -33/+13 |
| * | | | | | | | | Only remove one time keys when new one time keys are added | Mark Haines | 2015-07-08 | 1 | -7/+7 |
| * | | | | | | | | Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-ma... | Mark Haines | 2015-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \
| | | |_|/ / / / /
| | |/| | | | | | |
|
| * | | | | | | | | Add client API for uploading and querying keys for end to end encryption | Mark Haines | 2015-07-06 | 2 | -1/+290 |
| * | | | | | | | | Add store for client end to end keys | Mark Haines | 2015-07-06 | 3 | -1/+171 |
* | | | | | | | | | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 2 | -22/+34 |
* | | | | | | | | | Merge pull request #201 from EricssonResearch/msba/saml2-develop | Erik Johnston | 2015-07-10 | 5 | -3/+149 |
|\ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / /
|/| | | | | | | | |
|
| * | | | | | | | | Make SAML2 optional and add some references/comments | Muthu Subramanian | 2015-07-09 | 2 | -4/+23 |
| * | | | | | | | | code beautify | Muthu Subramanian | 2015-07-09 | 1 | -9/+4 |
| * | | | | | | | | code beautify | Muthu Subramanian | 2015-07-08 | 3 | -2/+3 |
| * | | | | | | | | code beautify | Muthu Subramanian | 2015-07-08 | 1 | -10/+23 |
| * | | | | | | | | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 5 | -4/+122 |
| | |_|_|/ / / /
| |/| | | | | | |
|
* | | | | | | | | We don't want semicolons. | Erik Johnston | 2015-07-09 | 1 | -1/+1 |
* | | | | | | | | remove the tls_certificate_chain_path param and simply support tls_certificat... | Matthew Hodgson | 2015-07-09 | 2 | -24/+10 |
* | | | | | | | | document tls_certificate_chain_path more clearly | Matthew Hodgson | 2015-07-09 | 1 | -0/+5 |
* | | | | | | | | oops, context.tls_certificate_chain_file() expects a file, not a certificate. | Matthew Hodgson | 2015-07-08 | 2 | -6/+3 |
* | | | | | | | | typo | Matthew Hodgson | 2015-07-08 | 1 | -1/+1 |
* | | | | | | | | *cough* | Matthew Hodgson | 2015-07-08 | 1 | -2/+3 |
* | | | | | | | | add new optional config for tls_certificate_chain_path for folks with interme... | Matthew Hodgson | 2015-07-08 | 2 | -3/+19 |
| |_|/ / / / /
|/| | | | | | |
|
* | | | | | | | Don't 500 if a group is missing from the regex | Mark Haines | 2015-07-06 | 1 | -1/+1 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Don't explode if we don't recognize one of the event_ids in the backfill request | Erik Johnston | 2015-07-06 | 1 | -2/+4 |
* | | | | | | If user supplies filename in URL when downloading from media repo, use that n... | Erik Johnston | 2015-07-03 | 3 | -9/+14 |
* | | | | | | Enforce ascii filenames for uploads | Erik Johnston | 2015-06-30 | 3 | -1/+15 |
* | | | | | | Add Content-Disposition headers to media repo v1 downloads | Erik Johnston | 2015-06-30 | 3 | -7/+30 |
|/ / / / / |
|
* / / / / | Oops: underride rule had an identifier with override in it. | David Baker | 2015-06-23 | 1 | -1/+1 |
|/ / / / |
|
* / / / | Batch SELECTs in _get_auth_chain_ids_txn | Erik Johnston | 2015-06-23 | 1 | -3/+11 |
|/ / / |
|
* | | | Fix typo | Erik Johnston | 2015-06-19 | 1 | -1/+1 |
* | | | Merge pull request #192 from matrix-org/erikj/fix_log_context | Erik Johnston | 2015-06-19 | 3 | -52/+68 |
|\ \ \ |
|
| * | | | Fix log context when sending requests | Erik Johnston | 2015-06-19 | 3 | -52/+68 |
* | | | | Merge pull request #190 from matrix-org/erikj/syn-412 | Erik Johnston | 2015-06-19 | 3 | -73/+78 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Add comment on cancellation of observers | Erik Johnston | 2015-06-19 | 1 | -0/+3 |
| * | | | PEP8 | Erik Johnston | 2015-06-18 | 1 | -2/+3 |
| * | | | Documentation | Erik Johnston | 2015-06-18 | 1 | -4/+11 |
| * | | | Don't bother proxying lookups on _NotificationListener to underlying deferred | Erik Johnston | 2015-06-18 | 1 | -10/+2 |
| * | | | Refactor the notifier.wait_for_events code to be clearer. Add _NotifierUserSt... | Erik Johnston | 2015-06-18 | 3 | -70/+73 |
| * | | | Fix notifier leak | Erik Johnston | 2015-06-18 | 1 | -21/+20 |
* | | | | Merge pull request #189 from matrix-org/erikj/room_init_sync | Erik Johnston | 2015-06-19 | 2 | -35/+45 |
|\ \ \ \ |
|
| * | | | | Use another deferred list | Erik Johnston | 2015-06-16 | 1 | -18/+27 |
| * | | | | Use DeferredList | Erik Johnston | 2015-06-16 | 1 | -9/+9 |
| * | | | | Don't do unecessary db ops in presence.get_state | Erik Johnston | 2015-06-16 | 2 | -14/+15 |
| |/ / / |
|
* | | | | Merge pull request #187 from matrix-org/erikj/sanitize_logging | Erik Johnston | 2015-06-19 | 7 | -127/+209 |
|\ \ \ \ |
|
| * | | | | Remove stale debug lines | Erik Johnston | 2015-06-19 | 1 | -10/+0 |
| * | | | | Add site_tag to logger | Erik Johnston | 2015-06-19 | 1 | -2/+2 |
| * | | | | Add IDs to outbound transactions | Erik Johnston | 2015-06-19 | 1 | -53/+71 |
| * | | | | Remove access_token from synapse.rest.client.v1.transactions {get,store}_resp... | Erik Johnston | 2015-06-16 | 1 | -3/+3 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sanitize_l... | Erik Johnston | 2015-06-15 | 2 | -1/+2 |
| |\| | | |
|
| * | | | | Disable twisted access logging. Move access logging to SynapseRequest object | Erik Johnston | 2015-06-15 | 2 | -75/+79 |
| * | | | | Log more when we have processed the request | Erik Johnston | 2015-06-15 | 4 | -4/+23 |
| * | | | | Create SynapseRequest that overrides __repr__ to not print access_token | Erik Johnston | 2015-06-15 | 2 | -17/+46 |
| * | | | | Merge branch 'erikj/listeners_config' into erikj/sanitize_logging | Erik Johnston | 2015-06-15 | 5 | -210/+327 |
| |\ \ \ \ |
|
| * | | | | | Make http.server request logging more verbose, but redact access_tokens | Erik Johnston | 2015-06-15 | 1 | -2/+12 |
| * | | | | | Log requests and responses sent via http.client | Erik Johnston | 2015-06-15 | 1 | -3/+15 |
* | | | | | | Make upload dir a configurable path. | Eric Myhre | 2015-06-18 | 2 | -2/+6 |
* | | | | | | Fix bug where synapse was sending AS user queries incorrectly. | Kegan Dougal | 2015-06-17 | 1 | -1/+1 |
* | | | | | | Correct -H SERVER_NAME in config-missing complaint message | Paul "LeoNerd" Evans | 2015-06-16 | 1 | -2/+2 |
| |_|/ / /
|/| | | | |
|
* | | | | | Merge pull request #185 from matrix-org/erikj/listeners_config | Erik Johnston | 2015-06-15 | 5 | -210/+327 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Remove redundant newline | Erik Johnston | 2015-06-15 | 1 | -2/+1 |
| * | | | | Document listener config. Remove deprecated config options | Erik Johnston | 2015-06-15 | 2 | -36/+42 |
| * | | | | Add backwards compat support for metrics, manhole and webclient config options | Erik Johnston | 2015-06-12 | 3 | -16/+27 |
| * | | | | PEP8 | Erik Johnston | 2015-06-12 | 1 | -3/+3 |
| * | | | | Correctly handle x_forwaded listener option | Erik Johnston | 2015-06-12 | 3 | -14/+31 |
| * | | | | Use config.listeners | Erik Johnston | 2015-06-12 | 2 | -96/+168 |
| * | | | | Fix up create_resource_tree | Erik Johnston | 2015-06-12 | 1 | -104/+100 |
| * | | | | Begin changing the config format | Erik Johnston | 2015-06-11 | 1 | -8/+24 |
* | | | | | Bump version | Erik Johnston | 2015-06-15 | 1 | -1/+1 |
* | | | | | Bump version | Erik Johnston | 2015-06-13 | 1 | -1/+1 |
* | | | | | Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py | Erik Johnston | 2015-06-13 | 1 | -0/+1 |
| |/ / /
|/| | | |
|
* | | | | Bump schema version | Erik Johnston | 2015-06-11 | 1 | -1/+1 |
* | | | | Bump version | Erik Johnston | 2015-06-11 | 1 | -1/+1 |
|/ / / |
|
* | | | Catch any exceptions in the pusher loop. Use a lower timeout for pushers so w... | David Baker | 2015-06-05 | 1 | -112/+133 |
* | | | pep8 | David Baker | 2015-06-04 | 1 | -1/+0 |
* | | | Add script to (re)convert the pushers table to changing the unique key. Also ... | David Baker | 2015-06-04 | 3 | -2/+79 |
* | | | Merge pull request #175 from matrix-org/erikj/thumbnail_thread | Erik Johnston | 2015-06-03 | 1 | -45/+53 |
|\ \ \ |
|
| * | | | Thumbnail images on a seperate thread | Erik Johnston | 2015-06-02 | 1 | -45/+53 |
* | | | | Merge pull request #176 from matrix-org/erikj/backfill_auth | Erik Johnston | 2015-06-03 | 2 | -8/+50 |
|\ \ \ \ |
|
| * | | | | Rephrase log line | Erik Johnston | 2015-06-02 | 1 | -1/+1 |
| * | | | | Don't about JSON when warning about content tampering | Erik Johnston | 2015-06-02 | 1 | -7/+4 |
| * | | | | Add a timeout | Erik Johnston | 2015-06-02 | 1 | -0/+1 |
| * | | | | Handle the fact we might be missing auth events | Erik Johnston | 2015-06-02 | 1 | -15/+19 |