| Commit message (Expand) | Author | Age | Files | Lines |
* | Don't backfill from self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
* | Line length | Erik Johnston | 2016-03-31 | 1 | -1/+3 |
* | Don't ignore the obey overlay if the rule has an enabled attribute of False | David Baker | 2016-03-31 | 1 | -2/+3 |
* | typo | Matthew Hodgson | 2016-03-30 | 1 | -1/+1 |
* | return the state_group for backfill | Mark Haines | 2016-03-30 | 1 | -1/+2 |
* | Add a replication stream for state groups | Mark Haines | 2016-03-30 | 3 | -8/+64 |
* | Merge pull request #674 from matrix-org/markjh/replicate_state | Mark Haines | 2016-03-30 | 4 | -50/+60 |
|\ |
|
| * | Use a stream id generator to assign state group ids | Mark Haines | 2016-03-30 | 4 | -50/+60 |
* | | Merge pull request #673 from matrix-org/erikj/forget | Erik Johnston | 2016-03-30 | 2 | -6/+54 |
|\ \ |
|
| * | | 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 branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-03-30 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Bump version and changelog | Erik Johnston | 2016-03-30 | 1 | -1/+1 |
| * | Bump version and changelog v0.14.0-rc2 github/release-v0.14.0 release-v0.14.0 | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0 | Erik Johnston | 2016-03-23 | 38 | -457/+836 |
| |\ |
|
| * | | Bump version and changelog | Erik Johnston | 2016-03-15 | 1 | -1/+1 |
* | | | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 4 | -1/+93 |
* | | | 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 |
* | | | Never notify for member events. This fixes https://github.com/vector-im/vecto... | David Baker | 2016-03-24 | 1 | -20/+21 |
| |/
|/| |
|
* | | 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 |
| |/ / |
|
* | | | 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 |
| |/ / |
|
* | | | 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 |
|/ / |
|
* | | 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 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 |
| |/ / |
|
* | | | 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 | 3 | -98/+0 |
|/ / |
|
* | | 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 |
* | | 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 |
* | | 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 |
|\ \ |
|
| * | | 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 |
| |/ |
|
| * | 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 |
* | | 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 | 5 | -18/+106 |
|/ |
|
* | 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 |
| * | Implement logout | Erik Johnston | 2016-03-11 | 3 | -14/+109 |
* | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 10 | -88/+45 |
|/ |
|
* | 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 |
* | | | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
* | | | Update users table in a batched manner | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
| |/
|/| |
|
* | | Register endpoint returns refresh_token | blide | 2016-03-10 | 1 | -5/+8 |
|/ |
|
* | 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 |
* | | 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 |
* | 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 branch 'develop' into daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 37 | -299/+802 |
|\ \ |
|
| * \ | 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 |
| | |/ |
|
| * / | 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 | 13 | -189/+477 |
| |\ \ |
|
| | * | | 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 |
| | * | | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 27 | -119/+356 |
| | |\| |
|
| | * | | 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 | 2 | -2/+32 |
| | * | | 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 |
| | | |/
| | |/| |
|
| * | | | 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 | 3 | -7/+44 |
| |\ \ |
|
| | * | | 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 remote-tracking branch 'origin/develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 17 | -90/+193 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge pull request #621 from matrix-org/daniel/ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 9 | -63/+95 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 9 | -63/+95 |
| | * | | | | | | 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 |
| * | | | | | | | Merge branch 'develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 23 | -84/+667 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| * | | | | | | | 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 | 7 | -26/+97 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Mark AS users with their AS's ID | Daniel Wagner-Hall | 2016-02-11 | 7 | -27/+98 |
* | | | | | | 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 | 4 | -3/+15 |
|\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | | |
|
| * | | | | | | 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 | 1 | -2/+2 |
| * | | | | | | 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 | 11 | -2/+583 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 11 | -2/+583 |
| |/ / / / / |
|
* | | | | | | 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 |
| | |_|/ /
| |/| | | |
|
* | | | | | 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 |
| | |\ \ \ \ |
|
| | * | | | | | Send the invier's member event in room invite state so the invitee has their ... | David Baker | 2016-02-25 | 1 | -1/+7 |
| * | | | | | | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 3 | -11/+102 |
| | |/ / / /
| |/| | | | |
|
| * | | | | | 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 |
| |/ / / / |
|
| * | | | | Make sure we return a JSON object when returning the values of specif… | Mark Haines | 2016-02-25 | 1 | -1/+3 |
| * | | | | Merge branch 'develop' into markjh/dead_code | Mark Haines | 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 |
* | | | | | 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 |
* | | | | | handlers/sync: style fix, line too long | Patrik Oldsberg | 2016-02-23 | 1 | -1/+5 |
* | | | | | Pick up currently_active across federation | Erik Johnston | 2016-02-23 | 1 | -0/+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 | 38 | -1631/+1598 |
| |\ \ \ |
|
| * | | | | Allow guest users access to messages in rooms they have joined | Richard van der Hoff | 2016-02-19 | 3 | -14/+42 |
* | | | | | Remove superfluous call to get_state_at when we already have an event for tha... | Erik Johnston | 2016-02-22 | 1 | -4/+12 |
* | | | | | 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 |
* | | | | | 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 | 2 | -6/+32 |
|\ \ \ \ |
|
| * | | | | Don't set currently_active for remote presence | Erik Johnston | 2016-02-19 | 1 | -6/+12 |
| * | | | | 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 | 22 | -1123/+1122 |
|\| | | | |
|
| * | | | | "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 | 1 | -93/+187 |
| * | | | | 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 | 15 | -1134/+931 |
| * | | | | Add wheeltimer impl | Erik Johnston | 2016-02-17 | 1 | -0/+88 |
* | | | | | 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 |
| | |_|/ /
| |/| | | |
|
* | | | | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 10 | -141/+45 |
* | | | | | 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 |
| * | | | | 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 |
| * | | | 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 |