| Commit message (Expand) | Author | Age | Files | Lines |
* | Only forget room if you were in the room | Erik Johnston | 2016-03-30 | 1 | -1/+2 |
* | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
* | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 2 | -6/+54 |
* | Merge pull request #671 from nikriek/jwt-support | Erik Johnston | 2016-03-29 | 4 | -1/+93 |
|\ |
|
| * | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 4 | -1/+93 |
|/ |
|
* | Merge pull request #668 from matrix-org/markjh/deduplicate | Mark Haines | 2016-03-24 | 4 | -2/+75 |
|\ |
|
| * | Fix typo | Mark Haines | 2016-03-24 | 1 | -1/+1 |
| * | Add a response cache for getting the public room list | Mark Haines | 2016-03-24 | 1 | -1/+11 |
| * | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 3 | -1/+64 |
|/ |
|
* | Merge pull request #667 from matrix-org/dbkr/never_notify_member_events | David Baker | 2016-03-24 | 1 | -20/+21 |
|\ |
|
| * | Never notify for member events. This fixes https://github.com/vector-im/vecto... | David Baker | 2016-03-24 | 1 | -20/+21 |
|/ |
|
* | Merge pull request #666 from matrix-org/erikj/intern | Erik Johnston | 2016-03-23 | 8 | -31/+100 |
|\ |
|
| * | Simplify intern_dict | Erik Johnston | 2016-03-23 | 1 | -17/+10 |
| * | Don't bother interning keys that are already interned | Erik Johnston | 2016-03-23 | 1 | -3/+1 |
| * | Intern all the things | Erik Johnston | 2016-03-23 | 8 | -45/+97 |
| * | Intern sender, event_id and room_id in events | Erik Johnston | 2016-03-23 | 1 | -0/+5 |
| * | Intern type and state_key on events | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
| * | String intern | Erik Johnston | 2016-03-23 | 2 | -3/+17 |
|/ |
|
* | Merge pull request #664 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-03-23 | 2 | -18/+51 |
|\ |
|
| * | Comment about weird SQL | Erik Johnston | 2016-03-23 | 1 | -1/+3 |
| * | SQLite and postgres doesn't share a true literal | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| * | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 2 | -4/+26 |
| * | Ensure published rooms have public join rules | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
| * | Comment | Erik Johnston | 2016-03-23 | 1 | -0/+3 |
| * | Don't require alias in public room list. | Erik Johnston | 2016-03-23 | 1 | -14/+13 |
* | | Merge pull request #663 from matrix-org/erikj/invite_for_user | Erik Johnston | 2016-03-23 | 2 | -7/+5 |
|\ \ |
|
| * | | Make get_invites return RoomsForUser | Erik Johnston | 2016-03-23 | 2 | -7/+5 |
| |/ |
|
* | | Merge pull request #665 from matrix-org/erikj/dont_cache_events | Erik Johnston | 2016-03-23 | 3 | -23/+30 |
|\ \ |
|
| * | | Don't cache events in get_recent_events_for_room | Erik Johnston | 2016-03-23 | 1 | -14/+19 |
| * | | Don't cache events in get_current_state_for_key | Erik Johnston | 2016-03-23 | 2 | -9/+11 |
| |/ |
|
* | | Merge pull request #662 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-23 | 3 | -69/+94 |
|\ \
| |/
|/| |
|
| * | Reduce cache size | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| * | Key StateHandler._state_cache off of state groups | Erik Johnston | 2016-03-22 | 1 | -40/+21 |
| * | Make LruCache use a dedicated _Node class | Erik Johnston | 2016-03-22 | 1 | -32/+41 |
| * | Make StateHandler._state_cache only store event_ids. | Erik Johnston | 2016-03-22 | 2 | -7/+42 |
|/ |
|
* | Measure StateHandler._resolve_events | Erik Johnston | 2016-03-22 | 1 | -38/+40 |
* | Bump get_unread_event_push_actions_by_room_for_user cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
* | Bump get_aliases_for_room cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
* | Merge pull request #661 from matrix-org/markjh/member_count | Mark Haines | 2016-03-22 | 1 | -1/+3 |
|\ |
|
| * | Use get_users_in_room to count the number of room members rather than using r... | Mark Haines | 2016-03-22 | 1 | -1/+3 |
* | | Merge pull request #660 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
|\ \ |
|
| * | | Don't cache events in _state_group_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
* | | | Merge pull request #659 from matrix-org/erikj/state_cache_factor | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
|\ \ \ |
|
| * | | | Make stateGroupCache honour CACHE_SIZE_FACTOR | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
| |/ / |
|
* | | | Merge pull request #657 from matrix-org/erikj/roomlist | Erik Johnston | 2016-03-22 | 4 | -4/+122 |
|\ \ \
| |/ /
|/| | |
|
| * | | Doc string | Erik Johnston | 2016-03-22 | 1 | -0/+6 |
| * | | an invalide is something else... | Matthew Hodgson | 2016-03-22 | 1 | -1/+1 |
| * | | Add published room list edit API | Erik Johnston | 2016-03-21 | 4 | -4/+116 |
| |/ |
|
* | | Merge pull request #658 from matrix-org/markjh/cleanup | Mark Haines | 2016-03-22 | 3 | -44/+19 |
|\ \
| |/
|/| |
|
| * | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 3 | -42/+19 |
| * | remove unused current_state variable from on_receive_pdu | Mark Haines | 2016-03-21 | 1 | -2/+0 |
|/ |
|
* | Merge pull request #655 from matrix-org/erikj/edu_yield | Erik Johnston | 2016-03-18 | 1 | -3/+9 |
|\ |
|
| * | Catch exceptions from EDU handling | Erik Johnston | 2016-03-18 | 1 | -1/+6 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yield | Erik Johnston | 2016-03-18 | 4 | -22/+64 |
| |\
| |/
|/| |
|
* | | Merge pull request #656 from matrix-org/erikj/get_event | Erik Johnston | 2016-03-18 | 2 | -15/+15 |
|\ \ |
|
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event | Erik Johnston | 2016-03-18 | 2 | -7/+49 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 2 | -7/+49 |
|\ \ \ |
|
| * | | | Check canonical alias event exists | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| * | | | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 2 | -7/+48 |
| | * | | Don't assume existence of event_id in __str__ | Erik Johnston | 2016-03-18 | 1 | -1/+3 |
| | * | | Dedupe requested event list in _get_events | Erik Johnston | 2016-03-18 | 1 | -14/+12 |
| |/ /
|/| | |
|
| | * | Yield on EDU handling | Erik Johnston | 2016-03-18 | 1 | -3/+4 |
| |/
|/| |
|
* | | Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username | David Baker | 2016-03-17 | 3 | -6/+38 |
|\ \ |
|
| * | | remove debug logging | David Baker | 2016-03-16 | 1 | -3/+0 |
| * | | Unused import | David Baker | 2016-03-16 | 1 | -1/+0 |
| * | | Make registration idempotent, part 2: be idempotent if the client specifies a... | David Baker | 2016-03-16 | 3 | -6/+42 |
| |/ |
|
* | | Merge pull request #651 from matrix-org/markjh/unused_II | Mark Haines | 2016-03-17 | 4 | -112/+0 |
|\ \ |
|
| * | | Remove another unused function from presence | Mark Haines | 2016-03-17 | 1 | -4/+0 |
| * | | Remove dead code left over from presence changes | Mark Haines | 2016-03-17 | 4 | -108/+0 |
|/ / |
|
* / | Add option to definitions.py to search for functions a function refers to | Mark Haines | 2016-03-17 | 1 | -1/+22 |
|/ |
|
* | Merge pull request #649 from matrix-org/dbkr/idempotent_registration | David Baker | 2016-03-16 | 4 | -17/+80 |
|\ |
|
| * | pep8 | David Baker | 2016-03-16 | 1 | -1/+2 |
| * | time_msec() | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | string with symbols is a bit too symboly. | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | Replace other time.time(). | David Baker | 2016-03-16 | 1 | -2/+1 |
| * | Use hs get_clock instead of time.time() | David Baker | 2016-03-16 | 1 | -2/+2 |
| * | take extra return val from check_auth in account too | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | Fix tests | David Baker | 2016-03-16 | 1 | -4/+5 |
| * | pep8 & remove debug logging | David Baker | 2016-03-16 | 2 | -5/+6 |
| * | Make registration idempotent: if you specify the same session, make it give y... | David Baker | 2016-03-16 | 2 | -13/+74 |
|/ |
|
* | Merge pull request #647 from matrix-org/markjh/pushers_stream | Mark Haines | 2016-03-16 | 8 | -18/+120 |
|\ |
|
| * | Add a comment to offer a hint to an explanation for why we have a unique cons... | Mark Haines | 2016-03-16 | 1 | -0/+1 |
| * | Fix a couple of errors when deleting pushers | Mark Haines | 2016-03-15 | 1 | -2/+2 |
| * | Merge branch 'develop' into markjh/pushers_stream | Mark Haines | 2016-03-15 | 4 | -29/+53 |
| |\ |
|
| * | | Hook up adding a pusher to the notifier for replication. | Mark Haines | 2016-03-15 | 2 | -0/+12 |
| * | | Add replication stream for pushers | Mark Haines | 2016-03-15 | 6 | -18/+107 |
* | | | Merge pull request #648 from matrix-org/rav/password_reset | Richard van der Hoff | 2016-03-16 | 3 | -2/+59 |
|\ \ \
| |_|/
|/| | |
|
| * | | Clarify that we do have reset functionality via the IS | Richard van der Hoff | 2016-03-16 | 1 | -21/+20 |
| * | | Password reset docs and script | Richard van der Hoff | 2016-03-16 | 3 | -1/+59 |
|/ / |
|
* | | Merge pull request #646 from matrix-org/erikj/reject_invite_federation | Erik Johnston | 2016-03-15 | 1 | -1/+16 |
|\ \ |
|
| * | | Remove needless PreserveLoggingContext | Erik Johnston | 2016-03-15 | 1 | -5/+4 |
| * | | Persist rejection of invites over federation | Erik Johnston | 2016-03-15 | 1 | -1/+17 |
|/ / |
|
* | | Merge pull request #645 from matrix-org/erikj/3pid_guest_config | Erik Johnston | 2016-03-14 | 2 | -25/+36 |
|\ \ |
|
| * | | Add config to create guest account on 3pid invite | Erik Johnston | 2016-03-14 | 2 | -25/+36 |
|/ / |
|
* / | Return list, not generator. | Erik Johnston | 2016-03-14 | 1 | -3/+1 |
|/ |
|
* | Merge pull request #644 from matrix-org/markjh/parse_jsonIII | Mark Haines | 2016-03-14 | 2 | -6/+19 |
|\ |
|
| * | Fix regression where synapse checked whether push rules were valid JSON befor... | Mark Haines | 2016-03-14 | 2 | -6/+19 |
|/ |
|
* | Merge pull request #642 from matrix-org/erikj/logout | Erik Johnston | 2016-03-11 | 3 | -15/+113 |
|\ |
|
| * | Thats not how transactions work. | Erik Johnston | 2016-03-11 | 1 | -13/+16 |
| * | Emtpy commit | Erik Johnston | 2016-03-11 | 0 | -0/+0 |
| * | Implement logout | Erik Johnston | 2016-03-11 | 3 | -14/+109 |
* | | Merge pull request #643 from matrix-org/markjh/parse_json_II | Mark Haines | 2016-03-11 | 11 | -90/+49 |
|\ \
| |/
|/| |
|
| * | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 11 | -90/+49 |
|/ |
|
* | Fix SQL statement | Erik Johnston | 2016-03-11 | 1 | -1/+1 |
* | Merge pull request #641 from matrix-org/dbkr/fix_change_password | Erik Johnston | 2016-03-11 | 4 | -30/+32 |
|\ |
|
| * | more pep8 | David Baker | 2016-03-11 | 1 | -1/+1 |
| * | Make select more sensible when dseleting access tokens, rename pusher deletio... | David Baker | 2016-03-11 | 3 | -7/+5 |
| * | Delete old, unused methods and rename new one to just be `user_delete_access_... | David Baker | 2016-03-11 | 2 | -16/+3 |
| * | Dear PyCharm, please indent sensibly for me. Thx. | David Baker | 2016-03-11 | 2 | -3/+3 |
| * | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 4 | -17/+34 |
* | | Merge pull request #640 from matrix-org/erikj/keyclient_host | Erik Johnston | 2016-03-11 | 1 | -0/+3 |
|\ \ |
|
| * | | Make key client send a Host header | Erik Johnston | 2016-03-11 | 1 | -0/+3 |
* | | | Merge pull request #635 from matrix-org/erikj/sync_order | Erik Johnston | 2016-03-11 | 1 | -3/+6 |
|\ \ \
| |_|/
|/| | |
|
| * | | Add comment | Erik Johnston | 2016-03-09 | 1 | -0/+3 |
| * | | Return the correct token form | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| * | | Use topological orders for initial sync timeline | Erik Johnston | 2016-03-09 | 1 | -2/+2 |
* | | | Merge pull request #638 from matrix-org/daniel/appserviceid | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
|\ \ \ |
|
| * | | | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
|/ / / |
|
* | | | Merge pull request #639 from matrix-org/erikj/as_user_update_batch | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|\ \ \
| |_|/
|/| | |
|
| * | | Update users table in a batched manner | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|/ / |
|
* | | Merge pull request #637 from blide/develop | Erik Johnston | 2016-03-10 | 2 | -11/+20 |
|\ \
| |/
|/| |
|
| * | Flake8 fix | blide | 2016-03-10 | 1 | -6/+6 |
| * | Register endpoint returns refresh_token | blide | 2016-03-10 | 2 | -17/+26 |
|/ |
|
* | 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 |