| Commit message (Expand) | Author | Age | Files | Lines |
* | Use topological orders for initial sync timeline | Erik Johnston | 2016-03-09 | 1 | -2/+2 |
* | Merge pull request #634 from matrix-org/erikj/pin_saml2_version | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
|\ |
|
| * | Pin pysaml2 version to 3.x | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
* | | Merge pull request #628 from matrix-org/markjh/parse_json | Mark Haines | 2016-03-09 | 11 | -121/+97 |
|\ \
| |/
|/| |
|
| * | Add a parse_json_object function | Mark Haines | 2016-03-09 | 11 | -121/+97 |
|/ |
|
* | Ensure integer is an integer | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
* | Reinstate coverage checks for integ tests | Richard van der Hoff | 2016-03-09 | 2 | -2/+4 |
* | Specify synapse-directory for integ tests | Richard van der Hoff | 2016-03-09 | 2 | -2/+6 |
* | Only build py27 tox env for integ tests | Richard van der Hoff | 2016-03-08 | 2 | -2/+2 |
* | Use sytest build scripts, rather than reinventing the wheel | Richard van der Hoff | 2016-03-08 | 2 | -52/+7 |
* | Merge pull request #632 from matrix-org/markjh/py3v2 | Mark Haines | 2016-03-08 | 17 | -22/+22 |
|\ |
|
| * | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 17 | -22/+22 |
* | | Merge pull request #633 from matrix-org/daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 1 | -1/+5 |
|\ \ |
|
| * \ | Merge branch 'develop' into daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 49 | -336/+1061 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params | David Baker | 2016-03-08 | 1 | -2/+15 |
|\ \ \
| |_|/
|/| | |
|
| * | | pep8 | David Baker | 2016-03-08 | 1 | -2/+5 |
| * | | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ch... | David Baker | 2016-03-08 | 1 | -2/+12 |
* | | | Merge pull request #631 from matrix-org/markjh/py3v1 | Mark Haines | 2016-03-08 | 8 | -10/+10 |
|\ \ \ |
|
| * | | | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 8 | -10/+10 |
| |/ / |
|
* | | | Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id | David Baker | 2016-03-08 | 5 | -22/+27 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix tests | David Baker | 2016-03-07 | 3 | -20/+20 |
| * | | Send the user ID matching the guest access token, since there is no Matrix AP... | David Baker | 2016-03-07 | 2 | -2/+7 |
|/ / |
|
* | | Merge pull request #626 from matrix-org/erikj/visibility | Erik Johnston | 2016-03-07 | 1 | -0/+26 |
|\ \ |
|
| * | | Send history visibility on boundary changes | Erik Johnston | 2016-03-04 | 1 | -0/+26 |
* | | | Merge pull request #618 from matrix-org/markjh/pushrule_stream | Mark Haines | 2016-03-04 | 15 | -193/+483 |
|\ \ \ |
|
| * | | | Prefill from the correct stream | Mark Haines | 2016-03-04 | 1 | -1/+1 |
| * | | | prefill the push rules stream change cache | Mark Haines | 2016-03-04 | 1 | -2/+9 |
| * | | | s/stream_ordering/event_stream_ordering/ in push | Mark Haines | 2016-03-04 | 3 | -27/+31 |
| * | | | /FNARG/d | Mark Haines | 2016-03-04 | 1 | -1/+0 |
| * | | | poke jenkins | Mark Haines | 2016-03-04 | 0 | -0/+0 |
| * | | | Fix unit tests | Mark Haines | 2016-03-04 | 1 | -2/+2 |
| * | | | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 41 | -148/+641 |
| |\| | |
|
| * | | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 4 | -69/+85 |
| * | | | Move the code for formatting push rules into a separate function | Mark Haines | 2016-03-03 | 2 | -86/+116 |
| * | | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 5 | -18/+43 |
| * | | | Hook push rules up to the replication API | Mark Haines | 2016-03-02 | 3 | -4/+36 |
| * | | | Add a stream for push rule updates | Mark Haines | 2016-03-01 | 5 | -74/+251 |
* | | | | Merge pull request #625 from matrix-org/erikj/kick_ban_sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
|\ \ \ \ |
|
| * | | | | Always include kicks and bans in full /sync | Erik Johnston | 2016-03-04 | 1 | -3/+9 |
| | |/ /
| |/| | |
|
* | | | | Merge pull request #624 from matrix-org/erikj/invite_profile | Erik Johnston | 2016-03-04 | 3 | -3/+17 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Spelling | Erik Johnston | 2016-03-04 | 1 | -1/+1 |
| * | | | Add profile information to invites | Erik Johnston | 2016-03-04 | 3 | -3/+17 |
|/ / / |
|
* | | | Merge pull request #598 from Rugvip/invite-state | Erik Johnston | 2016-03-04 | 4 | -7/+45 |
|\ \ \ |
|
| * | | | tests/utils: added room_invite_state_types to test config | Patrik Oldsberg | 2016-03-04 | 1 | -0/+1 |
| * | | | config,handlers/_base: added homeserver config for what state is included in ... | Patrik Oldsberg | 2016-03-04 | 3 | -7/+44 |
* | | | | Merge pull request #596 from Rugvip/create | Erik Johnston | 2016-03-04 | 1 | -0/+6 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | handlers/_base: don't allow room create event to be changed | Patrik Oldsberg | 2016-02-23 | 1 | -0/+6 |
* | | | | Merge pull request #610 from Rugvip/unique-user | Erik Johnston | 2016-03-04 | 1 | -0/+1 |
|\ \ \ \ |
|
| * | | | | handlers/register: make sure another user id is generated when a collision oc... | Patrik Oldsberg | 2016-02-29 | 1 | -0/+1 |
* | | | | | Merge pull request #623 from matrix-org/rav/fix_createroom_race | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Make sure we add all invited members before returning from createRoom | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
* | | | | | | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 4 | -10/+51 |
|\ \ \ \ \ \ |
|
| * | | | | | | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 4 | -10/+51 |
* | | | | | | | Merge pull request #615 from matrix-org/rav/SYN-642 | Richard van der Hoff | 2016-03-04 | 2 | -8/+42 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | Merge branch 'develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 4 | -4/+12 |
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | jenkins-*.sh: set -x | Richard van der Hoff | 2016-03-03 | 4 | -4/+12 |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 28 | -112/+440 |
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #621 from matrix-org/daniel/ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 13 | -76/+124 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 13 | -76/+124 |
* | | | | | | | | Merge pull request #620 from matrix-org/erikj/jenkins | Erik Johnston | 2016-03-03 | 5 | -0/+195 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Split up jenkins tests | Erik Johnston | 2016-03-03 | 2 | -0/+43 |
| * | | | | | | | | Mkdir | Erik Johnston | 2016-03-03 | 1 | -0/+3 |
| * | | | | | | | | Add jenkins-postgres.sh | Erik Johnston | 2016-03-03 | 1 | -0/+87 |
| * | | | | | | | | Change port-base in jenkins-sqlite.sh | Erik Johnston | 2016-03-03 | 1 | -1/+1 |
| * | | | | | | | | Use different PORT_BASE | Erik Johnston | 2016-03-03 | 1 | -1/+1 |
| * | | | | | | | | Exclude all jenkins build scripts | Erik Johnston | 2016-03-03 | 1 | -0/+1 |
| * | | | | | | | | Add jenkins-sqlite.sh | Erik Johnston | 2016-03-03 | 1 | -0/+61 |
|/ / / / / / / / |
|
* | | | | | | | | Merge pull request #619 from matrix-org/dbkr/dont_use_checkpw | Erik Johnston | 2016-03-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use `bcrypt.hash... | David Baker | 2016-03-02 | 1 | -1/+1 |
| | * | | | | | | Empty commit | Richard van der Hoff | 2016-03-03 | 0 | -0/+0 |
| | * | | | | | | Merge branch 'develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 30 | -93/+959 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | Fix typo | Richard van der Hoff | 2016-03-03 | 1 | -1/+1 |
| | * | | | | | | | Move arg default to the start of the function | Richard van der Hoff | 2016-03-02 | 1 | -2/+3 |
| | * | | | | | | | fix pyflakes quibble | Richard van der Hoff | 2016-03-02 | 1 | -1/+2 |
| | * | | | | | | | Address review comments | Richard van der Hoff | 2016-03-02 | 2 | -8/+17 |
| | * | | | | | | | Fix pyflakes warning | Richard van der Hoff | 2016-03-01 | 1 | -1/+1 |
| | * | | | | | | | Handle rejections of invites from local users locally | Richard van der Hoff | 2016-03-01 | 2 | -8/+31 |
| | | |_|/ / / /
| | |/| | | | | |
|
| | | | | | | * | Idempotent-ise schema update script | Daniel Wagner-Hall | 2016-03-08 | 1 | -1/+5 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | Merge pull request #571 from matrix-org/daniel/asids | Daniel Wagner-Hall | 2016-03-03 | 10 | -35/+120 |
|\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | Mark AS users with their AS's ID | Daniel Wagner-Hall | 2016-02-11 | 10 | -36/+121 |
* | | | | | | | jenkins.sh: set -x | Richard van der Hoff | 2016-03-03 | 1 | -1/+3 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Merge pull request #616 from matrix-org/matthew/800x600 | Matthew Hodgson | 2016-03-02 | 1 | -0/+3 |
|\ \ \ \ \ \ |
|
| * | | | | | | add 800x600 thumbnails to make vector look prettier (and anyone else who like... | Matthew Hodgson | 2016-03-02 | 1 | -0/+3 |
* | | | | | | | Merge pull request #612 from matrix-org/erikj/cache_size | Erik Johnston | 2016-03-02 | 7 | -9/+41 |
|\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | | |
|
| * | | | | | | Set SYNAPSE_CACHE_FACTOR=1 in jenkins | Erik Johnston | 2016-03-02 | 1 | -0/+1 |
| * | | | | | | Add SYNAPSE_CACHE_FACTOR to README | Erik Johnston | 2016-03-02 | 1 | -1/+18 |
| * | | | | | | Limit stream change cache size too | Erik Johnston | 2016-03-01 | 1 | -1/+5 |
| * | | | | | | Move cache size fiddling to descriptors only. Fix tests | Erik Johnston | 2016-03-01 | 2 | -7/+9 |
| * | | | | | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1 | Erik Johnston | 2016-03-01 | 3 | -2/+10 |
| | |_|_|/ /
| |/| | | | |
|
* | | | | | | Merge pull request #489 from matrix-org/markjh/replication | Mark Haines | 2016-03-01 | 15 | -4/+846 |
|\ \ \ \ \ \ |
|
| * | | | | | | 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 |