| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | | | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 15 | -4/+846 |
| |/ / / / / / |
|
* | | | | | | | Merge pull request #613 from matrix-org/markjh/yield | Mark Haines | 2016-03-01 | 12 | -77/+52 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Load the current id in the IdGenerator constructor | Mark Haines | 2016-03-01 | 12 | -77/+52 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge pull request #611 from matrix-org/erikj/expiring_cache_size | Erik Johnston | 2016-03-01 | 1 | -2/+14 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Reraise exception | Erik Johnston | 2016-03-01 | 1 | -0/+1 |
| * | | | | | Correct cache miss detection | Erik Johnston | 2016-03-01 | 1 | -1/+1 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_c... | Erik Johnston | 2016-03-01 | 11 | -30/+227 |
| |\ \ \ \ \
| |/ / / / /
|/| | | | | |
|
* | | | | | | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event | David Baker | 2016-02-26 | 1 | -1/+7 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_e... | David Baker | 2016-02-26 | 1 | -2/+4 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Empty to commit to force re-test | David Baker | 2016-02-26 | 0 | -0/+0 |
| * | | | | | | | Send the invier's member event in room invite state so the invitee has their ... | David Baker | 2016-02-25 | 1 | -1/+7 |
* | | | | | | | | Merge pull request #609 from matrix-org/markjh/change_action | Mark Haines | 2016-02-26 | 3 | -11/+102 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 3 | -11/+102 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #608 from gergelypolonkai/syn-638 | David Baker | 2016-02-26 | 1 | -2/+4 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Fix to appease the PEP8 dragon | Gergely Polonkai | 2016-02-26 | 1 | -1/+3 |
| * | | | | | | Add error codes for malformed/bad JSON in /login | Gergely Polonkai | 2016-02-26 | 1 | -2/+2 |
|/ / / / / / |
|
* | | | | | | Merge pull request #606 from matrix-org/markjh/get_enabled | Mark Haines | 2016-02-25 | 1 | -1/+3 |
|\ \ \ \ \ \ |
|
| * | | | | | | Make sure we return a JSON object when returning the values of specif… | Mark Haines | 2016-02-25 | 1 | -1/+3 |
|/ / / / / / |
|
* | | | | | | Merge pull request #605 from matrix-org/markjh/dead_code | Mark Haines | 2016-02-24 | 1 | -8/+0 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'develop' into markjh/dead_code | Mark Haines | 2016-02-24 | 4 | -0/+91 |
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #604 from matrix-org/daniel/guestaccesstoken | Daniel Wagner-Hall | 2016-02-24 | 4 | -0/+91 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Generate guest access token on 3pid invites | Daniel Wagner-Hall | 2016-02-24 | 4 | -0/+91 |
|/ / / / / / / |
|
| * / / / / / | Remove unused get_rule_attr method | Mark Haines | 2016-02-24 | 1 | -8/+0 |
|/ / / / / / |
|
* | | | | | | Ignore invalid POST bodies when joining rooms | Daniel Wagner-Hall | 2016-02-24 | 1 | -2/+12 |
* | | | | | | Merge pull request #603 from matrix-org/erikj/presence | Erik Johnston | 2016-02-23 | 1 | -6/+9 |
|\ \ \ \ \ \ |
|
| * | | | | | | Create a new stream_id per presence update | Erik Johnston | 2016-02-23 | 1 | -6/+9 |
| | * | | | | | Report size of ExpiringCache | Erik Johnston | 2016-02-23 | 1 | -2/+13 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Check presence token interval is less than 100, rather than the token itself | Erik Johnston | 2016-02-23 | 1 | -4/+4 |
* | | | | | | Merge pull request #602 from matrix-org/erikj/presence | Erik Johnston | 2016-02-23 | 2 | -19/+61 |
|\| | | | | |
|
| * | | | | | Handle get_all_entities_changed returning None | Erik Johnston | 2016-02-23 | 1 | -0/+3 |
| * | | | | | Add comments | Erik Johnston | 2016-02-23 | 1 | -0/+4 |
| * | | | | | Change the way we figure out presence updates for small deltas | Erik Johnston | 2016-02-23 | 2 | -17/+52 |
* | | | | | | Set WORKSPACE if not set | Daniel Wagner-Hall | 2016-02-23 | 1 | -0/+2 |
* | | | | | | Merge pull request #584 from matrix-org/daniel/ephemeralthreepids | Daniel Wagner-Hall | 2016-02-23 | 7 | -54/+196 |
|\ \ \ \ \ \ |
|
| * | | | | | | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 7 | -54/+196 |
|/ / / / / / |
|
* | | | | | | Merge pull request #600 from matrix-org/erikj/presence | Erik Johnston | 2016-02-23 | 1 | -26/+30 |
|\| | | | | |
|
| * | | | | | Don't include defer.returnValue in Measure block | Erik Johnston | 2016-02-23 | 1 | -9/+12 |
| * | | | | | Measure PresenceEventSource.get_new_events | Erik Johnston | 2016-02-23 | 1 | -34/+35 |
* | | | | | | Merge pull request #601 from Rugvip/pep8 | Daniel Wagner-Hall | 2016-02-23 | 1 | -1/+5 |
|\ \ \ \ \ \ |
|
| * | | | | | | handlers/sync: style fix, line too long | Patrik Oldsberg | 2016-02-23 | 1 | -1/+5 |
|/ / / / / / |
|
* | | | | | | Merge pull request #595 from matrix-org/markjh/coverage | Mark Haines | 2016-02-23 | 1 | -0/+21 |
|\ \ \ \ \ \ |
|
| * | | | | | | Check that the disable_registration config key is handled correctly | Mark Haines | 2016-02-22 | 1 | -0/+21 |
* | | | | | | | Pick up currently_active across federation | Erik Johnston | 2016-02-23 | 1 | -0/+1 |
* | | | | | | | Merge pull request #597 from Rugvip/account-data-sync | Erik Johnston | 2016-02-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | | |
|
| * | | | | | | handlers/sync: fix SyncResult not counting account_data change when convertin... | Patrik Oldsberg | 2016-02-23 | 1 | -1/+1 |
|/ / / / / / |
|
* | | | | | | Merge pull request #587 from matrix-org/rav/guest_access_after_room_join | Richard van der Hoff | 2016-02-22 | 3 | -16/+41 |
|\ \ \ \ \ \ |
|
| * | | | | | | address review comments | Richard van der Hoff | 2016-02-22 | 1 | -7/+2 |
| * | | | | | | Interpret unknown visibilities the same as shared | Richard van der Hoff | 2016-02-19 | 1 | -11/+13 |
| * | | | | | | Merge branch 'develop' into rav/guest_access_after_room_join | Richard van der Hoff | 2016-02-19 | 46 | -3610/+1937 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Allow guest users access to messages in rooms they have joined | Richard van der Hoff | 2016-02-19 | 3 | -14/+42 |
* | | | | | | | | Merge pull request #594 from matrix-org/markjh/coverage | Mark Haines | 2016-02-22 | 2 | -0/+9 |
|\ \ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| * | | | | | | | Add a test for TreeCache.__contains__ | Mark Haines | 2016-02-22 | 2 | -0/+9 |
* | | | | | | | | Merge pull request #591 from matrix-org/markjh/coverage | Mark Haines | 2016-02-22 | 1 | -0/+18 |
|\| | | | | | |
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | Test Filter.filter_rooms | Mark Haines | 2016-02-19 | 1 | -0/+18 |
* | | | | | | | Remove superfluous call to get_state_at when we already have an event for tha... | Erik Johnston | 2016-02-22 | 1 | -4/+12 |
* | | | | | | | Merge pull request #589 from matrix-org/erikj/presence | Erik Johnston | 2016-02-22 | 1 | -2/+10 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Correctly filter states | Erik Johnston | 2016-02-19 | 1 | -2/+2 |
| * | | | | | | Only send presence updates to remote hosts if user is ours | Erik Johnston | 2016-02-19 | 1 | -2/+10 |
* | | | | | | | Merge pull request #590 from matrix-org/markjh/formatting | Mark Haines | 2016-02-19 | 39 | -364/+359 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Fix flake8 warnings for tests | Mark Haines | 2016-02-19 | 39 | -364/+359 |
|/ / / / / / |
|
* | / / / / | Add Measures to presence | Erik Johnston | 2016-02-19 | 1 | -57/+62 |
| |/ / / /
|/| | | | |
|
* | | | | | Add presence metric | Erik Johnston | 2016-02-19 | 1 | -0/+3 |
* | | | | | Remove spurious extra metrics | Erik Johnston | 2016-02-19 | 1 | -1/+0 |
* | | | | | Merge pull request #586 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 3 | -10/+47 |
|\ \ \ \ \ |
|
| * | | | | | Don't set currently_active for remote presence | Erik Johnston | 2016-02-19 | 2 | -10/+27 |
| * | | | | | More metrics | Erik Johnston | 2016-02-19 | 1 | -0/+6 |
| * | | | | | Add presence metrics | Erik Johnston | 2016-02-19 | 2 | -0/+14 |
* | | | | | | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 30 | -3102/+1450 |
|\| | | | | |
|
| * | | | | | "You are not..." | Erik Johnston | 2016-02-18 | 1 | -1/+1 |
| * | | | | | Close cursor | Erik Johnston | 2016-02-18 | 1 | -0/+1 |
| * | | | | | Remove unused param from get_max_token | Erik Johnston | 2016-02-18 | 6 | -13/+11 |
| * | | | | | WheelTimer: Don't scan list, use index. | Erik Johnston | 2016-02-18 | 1 | -5/+8 |
| * | | | | | Remove invalid arg. | Erik Johnston | 2016-02-18 | 1 | -1/+0 |
| * | | | | | Add unit test | Erik Johnston | 2016-02-18 | 2 | -93/+560 |
| * | | | | | Remove old tests. | Erik Johnston | 2016-02-18 | 6 | -2098/+0 |
| * | | | | | Add stuff pulled from the DB to the cache | Erik Johnston | 2016-02-18 | 1 | -2/+4 |
| * | | | | | PEP8 | Erik Johnston | 2016-02-18 | 1 | -2/+2 |
| * | | | | | Prefix TS fields with _ts | Erik Johnston | 2016-02-18 | 4 | -43/+44 |
| * | | | | | Remove status_msg when going offline. Don't offline -> online if you send a m... | Erik Johnston | 2016-02-18 | 1 | -5/+15 |
| * | | | | | Check presence state is a valid one | Erik Johnston | 2016-02-18 | 2 | -1/+6 |
| * | | | | | Move if statement | Erik Johnston | 2016-02-18 | 1 | -8/+8 |
| * | | | | | Comment | Erik Johnston | 2016-02-18 | 1 | -0/+2 |
| * | | | | | Remove spurious comment | Erik Johnston | 2016-02-17 | 1 | -1/+0 |
| * | | | | | Initial cut | Erik Johnston | 2016-02-17 | 16 | -1136/+933 |
| * | | | | | Add wheeltimer impl | Erik Johnston | 2016-02-17 | 2 | -0/+162 |
* | | | | | | Merge pull request #573 from matrix-org/erikj/sync_fix | Erik Johnston | 2016-02-18 | 1 | -5/+12 |
|\ \ \ \ \ \ |
|
| * | | | | | | Mitigate against incorrect old state in /sync. | Erik Johnston | 2016-02-12 | 1 | -5/+12 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge pull request #579 from matrix-org/markjh/dead_code | Mark Haines | 2016-02-18 | 10 | -141/+45 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 10 | -141/+45 |
|/ / / / / / |
|
* | | | | | | Merge pull request #583 from matrix-org/daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-18 | 9 | -364/+393 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | Review comments | Daniel Wagner-Hall | 2016-02-18 | 3 | -7/+7 |
| * | | | | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 4 | -85/+92 |
| |\ \ \ \ \
| |/ / / / /
|/| | | | | |
|
* | | | | | | Merge pull request #580 from Rugvip/develop | Erik Johnston | 2016-02-17 | 1 | -1/+4 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | api/filtering: don't assume that event content will always be a dict | Patrik Oldsberg | 2016-02-17 | 1 | -1/+4 |
* | | | | | | Merge pull request #581 from Rugvip/event_id | Erik Johnston | 2016-02-17 | 1 | -2/+2 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | client/v1/room: include event_id in response to state event PUT, in accordanc... | Patrik Oldsberg | 2016-02-17 | 1 | -2/+2 |
|/ / / / / |
|
* | | | | | Fix typo in request validation for adding push rules. | Mark Haines | 2016-02-16 | 1 | -1/+1 |
* | | | | | Merge pull request #578 from matrix-org/markjh/idempotent_rules | Mark Haines | 2016-02-16 | 1 | -82/+86 |
|\ \ \ \ \ |
|
| * | | | | | Make adding push rules idempotent | Mark Haines | 2016-02-16 | 1 | -82/+86 |
|/ / / / / |
|
| * | | | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 2 | -69/+61 |
| * | | | | Respond to federated invite with non-empty context | Daniel Wagner-Hall | 2016-02-17 | 3 | -46/+65 |
| * | | | | Some cleanup, some TODOs, more to do | Daniel Wagner-Hall | 2016-02-16 | 1 | -68/+60 |
| * | | | | Some cleanup | Daniel Wagner-Hall | 2016-02-16 | 2 | -23/+30 |
| * | | | | Tidy? up room creation event sending | Daniel Wagner-Hall | 2016-02-16 | 1 | -63/+72 |
| * | | | | Add comment | Daniel Wagner-Hall | 2016-02-16 | 1 | -1/+1 |
| * | | | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-16 | 1 | -3/+3 |
| |\ \ \ \
| |/ / / /
|/| | | | |
|
* | | | | | Merge pull request #577 from matrix-org/daniel/createroom | Daniel Wagner-Hall | 2016-02-16 | 2 | -55/+31 |
|\ \ \ \ \ |
|
| * | | | | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 2 | -55/+31 |
|/ / / / / |
|
| * | | | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 5 | -74/+99 |
| * | | | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 2 | -52/+28 |
| * | | | | Use update_membership for profile updates | Daniel Wagner-Hall | 2016-02-15 | 2 | -20/+12 |
| * | | | | Use update_membership to kick guests | Daniel Wagner-Hall | 2016-02-15 | 2 | -16/+19 |
| * | | | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 2 | -19/+14 |
| * | | | | Inline _do_local_membership_update | Daniel Wagner-Hall | 2016-02-15 | 1 | -18/+7 |
| * | | | | Inline _do_join as it now only has one caller | Daniel Wagner-Hall | 2016-02-15 | 1 | -48/+47 |
| * | | | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 5 | -70/+71 |
| * | | | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 2 | -5/+11 |
|/ / / / |
|
* | | | | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 5 | -73/+69 |
* | | | | Merge pull request #575 from matrix-org/daniel/roomcleanup | Daniel Wagner-Hall | 2016-02-12 | 5 | -69/+73 |
|\ \ \ \ |
|
| * | | | | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 5 | -69/+73 |
|/ / / / |
|
* | | | | Merge pull request #574 from matrix-org/markjh/connection_closed | Mark Haines | 2016-02-12 | 5 | -11/+33 |
|\ \ \ \ |
|
| * | | | | Catch the exceptions thrown by twisted when you write to a closed connection | Mark Haines | 2016-02-12 | 5 | -11/+33 |
|/ / / / |
|
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-02-12 | 2 | -1/+12 |
|\| | | |
|
| * | | | Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse v0.13.3 | Erik Johnston | 2016-02-11 | 3 | -2/+7 |
| |\ \ \ |
|
| | * | | | Bump version and changelog | Erik Johnston | 2016-02-11 | 2 | -1/+6 |
| | * | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-02-11 | 2 | -1/+7 |
| | |\ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse v0.13.2 | Erik Johnston | 2016-02-11 | 5 | -9/+29 |
| |\ \ \ \ |
|
| | * | | | | Bump version and changelog | Erik Johnston | 2016-02-11 | 2 | -1/+7 |
* | | | | | | Merge pull request #572 from matrix-org/daniel/exclusivity | Daniel Wagner-Hall | 2016-02-11 | 1 | -5/+12 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | Enforce user_id exclusivity for AS registrations | Daniel Wagner-Hall | 2016-02-11 | 1 | -5/+12 |
|/ / / / / |
|
* | / / / | Fix SYN-627, events are in incorrect room in /sync | Erik Johnston | 2016-02-11 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | Merge pull request #570 from matrix-org/erikj/events_fixes | Erik Johnston | 2016-02-11 | 2 | -8/+12 |
|\ \ \ \ |
|
| * | | | | Return events in correct order for /events | Erik Johnston | 2016-02-11 | 2 | -8/+12 |
|/ / / / |
|
* | / / | Add some paranoia logging | Erik Johnston | 2016-02-11 | 1 | -0/+10 |
| |/ /
|/| | |
|
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-02-10 | 3 | -2/+9 |
|\| | |
|
| * | | 0.13.1 v0.13.1 | Matthew Hodgson | 2016-02-10 | 1 | -1/+1 |
| * | | bump for 0.13.1 | Matthew Hodgson | 2016-02-10 | 1 | -0/+7 |
| * | | Merge branch 'master' of git+ssh://github.com/matrix-org/synapse | Matthew Hodgson | 2016-02-10 | 339 | -3968/+5722 |
| |\ \ |
|
| | * \ | Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse v0.13.0 | Erik Johnston | 2016-02-10 | 339 | -3968/+5714 |
| | |\ \
| |_|/ /
|/| | | |
|
* | | | | Update CHANGES | Erik Johnston | 2016-02-10 | 1 | -2/+4 |
* | | | | Bump version and changelog | Erik Johnston | 2016-02-10 | 2 | -1/+23 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0 | Erik Johnston | 2016-02-10 | 91 | -1106/+1801 |
|\ \ \ \ |
|
| * \ \ \ | Merge pull request #569 from matrix-org/erikj/initial_sync | Erik Johnston | 2016-02-10 | 2 | -72/+73 |
| |\ \ \ \ |
|
| | * | | | | Batch fetch _get_state_groups_from_groups | Erik Johnston | 2016-02-10 | 1 | -32/+34 |
| | * | | | | Use _simple_select_many for _get_state_group_for_events | Erik Johnston | 2016-02-10 | 2 | -17/+11 |
| | * | | | | Only calculate initial sync for 10 rooms at a time | Erik Johnston | 2016-02-10 | 1 | -24/+29 |
| |/ / / / |
|
| * | | | | Merge pull request #566 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-10 | 2 | -25/+14 |
| |\ \ \ \ |
|
| | * | | | | Remove comment | Erik Johnston | 2016-02-10 | 1 | -1/+1 |
| | * | | | | s/parent_context/previous_context/ | Erik Johnston | 2016-02-10 | 1 | -9/+9 |
| | * | | | | Set parent context on instansiation | Erik Johnston | 2016-02-10 | 1 | -2/+7 |
| | * | | | | Fix test | Erik Johnston | 2016-02-09 | 1 | -9/+1 |
| | * | | | | Don't bother copying records on parent context | Erik Johnston | 2016-02-09 | 1 | -8/+0 |
| * | | | | | Merge pull request #568 from matrix-org/erikj/unread_notif | Erik Johnston | 2016-02-10 | 7 | -89/+66 |
| |\ \ \ \ \ |
|
| | * | | | | | Rename functions | Erik Johnston | 2016-02-10 | 2 | -4/+4 |
| | * | | | | | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 6 | -65/+49 |
| | * | | | | | Pass in current state to push action handler | Erik Johnston | 2016-02-09 | 3 | -27/+20 |
| * | | | | | | Merge pull request #532 from floviolleau/floviolleau/documentation | Erik Johnston | 2016-02-10 | 2 | -1/+25 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Update documentation | Florent VIOLLEAU | 2016-01-27 | 2 | -1/+25 |
| * | | | | | | | Merge pull request #565 from matrix-org/erikj/macaroon_config | Erik Johnston | 2016-02-09 | 3 | -19/+34 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Typo | Erik Johnston | 2016-02-09 | 1 | -1/+1 |
| | * | | | | | | | Fix test | Erik Johnston | 2016-02-09 | 1 | -3/+4 |
| | * | | | | | | | Derive macaroon_secret_key from signing key. | Erik Johnston | 2016-02-08 | 2 | -16/+30 |
| * | | | | | | | | Change a log from debug to info | Erik Johnston | 2016-02-09 | 1 | -1/+1 |
| | |_|/ / / / /
| |/| | | | | | |
|
| * | | | | | | | Remove dead code | Erik Johnston | 2016-02-09 | 1 | -12/+0 |
| * | | | | | | | Invalidate get_last_receipt_event_id_for_user cache | Erik Johnston | 2016-02-09 | 1 | -0/+5 |
| * | | | | | | | Merge pull request #567 from matrix-org/erikj/sync_ephemeral | Erik Johnston | 2016-02-09 | 2 | -14/+20 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Don't load all ephemeral state for a room on every sync | Erik Johnston | 2016-02-09 | 2 | -14/+20 |
| |/ / / / / / / |
|
| * | | | | | | | Fix unit tests | Erik Johnston | 2016-02-09 | 2 | -5/+9 |
| * | | | | | | | Merge pull request #560 from matrix-org/daniel/tox | Daniel Wagner-Hall | 2016-02-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Remove pyc files before running tests | Daniel Wagner-Hall | 2016-02-09 | 1 | -1/+1 |
| |/ / / / / / / |
|
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-02-09 | 3 | -6/+6 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Revert "Reject additional path segments" | Daniel Wagner-Hall | 2016-02-09 | 3 | -6/+6 |
| | | |_|/ / / /
| | |/| | | | | |
|
| * | | | | | | | Measure some /sync related things | Erik Johnston | 2016-02-09 | 2 | -150/+162 |
| * | | | | | | | Revert to putting it around the entire block | Erik Johnston | 2016-02-09 | 1 | -124/+124 |
| * | | | | | | | Don't create new logging context | Erik Johnston | 2016-02-09 | 1 | -12/+15 |
| |/ / / / / / |
|
| * | | | | | | Fix bug in util.metrics.Measure | Erik Johnston | 2016-02-09 | 1 | -1/+3 |
| * | | | | | | Create new context when measuring | Erik Johnston | 2016-02-09 | 1 | -2/+5 |
| * | | | | | | Don't measure across event stream call, as it lasts for a long time. | Erik Johnston | 2016-02-09 | 1 | -124/+124 |
| * | | | | | | Change logcontext warns to debug | Erik Johnston | 2016-02-09 | 1 | -3/+3 |
| |/ / / / / |
|
| * | | | | | Merge pull request #564 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-08 | 31 | -229/+356 |
| |\ \ \ \ \ |
|
| | * | | | | | Fix up logcontexts | Erik Johnston | 2016-02-08 | 31 | -229/+356 |
| * | | | | | | Merge pull request #562 from matrix-org/erikj/push_metric | Erik Johnston | 2016-02-08 | 3 | -31/+149 |
| |\| | | | | |
|
| | * | | | | | Add metrics to pushers | Erik Johnston | 2016-02-08 | 3 | -31/+149 |
| * | | | | | | Merge pull request #563 from matrix-org/daniel/dollarz | Daniel Wagner-Hall | 2016-02-08 | 3 | -6/+6 |
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| | * | | | | | Reject additional path segments | Daniel Wagner-Hall | 2016-02-08 | 3 | -6/+6 |
| |/ / / / / |
|
| * | | | | | Report the v1 and v2 patterns separately | Mark Haines | 2016-02-05 | 1 | -4/+12 |
| * | | | | | List the URL patterns in synapse | Mark Haines | 2016-02-05 | 1 | -0/+54 |
| * | | | | | Merge pull request #550 from matrix-org/daniel/guestnames | Daniel Wagner-Hall | 2016-02-05 | 2 | -19/+72 |
| |\ \ \ \ \ |
|
| | * | | | | | Allocate guest user IDs numericcally | Daniel Wagner-Hall | 2016-02-05 | 2 | -19/+72 |
| |/ / / / / |
|
| * | | | | | Merge pull request #559 from matrix-org/daniel/media | Daniel Wagner-Hall | 2016-02-05 | 2 | -3/+6 |
| |\ \ \ \ \ |
|
| | * | | | | | Host /media/r0 as well as /media/v1 | Daniel Wagner-Hall | 2016-02-05 | 2 | -3/+6 |
| |/ / / / / |
|
| * | | | | | Merge pull request #558 from matrix-org/daniel/config | Daniel Wagner-Hall | 2016-02-05 | 7 | -23/+198 |
| |\ \ \ \ \ |
|
| | * | | | | | Error if macaroon key is missing from config | Daniel Wagner-Hall | 2016-02-05 | 7 | -23/+198 |
| |/ / / / / |
|
| * | | | | | Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null | David Baker | 2016-02-04 | 1 | -6/+17 |
| |\ \ \ \ \ |
|
| | * | | | | | No braces here | David Baker | 2016-02-03 | 1 | -1/+1 |
| | * | | | | | Don't return null if profile display name / avatar url isn't set: omit them i... | David Baker | 2016-02-03 | 1 | -6/+17 |
| * | | | | | | Actually return something sensible | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| * | | | | | | Remove old log line | Erik Johnston | 2016-02-03 | 1 | -2/+0 |
| * | | | | | | We return dicts now. | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| * | | | | | | Add descriptions | Erik Johnston | 2016-02-03 | 4 | -1/+5 |
| * | | | | | | Preserve log context over when deferring to thread pool in media repo | Erik Johnston | 2016-02-03 | 1 | -4/+7 |
| * | | | | | | Merge pull request #555 from matrix-org/erikj/logcontext | Erik Johnston | 2016-02-03 | 3 | -16/+42 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Allowing tagging log contexts | Erik Johnston | 2016-02-03 | 3 | -16/+42 |
| * | | | | | | | Merge pull request #554 from matrix-org/erikj/event_push | Erik Johnston | 2016-02-03 | 5 | -21/+67 |
| |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| | * | | | | | | Change event_push_actions_rm_tokens schema | Erik Johnston | 2016-02-03 | 5 | -21/+67 |
| | |/ / / / / |
|
| * | | | | | | Merge pull request #556 from matrix-org/daniel/config | Daniel Wagner-Hall | 2016-02-03 | 6 | -10/+10 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 6 | -10/+10 |
| * | | | | | | | Merge pull request #552 from matrix-org/erikj/public_room_fix | Erik Johnston | 2016-02-03 | 5 | -136/+88 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | Simplify get_rooms | Erik Johnston | 2016-02-03 | 3 | -105/+9 |
| | * | | | | | | PEP8 | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | * | | | | | | Remove unused method | Erik Johnston | 2016-02-03 | 1 | -8/+0 |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_roo... | Erik Johnston | 2016-02-03 | 36 | -238/+216 |
| | |\| | | | | |
|
| | * | | | | | | Unused import | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | * | | | | | | Change the way we do public room list fetching | Erik Johnston | 2016-02-02 | 3 | -24/+80 |
| * | | | | | | | Add macaroon inspection script | Daniel Wagner-Hall | 2016-02-03 | 1 | -0/+24 |
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Merge pull request #553 from matrix-org/daniel/accesstokenlogging | Daniel Wagner-Hall | 2016-02-02 | 1 | -0/+2 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Log more diagnostics for unrecognised access tokens | Daniel Wagner-Hall | 2016-02-02 | 1 | -0/+2 |
| |/ / / / / / |
|
| * | | | | | | Explain what W503 is | Daniel Wagner-Hall | 2016-02-02 | 1 | -1/+1 |
| * | | | | | | Merge pull request #551 from matrix-org/daniel/flake8 | Daniel Wagner-Hall | 2016-02-02 | 34 | -66/+73 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 34 | -66/+73 |
| |/ / / / / / |
|
| * | | | | | | Merge pull request #549 from matrix-org/erikj/sync | Erik Johnston | 2016-02-02 | 3 | -29/+32 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | s/get_room_changes_for_user/get_membership_changes_for_user/ | Erik Johnston | 2016-02-02 | 3 | -4/+4 |
| | * | | | | | | Fetch events in a separate transaction. | Erik Johnston | 2016-02-02 | 1 | -26/+29 |
| |/ / / / / / |
|
| * | | | | | | Merge pull request #545 from matrix-org/erikj/sync | Erik Johnston | 2016-02-02 | 2 | -141/+99 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Comments | Erik Johnston | 2016-02-01 | 1 | -5/+6 |
| | * | | | | | | Move state calculations from rest to handler | Erik Johnston | 2016-02-01 | 2 | -141/+98 |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-02-01 | 1 | -5/+0 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-02-01 | 1 | -6/+3 |
| | |\ \ \ \ \ \ \ |
|
| * | \ \ \ \ \ \ \ | Merge pull request #548 from matrix-org/dbkr/fix_guest_db_column | David Baker | 2016-02-02 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Pass make_guest whne we autogen a user ID | David Baker | 2016-02-02 | 1 | -1/+3 |
| |/ / / / / / / / / |
|
| * | | | | | | | | | WARN if we get a topo token instead of stream. | Erik Johnston | 2016-02-02 | 1 | -1/+6 |
| * | | | | | | | | | Merge pull request #547 from matrix-org/dbkr/fix_guest_upgrade | David Baker | 2016-02-02 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \
| | |_|_|_|/ / / / /
| |/| | | | | | | | |
|
| | * | | | | | | | | Pull guest access token out of the auth session params, otherwise it will bre... | David Baker | 2016-02-01 | 1 | -0/+1 |
| | | |_|/ / / / /
| | |/| | | | | | |
|
| * | | | | | | | | Merge pull request #546 from matrix-org/erikj/events | Erik Johnston | 2016-02-01 | 2 | -7/+26 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|
| | * | | | | | | | Order things correctly | Erik Johnston | 2016-02-01 | 2 | -1/+5 |
| | * | | | | | | | Switch over /events to use per room caches | Erik Johnston | 2016-02-01 | 2 | -7/+22 |
| |/ / / / / / / |
|
| * | | | | | | | Merge pull request #543 from matrix-org/erikj/sync | Erik Johnston | 2016-02-01 | 3 | -0/+15 |
| |\| | | | | | |
|
| | * | | | | | | Cache get_room_changes_for_user | Erik Johnston | 2016-01-29 | 3 | -0/+15 |
| * | | | | | | | Merge pull request #544 from matrix-org/erikj/stream_rooms | Erik Johnston | 2016-02-01 | 1 | -5/+0 |
| |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| | * | | | | | | Only use room_ids if in get_room_events_stream if is_guest | Erik Johnston | 2016-02-01 | 1 | -5/+0 |
| |/ / / / / / |
|
| * | | | | | | Don't use before_token. Its wrong. Use actual limit. | Erik Johnston | 2016-01-31 | 1 | -6/+3 |
| * | | | | | | Merge pull request #542 from matrix-org/erikj/cache_fix | Erik Johnston | 2016-01-29 | 2 | -8/+7 |
| |\| | | | | |
|
| | * | | | | | Invalidate _account_data_stream_cache correctly | Erik Johnston | 2016-01-29 | 1 | -0/+4 |
| | * | | | | | If stream pos is greater then earliest known key and entity hasn't changed, t... | Erik Johnston | 2016-01-29 | 1 | -8/+3 |
| |/ / / / / |
|
| * | | | | | Merge pull request #540 from matrix-org/erikj/sync | Erik Johnston | 2016-01-29 | 4 | -19/+56 |
| |\ \ \ \ \ |
|
| | * | | | | | Comment. Remove superfluous order by | Erik Johnston | 2016-01-29 | 1 | -1/+3 |
| | * | | | | | Don't prefill account data | Erik Johnston | 2016-01-29 | 1 | -8/+1 |
| | * | | | | | Actually use cache | Erik Johnston | 2016-01-29 | 1 | -7/+13 |
| | * | | | | | Max is not a function | Erik Johnston | 2016-01-29 | 1 | -1/+1 |
| | * | | | | | Convert param style | Erik Johnston | 2016-01-29 | 1 | -0/+3 |