Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-11 | 152 | -3214/+8075 | |
| |\ \ \ \ | ||||||
| * | | | | | Include the ts the notif was received at | David Baker | 2016-05-24 | 2 | -5/+8 | |
| * | | | | | Actually make the 'read' flag correct | David Baker | 2016-05-23 | 1 | -4/+3 | |
| * | | | | | Add GET /notifications API | David Baker | 2016-05-23 | 4 | -0/+155 | |
* | | | | | | Update comment | Mark Haines | 2016-08-22 | 1 | -1/+2 | |
* | | | | | | Add usage stats to prometheus monitoring | Mark Haines | 2016-08-22 | 1 | -2/+25 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #1031 from matrix-org/erikj/measure_notifier | Erik Johnston | 2016-08-22 | 6 | -182/+186 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Add exception logging. Fix typo | Erik Johnston | 2016-08-22 | 1 | -3/+3 | |
| * | | | | Allow request handlers to override metric name | Erik Johnston | 2016-08-22 | 1 | -21/+31 | |
| * | | | | Use top level measure | Erik Johnston | 2016-08-22 | 1 | -15/+1 | |
| * | | | | Add a top level measure | Erik Johnston | 2016-08-19 | 1 | -45/+46 | |
| * | | | | Remove redundant measure | Erik Johnston | 2016-08-19 | 1 | -35/+34 | |
| * | | | | Only abort Measure on Exceptions | Erik Johnston | 2016-08-19 | 1 | -1/+1 | |
| * | | | | defer.returnValue must not be called within Measure | Erik Johnston | 2016-08-19 | 2 | -9/+8 | |
| * | | | | Move defer.returnValue out of Measure | Erik Johnston | 2016-08-19 | 1 | -1/+1 | |
| * | | | | Update keyring Measure | Erik Johnston | 2016-08-19 | 1 | -85/+85 | |
| * | | | | Measure http.server render | Erik Johnston | 2016-08-19 | 1 | -28/+30 | |
| * | | | | Measure _get_event_from_row | Erik Johnston | 2016-08-19 | 1 | -41/+43 | |
| * | | | | Measure keyrings | Erik Johnston | 2016-08-19 | 1 | -34/+36 | |
| * | | | | Add measure blocks to notifier | Erik Johnston | 2016-08-19 | 1 | -15/+18 | |
* | | | | | Merge pull request #1030 from matrix-org/erikj/cache_contexts | Erik Johnston | 2016-08-19 | 12 | -86/+190 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Ensure invalidation list does not grow unboundedly | Erik Johnston | 2016-08-19 | 2 | -20/+16 | |
| * | | | | Rename to on_invalidate | Erik Johnston | 2016-08-19 | 2 | -19/+13 | |
| * | | | | Make cache_context an explicit option | Erik Johnston | 2016-08-19 | 2 | -9/+28 | |
| * | | | | Move _bulk_get_push_rules_for_room to storage layer | Erik Johnston | 2016-08-19 | 3 | -34/+65 | |
| * | | | | Remove lru option | Erik Johnston | 2016-08-19 | 8 | -32/+17 | |
| * | | | | Add concept of cache contexts | Erik Johnston | 2016-08-19 | 3 | -20/+99 | |
* | | | | | Make get_new_events_for_appservice use indices | Erik Johnston | 2016-08-19 | 1 | -2/+5 | |
|/ / / / | ||||||
* | | | | Merge pull request #1026 from matrix-org/paul/thirdpartylookup | Paul Evans | 2016-08-18 | 7 | -1/+189 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Move validation logic for AS 3PE query response into ApplicationServiceApi cl... | Paul "LeoNerd" Evans | 2016-08-18 | 2 | -45/+44 | |
| * | | | More warnings about invalid results from AS 3PE query | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+7 | |
| * | | | Avoid so much copypasta between 3PU and 3PL query by unifying around a ThirdP... | Paul "LeoNerd" Evans | 2016-08-18 | 4 | -42/+34 | |
| * | | | Minor syntax neatenings | Paul "LeoNerd" Evans | 2016-08-18 | 2 | -16/+10 | |
| * | | | Appease pep8 | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+2 | |
| * | | | Authenticate 3PE lookup requests | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+6 | |
| * | | | Copypasta the 3PU support code to also do 3PL | Paul "LeoNerd" Evans | 2016-08-18 | 3 | -3/+61 | |
| * | | | Remove TODO note about request fields being strings - they're always strings | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+0 | |
| * | | | Log a warning if an AS yields an invalid 3PU lookup result | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+6 | |
| * | | | Scattergather the call out to ASes; validate received results | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -7/+34 | |
| * | | | Filter 3PU lookups by only ASes that declare knowledge of that protocol | Paul "LeoNerd" Evans | 2016-08-18 | 3 | -3/+22 | |
| * | | | Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup | Paul "LeoNerd" Evans | 2016-08-18 | 42 | -476/+1063 | |
| |\ \ \ | ||||||
| * | | | | Since empty lookups now return 200/empty list not 404, we can safely log fail... | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -3/+2 | |
| * | | | | Ensure that 3PU lookup request fields actually get passed in | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+5 | |
| * | | | | Extend individual list results into the main return list, don't append | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+1 | |
| * | | | | Don't catch the return-value-as-exception that @defer.inlineCallbacks will use | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+1 | |
| * | | | | Actually make 3PU lookup calls out to ASes | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+10 | |
| * | | | | Thread 3PU lookup through as far as the AS API object; which currently noöps it | Paul "LeoNerd" Evans | 2016-08-17 | 3 | -2/+33 | |
| * | | | | Initial empty implementation that just registers an API endpoint handler | Paul "LeoNerd" Evans | 2016-08-17 | 2 | -0/+40 | |
* | | | | | Remove log lines | Erik Johnston | 2016-08-18 | 1 | -2/+0 | |
* | | | | | Add appservice worker | Erik Johnston | 2016-08-18 | 7 | -123/+369 | |
| |/ / / |/| | | | ||||||
* | | | | Make AppserviceHandler stream events from database | Erik Johnston | 2016-08-18 | 4 | -22/+107 | |
* | | | | Missed a s/federation reader/media repository/ in a log message | Mark Haines | 2016-08-18 | 1 | -1/+1 | |
* | | | | Merge pull request #1024 from matrix-org/markjh/media_repository | Mark Haines | 2016-08-18 | 1 | -0/+212 | |
|\ \ \ \ | ||||||
| * | | | | Add a media repository worker | Mark Haines | 2016-08-18 | 1 | -0/+212 | |
* | | | | | Merge pull request #1022 from matrix-org/erikj/as_notify_perf | Erik Johnston | 2016-08-18 | 2 | -62/+50 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make notify_interested_services faster | Erik Johnston | 2016-08-17 | 2 | -62/+50 | |
* | | | | | | Fix push_display_name_rename schema update | Erik Johnston | 2016-08-17 | 1 | -0/+3 | |
* | | | | | | Make push Measure finer grained | Erik Johnston | 2016-08-17 | 1 | -4/+5 | |
* | | | | | | Merge pull request #1021 from matrix-org/erikj/mediasecurity_policy | Erik Johnston | 2016-08-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Set `Content-Security-Policy` on media repo | Erik Johnston | 2016-08-17 | 1 | -0/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1011 from matrix-org/dbkr/contains_display_name_override | David Baker | 2016-08-17 | 2 | -16/+37 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add migration script | David Baker | 2016-08-16 | 1 | -0/+17 | |
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name... | David Baker | 2016-08-16 | 9 | -211/+244 | |
| |\ \ \ \ | ||||||
| * | | | | | s/underride/override/ in the rule_id too | David Baker | 2016-08-16 | 1 | -1/+1 | |
| * | | | | | Move display name rule | David Baker | 2016-08-15 | 1 | -16/+20 | |
* | | | | | | Add None check to _iterate_over_text | Erik Johnston | 2016-08-17 | 1 | -1/+1 | |
* | | | | | | Change name of metric | Matrix | 2016-08-17 | 1 | -1/+1 | |
* | | | | | | Move Measure block inside loop | Erik Johnston | 2016-08-17 | 1 | -9/+9 | |
* | | | | | | Merge pull request #1019 from matrix-org/erikj/appservice_clean | Erik Johnston | 2016-08-17 | 1 | -31/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Clean up _ServiceQueuer | Erik Johnston | 2016-08-17 | 1 | -31/+30 | |
* | | | | | | | Remove dead appservice code | Erik Johnston | 2016-08-17 | 1 | -39/+2 | |
|/ / / / / / | ||||||
* | | | | | | Measure notify_interested_services | Erik Johnston | 2016-08-17 | 1 | -19/+22 | |
* | | | | | | Do it in storage function | Erik Johnston | 2016-08-16 | 2 | -1/+4 | |
* | | | | | | Don't update caches replication stream if tokens haven't advanced | Erik Johnston | 2016-08-16 | 1 | -1/+1 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Flake8 | Erik Johnston | 2016-08-16 | 1 | -4/+1 | |
* | | | | | Fix up preview URL API. Add tests. | Erik Johnston | 2016-08-16 | 1 | -157/+196 | |
* | | | | | Merge pull request #1012 from matrix-org/erikj/limit_backfill_uri | Erik Johnston | 2016-08-16 | 1 | -4/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Limit number of extremeties in backfill request | Erik Johnston | 2016-08-16 | 1 | -4/+5 | |
* | | | | | | Merge pull request #1010 from matrix-org/erikj/refactor_deletions | Erik Johnston | 2016-08-16 | 6 | -47/+42 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Use cached get_user_by_access_token in slaves | Erik Johnston | 2016-08-16 | 3 | -2/+3 | |
| * | | | | | Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to sl... | Erik Johnston | 2016-08-15 | 3 | -45/+39 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ... | Erik Johnston | 2016-08-16 | 1 | -1/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add missing database corruption recovery case | Benjamin Saunders | 2016-08-14 | 1 | -1/+2 | |
* | | | | | Merge pull request #1009 from matrix-org/erikj/event_split | Erik Johnston | 2016-08-15 | 24 | -92/+367 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Doc get_next() context manager usage | Erik Johnston | 2016-08-15 | 1 | -0/+4 | |
| * | | | | Rename table. Add docs. | Erik Johnston | 2016-08-15 | 4 | -6/+16 | |
| * | | | | Remove broken cache stuff | Erik Johnston | 2016-08-15 | 2 | -21/+0 | |
| * | | | | Use cached version of get_aliases_for_room | Erik Johnston | 2016-08-15 | 1 | -1/+1 | |
| * | | | | Implement cache replication stream | Erik Johnston | 2016-08-15 | 5 | -30/+92 | |
| * | | | | Add some invalidations to a cache_stream | Erik Johnston | 2016-08-15 | 7 | -31/+117 | |
| * | | | | Always run txn.after_callbacks | Erik Johnston | 2016-08-15 | 1 | -7/+8 | |
| * | | | | Make synchrotron accept /events | Erik Johnston | 2016-08-12 | 5 | -18/+66 | |
| * | | | | Dont invoke get_handlers fromClientV1RestServlet | Erik Johnston | 2016-08-12 | 9 | -1/+86 | |
* | | | | | Log the value which is observed in the first place. | Daniel Ehlers | 2016-08-14 | 1 | -1/+1 | |
* | | | | | Fix AttributeError when bind_dn is not defined. | Daniel Ehlers | 2016-08-14 | 1 | -1/+1 | |
* | | | | | Only process one local membership event per room at a time | Erik Johnston | 2016-08-12 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #997 from Half-Shot/develop | Erik Johnston | 2016-08-11 | 3 | -5/+8 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Synced up synchrotron set_state with PresenceHandler set_state | Will Hunt | 2016-08-11 | 1 | -1/+1 | |
| * | | | Don't change status_msg on /sync | Will Hunt | 2016-08-10 | 2 | -4/+7 | |
* | | | | Include prev_content in redacted state events | Erik Johnston | 2016-08-11 | 1 | -0/+2 | |
* | | | | PEP8 | Erik Johnston | 2016-08-10 | 1 | -1/+3 | |
* | | | | Clean up TransactionQueue | Erik Johnston | 2016-08-10 | 4 | -221/+162 | |
* | | | | Merge pull request #999 from matrix-org/erikj/measure_more | Erik Johnston | 2016-08-10 | 2 | -5/+21 | |
|\ \ \ \ | ||||||
| * | | | | Measure federation send transaction resources | Erik Johnston | 2016-08-10 | 2 | -5/+21 | |
| |/ / / | ||||||
* | | | | Don't stop on 4xx series errors | Erik Johnston | 2016-08-10 | 1 | -11/+1 | |
* | | | | Also check if server is in the room | Erik Johnston | 2016-08-10 | 1 | -2/+7 | |
* | | | | Also pull out rejected events | Erik Johnston | 2016-08-10 | 1 | -1/+1 | |
* | | | | Correctly auth /event/ requests | Erik Johnston | 2016-08-10 | 1 | -5/+6 | |
* | | | | Only resign our own events | Erik Johnston | 2016-08-10 | 1 | -9/+10 | |
* | | | | Store if we fail to fetch an event from a destination | Erik Johnston | 2016-08-10 | 1 | -1/+36 | |
|/ / / | ||||||
* | | | Merge pull request #996 from matrix-org/erikj/tls_error | Erik Johnston | 2016-08-10 | 2 | -13/+19 | |
|\ \ \ | ||||||
| * | | | Don't print stack traces when failing to get remote keys | Erik Johnston | 2016-08-10 | 2 | -13/+19 | |
* | | | | /login: Respond with a 403 when we get an invalid m.login.token | Richard van der Hoff | 2016-08-09 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Merge pull request #995 from matrix-org/rav/clean_up_cas_login | David Baker | 2016-08-09 | 1 | -125/+33 | |
|\ \ \ | ||||||
| * | | | Clean up CAS login code | Richard van der Hoff | 2016-08-08 | 1 | -125/+33 | |
| |/ / | ||||||
* | | | Merge pull request #994 from matrix-org/rav/fix_cas_login | David Baker | 2016-08-08 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | Fix CAS login | Richard van der Hoff | 2016-08-08 | 1 | -0/+1 | |
| |/ / | ||||||
* | | | Merge pull request #993 from matrix-org/rav/fix_token_login | Richard van der Hoff | 2016-08-08 | 3 | -28/+38 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fix login with m.login.token | Richard van der Hoff | 2016-08-08 | 3 | -28/+38 | |
* | | | Bump changelog and version | Erik Johnston | 2016-08-08 | 1 | -1/+1 | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-08 | 12 | -68/+123 | |
|\| | | ||||||
| * | | Make psutil optional | Erik Johnston | 2016-08-08 | 3 | -6/+16 | |
| * | | Merge pull request #991 from matrix-org/erikj/retry_make | Erik Johnston | 2016-08-05 | 1 | -11/+24 | |
| |\ \ | ||||||
| | * | | Fix a couple of python bugs | Erik Johnston | 2016-08-05 | 1 | -6/+8 | |
| | * | | Retry joining via other servers if first one failed | Erik Johnston | 2016-08-05 | 1 | -5/+16 | |
| * | | | Merge pull request #990 from matrix-org/erikj/fed_vers | Erik Johnston | 2016-08-05 | 6 | -49/+80 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Add federation /version API | Erik Johnston | 2016-08-05 | 6 | -9/+25 | |
| | * | | Change the way we specify if we require auth or not | Erik Johnston | 2016-08-05 | 1 | -40/+55 | |
| * | | | Merge pull request #989 from matrix-org/erikj/raise_404 | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | Raise 404 when couldn't find event | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| | |/ / | ||||||
| * / / | Don't include html comments in description | Erik Johnston | 2016-08-05 | 1 | -1/+2 | |
| |/ / | ||||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-05 | 1 | -21/+50 | |
|\| | | ||||||
| * | | Fix backfill auth events | Erik Johnston | 2016-08-05 | 1 | -21/+50 | |
* | | | Bump version and changelog | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-05 | 14 | -145/+573 | |
|\| | | ||||||
| * | | Fix typo | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| * | | Check if we already have the events returned by /state/ | Erik Johnston | 2016-08-05 | 1 | -2/+16 | |
| * | | Delete more tables | Erik Johnston | 2016-08-05 | 1 | -0/+5 | |
| * | | Fallback to /state/ on both 400 and 404 | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| * | | Tweak integrity error recovery to work as intended | Benjamin Saunders | 2016-08-04 | 2 | -1/+4 | |
| * | | Merge pull request #973 from matrix-org/erikj/xpath_fix | Erik Johnston | 2016-08-04 | 1 | -14/+72 | |
| |\ \ | ||||||
| | * | | Typo | Erik Johnston | 2016-08-04 | 1 | -1/+1 | |
| | * | | Test summarization | Erik Johnston | 2016-08-04 | 1 | -52/+54 | |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix | Erik Johnston | 2016-08-04 | 13 | -125/+411 | |
| | |\ \ | ||||||
| | * | | | Don't infer paragrahs from newlines | Erik Johnston | 2016-08-02 | 1 | -2/+1 | |
| | * | | | Comment on why we clone | Erik Johnston | 2016-08-02 | 1 | -0/+1 | |
| | * | | | Spelling. | Erik Johnston | 2016-08-02 | 1 | -3/+3 | |
| | * | | | Make it actually compile | Erik Johnston | 2016-08-02 | 1 | -1/+1 | |
| | * | | | Change the way we summarize URLs | Erik Johnston | 2016-08-02 | 1 | -11/+67 | |
| * | | | | Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error | Erik Johnston | 2016-08-04 | 1 | -4/+66 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Fix typo | Erik Johnston | 2016-08-04 | 1 | -3/+4 | |
| | * | | | Retry event persistence on IntegrityError | Erik Johnston | 2016-08-04 | 1 | -4/+65 | |
| * | | | | Fix typos. | Erik Johnston | 2016-08-04 | 1 | -3/+3 | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api | Erik Johnston | 2016-08-04 | 11 | -124/+260 | |
| |\| | | | ||||||
| | * | | | keys/query: Omit device displayname if null | Richard van der Hoff | 2016-08-04 | 1 | -3/+4 | |
| | * | | | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -10/+10 | |
| | * | | | Include device name in /keys/query response | Richard van der Hoff | 2016-08-03 | 2 | -20/+51 | |
| | * | | | keys/query: return all users which were asked for | Richard van der Hoff | 2016-08-03 | 1 | -3/+6 | |
| | * | | | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 4 | -5/+23 | |
| | |\ \ \ | ||||||
| | | * | | | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 | |
| | | * | | | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 4 | -5/+23 | |
| | | |/ / | ||||||
| | * | | | Merge branch 'rav/refactor_device_query' into develop | Richard van der Hoff | 2016-08-03 | 6 | -82/+167 | |
| | |\ \ \ | ||||||
| | | * | | | E2eKeysHandler: minor tweaks | Richard van der Hoff | 2016-08-03 | 1 | -5/+3 | |
| | | * | | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 15 | -64/+427 | |
| | | |\| | | ||||||
| | | * | | | E2E keys: Make federation query share code with client query | Richard van der Hoff | 2016-08-02 | 3 | -47/+92 | |
| | | * | | | Move e2e query logic into a handler | Richard van der Hoff | 2016-08-01 | 4 | -60/+102 | |
| | * | | | | Remove other bit of deduplication | Erik Johnston | 2016-08-03 | 1 | -19/+0 | |
| | * | | | | Ensure we only persist an event once at a time | Erik Johnston | 2016-08-03 | 1 | -1/+18 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Tidy up get_events | Erik Johnston | 2016-08-04 | 1 | -12/+10 | |
| * | | | | Rename fields to _ids | Erik Johnston | 2016-08-03 | 2 | -4/+4 | |
| * | | | | Fix copy + paste fails | Erik Johnston | 2016-08-03 | 2 | -6/+11 | |
| * | | | | Actually call get_room_state | Erik Johnston | 2016-08-03 | 1 | -0/+4 | |
| * | | | | Fix syntax error | Erik Johnston | 2016-08-03 | 1 | -1/+8 | |
| * | | | | Comment | Erik Johnston | 2016-08-03 | 1 | -0/+14 | |
| * | | | | Add /state_ids federation API | Erik Johnston | 2016-08-03 | 4 | -3/+125 | |
| |/ / / | ||||||
* | | | | Bump version and changelog v0.17.0-rc3 | Erik Johnston | 2016-08-02 | 1 | -1/+1 | |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-02 | 18 | -110/+643 | |
|\| | | | ||||||
| * | | | Don't double wrap 200 | Erik Johnston | 2016-08-02 | 1 | -2/+2 | |
| * | | | Fix response cache | Erik Johnston | 2016-08-02 | 1 | -1/+1 | |
| * | | | Merge pull request #940 from matrix-org/erikj/fed_state_cache | Erik Johnston | 2016-08-02 | 5 | -32/+60 | |
| |\ \ \ | ||||||
| | * | | | Cache federation state responses | Erik Johnston | 2016-07-21 | 5 | -32/+60 | |
| * | | | | Merge pull request #967 from matrix-org/erikj/fed_reader | Erik Johnston | 2016-08-02 | 7 | -18/+342 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-08-02 | 3 | -3/+23 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 1 | -4/+31 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 37 | -295/+929 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Add destination retry to slave store | Erik Johnston | 2016-07-28 | 2 | -0/+32 | |
| | * | | | | | | | Add slace storage functions for public room list | Erik Johnston | 2016-07-28 | 3 | -0/+48 | |
| | * | | | | | | | Add get_auth_chain to slave store | Erik Johnston | 2016-07-28 | 1 | -0/+4 | |
| | * | | | | | | | Add more key storage funcs into slave store | Erik Johnston | 2016-07-28 | 2 | -24/+26 | |
| | * | | | | | | | Split out a FederationReader process | Erik Johnston | 2016-07-21 | 4 | -0/+238 | |
| * | | | | | | | | Merge branch 'develop' into dbkr/fix_add_email_on_register | Mark Haines | 2016-08-02 | 3 | -3/+23 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Ignore AlreadyCalled errors on timer cancel | Erik Johnston | 2016-07-31 | 2 | -3/+16 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #958 from matrix-org/paul/SYN-738 | Paul Evans | 2016-07-29 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | | * | | | | | Forbid non-ASes from registering users whose names begin with '_' (SYN-738) | Paul "LeoNerd" Evans | 2016-07-27 | 1 | -0/+7 | |
| * | | | | | | | Fix adding emails on registration | David Baker | 2016-07-29 | 1 | -9/+7 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #964 from matrix-org/erikj/fed_join_fix | Erik Johnston | 2016-07-29 | 1 | -4/+31 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | Mention that func will fetch auth events | Erik Johnston | 2016-07-29 | 1 | -0/+2 | |
| | * | | | | | Update docstring | Erik Johnston | 2016-07-29 | 1 | -0/+6 | |
| | * | | | | | Handle the case of missing auth events when joining a room | Erik Johnston | 2016-07-28 | 1 | -4/+23 | |
| * | | | | | | Fix SQL to supply arguments in the same order | Mark Haines | 2016-07-29 | 1 | -1/+1 | |
| * | | | | | | Create separate methods for getting messages to push | Mark Haines | 2016-07-28 | 4 | -51/+163 | |
| * | | | | | | Comment get_unread_push_actions_for_user_in_range function | Kegan Dougal | 2016-07-28 | 1 | -2/+26 | |
| * | | | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-28 | 1 | -1/+1 | |
| |\| | | | | | ||||||
| * | | | | | | Merge pull request #962 from matrix-org/markjh/retry | Mark Haines | 2016-07-28 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fix retry utils to check if the exception is a subclass of CME | Mark Haines | 2016-07-28 | 1 | -1/+1 | |
| * | | | | | | | Merge pull request #941 from matrix-org/erikj/key_client_fix | Erik Johnston | 2016-07-28 | 1 | -3/+9 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Bump changeog and version | Erik Johnston | 2016-08-02 | 1 | -1/+1 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into rel... | Erik Johnston | 2016-07-28 | 1 | -3/+9 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Cache getPeer | Erik Johnston | 2016-07-21 | 1 | -2/+5 | |
| * | | | | | | Set host not path | Erik Johnston | 2016-07-21 | 1 | -1/+1 | |
| * | | | | | | Send the correct host header when fetching keys | Erik Johnston | 2016-07-21 | 1 | -3/+6 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Bump version and changelog | Erik Johnston | 2016-07-28 | 1 | -1/+1 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-07-28 | 7 | -14/+85 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name | Erik Johnston | 2016-07-28 | 1 | -1/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Don't include name of room for invites in push | David Baker | 2016-07-28 | 1 | -1/+4 | |
| * | | | | | | Merge pull request #960 from matrix-org/rav/support_r0.2 | Richard van der Hoff | 2016-07-28 | 1 | -1/+5 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Add r0.1.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -0/+1 | |
| | * | | | | | Add r0.2.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -1/+4 | |
| * | | | | | | Typo | David Baker | 2016-07-28 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload | Richard van der Hoff | 2016-07-27 | 4 | -11/+75 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | key upload tweaks | Richard van der Hoff | 2016-07-27 | 1 | -7/+5 | |
| | * | | | | SQL syntax fix | Richard van der Hoff | 2016-07-27 | 1 | -1/+1 | |
| | * | | | | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 3 | -4/+28 | |
| | * | | | | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 2 | -12/+54 | |
* | | | | | | Bump CHANGES and version | Erik Johnston | 2016-07-27 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'develop' into markjh/verify | Mark Haines | 2016-07-27 | 2 | -3/+11 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #955 from matrix-org/markjh/only_from2 | Mark Haines | 2016-07-27 | 1 | -2/+9 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Add a couple more checks to the keyring | Mark Haines | 2016-07-26 | 1 | -2/+9 | |
| * | | | | | | Merge pull request #954 from matrix-org/markjh/even_more_fixes | Mark Haines | 2016-07-27 | 2 | -9/+11 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Fix a couple of bugs in the transaction and keyring code | Mark Haines | 2016-07-26 | 2 | -9/+11 | |
| | |/ / / / | ||||||
* | / / / / | Clean up verify_json_objects_for_server | Mark Haines | 2016-07-27 | 1 | -68/+75 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #952 from matrix-org/markjh/more_fixes | Mark Haines | 2016-07-26 | 1 | -0/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Check if the user is banned when handling 3pid invites | Mark Haines | 2016-07-26 | 1 | -0/+4 | |
* | | | | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 7 | -49/+79 | |
|/ / / / | ||||||
* | | | | Fix typo | Richard van der Hoff | 2016-07-26 | 1 | -1/+1 | |
* | | | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device | Richard van der Hoff | 2016-07-26 | 2 | -55/+113 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #951 from matrix-org/rav/flake8 | Richard van der Hoff | 2016-07-26 | 1 | -5/+3 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix flake8 violation | Richard van der Hoff | 2016-07-26 | 1 | -5/+3 | |
| * | | | | | Merge pull request #948 from matrix-org/markjh/auth_fixes | Mark Haines | 2016-07-26 | 1 | -50/+110 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Fix how push_actions are redacted. | Mark Haines | 2016-07-26 | 1 | -8/+10 | |
| | * | | | | Don't add rejected events if we've seen them befrore. Add some comments to ex... | Mark Haines | 2016-07-26 | 1 | -5/+48 | |
| | * | | | | Only update the events and event_json tables for rejected events | Mark Haines | 2016-07-25 | 2 | -52/+63 | |
| | * | | | | Don't add the events to forward extremities if the event is rejected | Mark Haines | 2016-07-25 | 1 | -3/+6 | |
| | * | | | | Don't add rejections to the state_group, persist all rejections | Mark Haines | 2016-07-25 | 2 | -5/+6 | |
* | | | | | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 2 | -15/+49 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #949 from matrix-org/rav/update_devices | David Baker | 2016-07-26 | 10 | -22/+213 | |
|\ \ \ \ \ | ||||||
| * | | | | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 3 | -8/+67 | |
| * | | | | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 9 | -15/+146 | |
| * | | | | | Log when adding listeners | Richard van der Hoff | 2016-07-25 | 1 | -0/+1 | |
* | | | | | | typo | Matthew Hodgson | 2016-07-26 | 1 | -1/+1 | |
|/ / / / / |