summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #663 from matrix-org/erikj/invite_for_userErik Johnston2016-03-232-7/+5
|\ \ \ \ \ \
| * | | | | | Make get_invites return RoomsForUserErik Johnston2016-03-232-7/+5
| |/ / / / /
* | | | | | Merge pull request #665 from matrix-org/erikj/dont_cache_eventsErik Johnston2016-03-233-23/+30
|\ \ \ \ \ \
| * | | | | | Don't cache events in get_recent_events_for_roomErik Johnston2016-03-231-14/+19
| * | | | | | Don't cache events in get_current_state_for_keyErik Johnston2016-03-232-9/+11
| |/ / / / /
* | | | | | Merge pull request #662 from matrix-org/erikj/state_cacheErik Johnston2016-03-233-69/+94
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Reduce cache sizeErik Johnston2016-03-231-1/+1
| * | | | | Key StateHandler._state_cache off of state groupsErik Johnston2016-03-221-40/+21
| * | | | | Make LruCache use a dedicated _Node classErik Johnston2016-03-221-32/+41
| * | | | | Make StateHandler._state_cache only store event_ids.Erik Johnston2016-03-222-7/+42
|/ / / / /
* | | | | Measure StateHandler._resolve_eventsErik Johnston2016-03-221-38/+40
* | | | | Bump get_unread_event_push_actions_by_room_for_user cacheErik Johnston2016-03-221-1/+1
* | | | | Bump get_aliases_for_room cacheErik Johnston2016-03-221-1/+1
* | | | | Merge pull request #661 from matrix-org/markjh/member_countMark Haines2016-03-221-1/+3
|\ \ \ \ \
| * | | | | Use get_users_in_room to count the number of room members rather than using r...Mark Haines2016-03-221-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #660 from matrix-org/erikj/state_cacheErik Johnston2016-03-221-60/+48
|\ \ \ \ \
| * | | | | Don't cache events in _state_group_cacheErik Johnston2016-03-221-60/+48
* | | | | | Merge pull request #659 from matrix-org/erikj/state_cache_factorErik Johnston2016-03-221-1/+7
|\ \ \ \ \ \
| * | | | | | Make stateGroupCache honour CACHE_SIZE_FACTORErik Johnston2016-03-221-1/+7
| |/ / / / /
* | | | | | Merge pull request #657 from matrix-org/erikj/roomlistErik Johnston2016-03-224-4/+122
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Doc stringErik Johnston2016-03-221-0/+6
| * | | | | an invalide is something else...Matthew Hodgson2016-03-221-1/+1
| * | | | | Add published room list edit APIErik Johnston2016-03-214-4/+116
| |/ / / /
* | | | | Merge pull request #658 from matrix-org/markjh/cleanupMark Haines2016-03-223-44/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused backfilled parameter from persist_eventMark Haines2016-03-213-42/+19
| * | | | remove unused current_state variable from on_receive_pduMark Haines2016-03-211-2/+0
|/ / / /
* | | | Merge pull request #655 from matrix-org/erikj/edu_yieldErik Johnston2016-03-181-3/+9
|\ \ \ \
| * | | | Catch exceptions from EDU handlingErik Johnston2016-03-181-1/+6
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yieldErik Johnston2016-03-184-22/+64
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #656 from matrix-org/erikj/get_eventErik Johnston2016-03-182-15/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_eventErik Johnston2016-03-182-7/+49
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #652 from matrix-org/erikj/delete_aliasErik Johnston2016-03-182-7/+49
|\ \ \ \ \ \
| * | | | | | Check canonical alias event existsErik Johnston2016-03-171-1/+2
| * | | | | | Update aliases event after deletionErik Johnston2016-03-172-7/+48
| | * | | | | Don't assume existence of event_id in __str__Erik Johnston2016-03-181-1/+3
| | * | | | | Dedupe requested event list in _get_eventsErik Johnston2016-03-181-14/+12
| |/ / / / / |/| | | | |
| | * | | | Yield on EDU handlingErik Johnston2016-03-181-3/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_usernameDavid Baker2016-03-173-6/+38
|\ \ \ \ \
| * | | | | remove debug loggingDavid Baker2016-03-161-3/+0
| * | | | | Unused importDavid Baker2016-03-161-1/+0
| * | | | | Make registration idempotent, part 2: be idempotent if the client specifies a...David Baker2016-03-163-6/+42
| |/ / / /
* | | | | Merge pull request #651 from matrix-org/markjh/unused_IIMark Haines2016-03-174-112/+0
|\ \ \ \ \
| * | | | | Remove another unused function from presenceMark Haines2016-03-171-4/+0
| * | | | | Remove dead code left over from presence changesMark Haines2016-03-174-108/+0
|/ / / / /
* / / / / Add option to definitions.py to search for functions a function refers toMark Haines2016-03-171-1/+22
|/ / / /
* | | | Merge pull request #649 from matrix-org/dbkr/idempotent_registrationDavid Baker2016-03-164-17/+80
|\ \ \ \
| * | | | pep8David Baker2016-03-161-1/+2
| * | | | time_msec()David Baker2016-03-161-1/+1
| * | | | string with symbols is a bit too symboly.David Baker2016-03-161-1/+1
| * | | | Replace other time.time().David Baker2016-03-161-2/+1
| * | | | Use hs get_clock instead of time.time()David Baker2016-03-161-2/+2
| * | | | take extra return val from check_auth in account tooDavid Baker2016-03-161-1/+1
| * | | | Fix testsDavid Baker2016-03-161-4/+5
| * | | | pep8 & remove debug loggingDavid Baker2016-03-162-5/+6
| * | | | Make registration idempotent: if you specify the same session, make it give y...David Baker2016-03-162-13/+74
|/ / / /
* | | | Merge pull request #647 from matrix-org/markjh/pushers_streamMark Haines2016-03-168-18/+120
|\ \ \ \
| * | | | Add a comment to offer a hint to an explanation for why we have a unique cons...Mark Haines2016-03-161-0/+1
| * | | | Fix a couple of errors when deleting pushersMark Haines2016-03-151-2/+2
| * | | | Merge branch 'develop' into markjh/pushers_streamMark Haines2016-03-154-29/+53
| |\ \ \ \
| * | | | | Hook up adding a pusher to the notifier for replication.Mark Haines2016-03-152-0/+12
| * | | | | Add replication stream for pushersMark Haines2016-03-156-18/+107
* | | | | | Merge pull request #648 from matrix-org/rav/password_resetRichard van der Hoff2016-03-163-2/+59
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Clarify that we do have reset functionality via the ISRichard van der Hoff2016-03-161-21/+20
| * | | | | Password reset docs and scriptRichard van der Hoff2016-03-163-1/+59
|/ / / / /
* | | | | Merge pull request #646 from matrix-org/erikj/reject_invite_federationErik Johnston2016-03-151-1/+16
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove needless PreserveLoggingContextErik Johnston2016-03-151-5/+4
| * | | | Persist rejection of invites over federationErik Johnston2016-03-151-1/+17
|/ / / /
* | | | Merge pull request #645 from matrix-org/erikj/3pid_guest_configErik Johnston2016-03-142-25/+36
|\ \ \ \
| * | | | Add config to create guest account on 3pid inviteErik Johnston2016-03-142-25/+36
|/ / / /
* / / / Return list, not generator.Erik Johnston2016-03-141-3/+1
|/ / /
* | | Merge pull request #644 from matrix-org/markjh/parse_jsonIIIMark Haines2016-03-142-6/+19
|\ \ \
| * | | Fix regression where synapse checked whether push rules were valid JSON befor...Mark Haines2016-03-142-6/+19
|/ / /
* | | Merge pull request #642 from matrix-org/erikj/logoutErik Johnston2016-03-113-15/+113
|\ \ \
| * | | Thats not how transactions work.Erik Johnston2016-03-111-13/+16
| * | | Emtpy commitErik Johnston2016-03-110-0/+0
| * | | Implement logoutErik Johnston2016-03-113-14/+109
* | | | Merge pull request #643 from matrix-org/markjh/parse_json_IIMark Haines2016-03-1111-90/+49
|\ \ \ \ | |/ / / |/| | |
| * | | Use parse_json_object_from_request to parse JSON out of request bodiesMark Haines2016-03-1111-90/+49
|/ / /
* | | Fix SQL statementErik Johnston2016-03-111-1/+1
* | | Merge pull request #641 from matrix-org/dbkr/fix_change_passwordErik Johnston2016-03-114-30/+32
|\ \ \
| * | | more pep8David Baker2016-03-111-1/+1
| * | | Make select more sensible when dseleting access tokens, rename pusher deletio...David Baker2016-03-113-7/+5
| * | | Delete old, unused methods and rename new one to just be `user_delete_access_...David Baker2016-03-112-16/+3
| * | | Dear PyCharm, please indent sensibly for me. Thx.David Baker2016-03-112-3/+3
| * | | Fix cache invalidation so deleting access tokens (which we did when changing ...David Baker2016-03-114-17/+34
* | | | Merge pull request #640 from matrix-org/erikj/keyclient_hostErik Johnston2016-03-111-0/+3
|\ \ \ \
| * | | | Make key client send a Host headerErik Johnston2016-03-111-0/+3
* | | | | Merge pull request #635 from matrix-org/erikj/sync_orderErik Johnston2016-03-111-3/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add commentErik Johnston2016-03-091-0/+3
| * | | | Return the correct token formErik Johnston2016-03-091-1/+1
| * | | | Use topological orders for initial sync timelineErik Johnston2016-03-091-2/+2
* | | | | Merge pull request #638 from matrix-org/daniel/appserviceidDaniel Wagner-Hall2016-03-102-7/+38
|\ \ \ \ \
| * | | | | Store appservice ID on registerDaniel Wagner-Hall2016-03-102-7/+38
|/ / / / /
* | | | | Merge pull request #639 from matrix-org/erikj/as_user_update_batchErik Johnston2016-03-101-9/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update users table in a batched mannerErik Johnston2016-03-101-9/+14
|/ / / /
* | | | Merge pull request #637 from blide/developErik Johnston2016-03-102-11/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Flake8 fixblide2016-03-101-6/+6
| * | | Register endpoint returns refresh_tokenblide2016-03-102-17/+26
|/ / /
* | | Merge pull request #634 from matrix-org/erikj/pin_saml2_versionErik Johnston2016-03-091-1/+1
|\ \ \
| * | | Pin pysaml2 version to 3.xErik Johnston2016-03-091-1/+1
* | | | Merge pull request #628 from matrix-org/markjh/parse_jsonMark Haines2016-03-0911-121/+97
|\ \ \ \ | |/ / / |/| | |
| * | | Add a parse_json_object functionMark Haines2016-03-0911-121/+97
|/ / /
* | | Ensure integer is an integerErik Johnston2016-03-091-1/+1
* | | Reinstate coverage checks for integ testsRichard van der Hoff2016-03-092-2/+4
* | | Specify synapse-directory for integ testsRichard van der Hoff2016-03-092-2/+6
* | | Only build py27 tox env for integ testsRichard van der Hoff2016-03-082-2/+2
* | | Use sytest build scripts, rather than reinventing the wheelRichard van der Hoff2016-03-082-52/+7
* | | Merge pull request #632 from matrix-org/markjh/py3v2Mark Haines2016-03-0817-22/+22
|\ \ \
| * | | Fix relative imports so they work in both py3 and py27Mark Haines2016-03-0817-22/+22
* | | | Merge pull request #633 from matrix-org/daniel/ickDaniel Wagner-Hall2016-03-081-1/+5
|\ \ \ \
| * \ \ \ Merge branch 'develop' into daniel/ickDaniel Wagner-Hall2016-03-0849-336/+1061
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_paramsDavid Baker2016-03-081-2/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | pep8David Baker2016-03-081-2/+5
| * | | | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ch...David Baker2016-03-081-2/+12
* | | | | Merge pull request #631 from matrix-org/markjh/py3v1Mark Haines2016-03-088-10/+10
|\ \ \ \ \
| * | | | | Use syntax that works on both py2.7 and py3Mark Haines2016-03-078-10/+10
| |/ / / /
* | | | | Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_idDavid Baker2016-03-085-22/+27
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix testsDavid Baker2016-03-073-20/+20
| * | | | Send the user ID matching the guest access token, since there is no Matrix AP...David Baker2016-03-072-2/+7
|/ / / /
* | | | Merge pull request #626 from matrix-org/erikj/visibilityErik Johnston2016-03-071-0/+26
|\ \ \ \
| * | | | Send history visibility on boundary changesErik Johnston2016-03-041-0/+26
* | | | | Merge pull request #618 from matrix-org/markjh/pushrule_streamMark Haines2016-03-0415-193/+483
|\ \ \ \ \
| * | | | | Prefill from the correct streamMark Haines2016-03-041-1/+1
| * | | | | prefill the push rules stream change cacheMark Haines2016-03-041-2/+9
| * | | | | s/stream_ordering/event_stream_ordering/ in pushMark Haines2016-03-043-27/+31
| * | | | | /FNARG/dMark Haines2016-03-041-1/+0
| * | | | | poke jenkinsMark Haines2016-03-040-0/+0
| * | | | | Fix unit testsMark Haines2016-03-041-2/+2
| * | | | | Merge branch 'develop' into markjh/pushrule_streamMark Haines2016-03-0441-148/+641
| |\| | | |
| * | | | | Hook up the push rules stream to account_data in /syncMark Haines2016-03-044-69/+85
| * | | | | Move the code for formatting push rules into a separate functionMark Haines2016-03-032-86/+116
| * | | | | Hook up the push rules to the notifierMark Haines2016-03-035-18/+43
| * | | | | Hook push rules up to the replication APIMark Haines2016-03-023-4/+36
| * | | | | Add a stream for push rule updatesMark Haines2016-03-015-74/+251
* | | | | | Merge pull request #625 from matrix-org/erikj/kick_ban_syncErik Johnston2016-03-041-3/+9
|\ \ \ \ \ \
| * | | | | | Always include kicks and bans in full /syncErik Johnston2016-03-041-3/+9
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #624 from matrix-org/erikj/invite_profileErik Johnston2016-03-043-3/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | SpellingErik Johnston2016-03-041-1/+1
| * | | | | Add profile information to invitesErik Johnston2016-03-043-3/+17
|/ / / / /
* | | | | Merge pull request #598 from Rugvip/invite-stateErik Johnston2016-03-044-7/+45
|\ \ \ \ \
| * | | | | tests/utils: added room_invite_state_types to test configPatrik Oldsberg2016-03-041-0/+1
| * | | | | config,handlers/_base: added homeserver config for what state is included in ...Patrik Oldsberg2016-03-043-7/+44
* | | | | | Merge pull request #596 from Rugvip/createErik Johnston2016-03-041-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | handlers/_base: don't allow room create event to be changedPatrik Oldsberg2016-02-231-0/+6
* | | | | | Merge pull request #610 from Rugvip/unique-userErik Johnston2016-03-041-0/+1
|\ \ \ \ \ \
| * | | | | | handlers/register: make sure another user id is generated when a collision oc...Patrik Oldsberg2016-02-291-0/+1
* | | | | | | Merge pull request #623 from matrix-org/rav/fix_createroom_raceRichard van der Hoff2016-03-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make sure we add all invited members before returning from createRoomRichard van der Hoff2016-03-041-1/+1
* | | | | | | | Merge pull request #614 from matrix-org/erikj/alias_deleteErik Johnston2016-03-044-10/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow alias creators to delete aliasesErik Johnston2016-03-014-10/+51
* | | | | | | | | Merge pull request #615 from matrix-org/rav/SYN-642Richard van der Hoff2016-03-042-8/+42
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'develop' into rav/SYN-642Richard van der Hoff2016-03-034-4/+12
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | jenkins-*.sh: set -xRichard van der Hoff2016-03-034-4/+12
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642Richard van der Hoff2016-03-0328-112/+440
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #621 from matrix-org/daniel/ratelimitingDaniel Wagner-Hall2016-03-0313-76/+124
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-0313-76/+124
* | | | | | | | | | Merge pull request #620 from matrix-org/erikj/jenkinsErik Johnston2016-03-035-0/+195
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Split up jenkins testsErik Johnston2016-03-032-0/+43
| * | | | | | | | | | MkdirErik Johnston2016-03-031-0/+3
| * | | | | | | | | | Add jenkins-postgres.shErik Johnston2016-03-031-0/+87
| * | | | | | | | | | Change port-base in jenkins-sqlite.shErik Johnston2016-03-031-1/+1
| * | | | | | | | | | Use different PORT_BASEErik Johnston2016-03-031-1/+1
| * | | | | | | | | | Exclude all jenkins build scriptsErik Johnston2016-03-031-0/+1
| * | | | | | | | | | Add jenkins-sqlite.shErik Johnston2016-03-031-0/+61
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #619 from matrix-org/dbkr/dont_use_checkpwErik Johnston2016-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use `bcrypt.hash...David Baker2016-03-021-1/+1
| | * | | | | | | | Empty commitRichard van der Hoff2016-03-030-0/+0
| | * | | | | | | | Merge branch 'develop' into rav/SYN-642Richard van der Hoff2016-03-0330-93/+959
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix typoRichard van der Hoff2016-03-031-1/+1
| | * | | | | | | | | Move arg default to the start of the functionRichard van der Hoff2016-03-021-2/+3
| | * | | | | | | | | fix pyflakes quibbleRichard van der Hoff2016-03-021-1/+2
| | * | | | | | | | | Address review commentsRichard van der Hoff2016-03-022-8/+17
| | * | | | | | | | | Fix pyflakes warningRichard van der Hoff2016-03-011-1/+1
| | * | | | | | | | | Handle rejections of invites from local users locallyRichard van der Hoff2016-03-012-8/+31
| | | |_|/ / / / / / | | |/| | | | | | |
| | | | | | | * | | Idempotent-ise schema update scriptDaniel Wagner-Hall2016-03-081-1/+5
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge pull request #571 from matrix-org/daniel/asidsDaniel Wagner-Hall2016-03-0310-35/+120
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Mark AS users with their AS's IDDaniel Wagner-Hall2016-02-1110-36/+121
* | | | | | | | | jenkins.sh: set -xRichard van der Hoff2016-03-031-1/+3
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #616 from matrix-org/matthew/800x600Matthew Hodgson2016-03-021-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | add 800x600 thumbnails to make vector look prettier (and anyone else who like...Matthew Hodgson2016-03-021-0/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #612 from matrix-org/erikj/cache_sizeErik Johnston2016-03-027-9/+41
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Set SYNAPSE_CACHE_FACTOR=1 in jenkinsErik Johnston2016-03-021-0/+1
| * | | | | | | Add SYNAPSE_CACHE_FACTOR to READMEErik Johnston2016-03-021-1/+18
| * | | | | | | Limit stream change cache size tooErik Johnston2016-03-011-1/+5
| * | | | | | | Move cache size fiddling to descriptors only. Fix testsErik Johnston2016-03-012-7/+9
| * | | | | | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1Erik Johnston2016-03-013-2/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #489 from matrix-org/markjh/replicationMark Haines2016-03-0115-4/+846
|\ \ \ \ \ \ \
| * | | | | | | Add a /replication API for extracting the updates that happened onMark Haines2016-03-0115-4/+846
| |/ / / / / /
* | | | | | | Merge pull request #613 from matrix-org/markjh/yieldMark Haines2016-03-0112-77/+52
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Load the current id in the IdGenerator constructorMark Haines2016-03-0112-77/+52
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #611 from matrix-org/erikj/expiring_cache_sizeErik Johnston2016-03-011-2/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Reraise exceptionErik Johnston2016-03-011-0/+1
| * | | | | Correct cache miss detectionErik Johnston2016-03-011-1/+1
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_c...Erik Johnston2016-03-0111-30/+227
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_eventDavid Baker2016-02-261-1/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_e...David Baker2016-02-261-2/+4
| |\ \ \ \ \ \
| * | | | | | | Empty to commit to force re-testDavid Baker2016-02-260-0/+0
| * | | | | | | Send the invier's member event in room invite state so the invitee has their ...David Baker2016-02-251-1/+7
* | | | | | | | Merge pull request #609 from matrix-org/markjh/change_actionMark Haines2016-02-263-11/+102
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add support for changing the actions for default rulesMark Haines2016-02-263-11/+102
|/ / / / / / /
* | | | | | | Merge pull request #608 from gergelypolonkai/syn-638David Baker2016-02-261-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix to appease the PEP8 dragonGergely Polonkai2016-02-261-1/+3
| * | | | | | Add error codes for malformed/bad JSON in /loginGergely Polonkai2016-02-261-2/+2
|/ / / / / /
* | | | | | Merge pull request #606 from matrix-org/markjh/get_enabledMark Haines2016-02-251-1/+3
|\ \ \ \ \ \
| * | | | | | Make sure we return a JSON object when returning the values of specif…Mark Haines2016-02-251-1/+3
|/ / / / / /
* | | | | | Merge pull request #605 from matrix-org/markjh/dead_codeMark Haines2016-02-241-8/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into markjh/dead_codeMark Haines2016-02-244-0/+91
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #604 from matrix-org/daniel/guestaccesstokenDaniel Wagner-Hall2016-02-244-0/+91
|\ \ \ \ \ \ \
| * | | | | | | Generate guest access token on 3pid invitesDaniel Wagner-Hall2016-02-244-0/+91
|/ / / / / / /
| * / / / / / Remove unused get_rule_attr methodMark Haines2016-02-241-8/+0
|/ / / / / /
* | | | | | Ignore invalid POST bodies when joining roomsDaniel Wagner-Hall2016-02-241-2/+12
* | | | | | Merge pull request #603 from matrix-org/erikj/presenceErik Johnston2016-02-231-6/+9
|\ \ \ \ \ \
| * | | | | | Create a new stream_id per presence updateErik Johnston2016-02-231-6/+9
| | * | | | | Report size of ExpiringCacheErik Johnston2016-02-231-2/+13
| |/ / / / / |/| | | | |
* | | | | | Check presence token interval is less than 100, rather than the token itselfErik Johnston2016-02-231-4/+4
* | | | | | Merge pull request #602 from matrix-org/erikj/presenceErik Johnston2016-02-232-19/+61
|\| | | | |
| * | | | | Handle get_all_entities_changed returning NoneErik Johnston2016-02-231-0/+3
| * | | | | Add commentsErik Johnston2016-02-231-0/+4
| * | | | | Change the way we figure out presence updates for small deltasErik Johnston2016-02-232-17/+52
* | | | | | Set WORKSPACE if not setDaniel Wagner-Hall2016-02-231-0/+2
* | | | | | Merge pull request #584 from matrix-org/daniel/ephemeralthreepidsDaniel Wagner-Hall2016-02-237-54/+196
|\ \ \ \ \ \
| * | | | | | Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-237-54/+196
|/ / / / / /
* | | | | | Merge pull request #600 from matrix-org/erikj/presenceErik Johnston2016-02-231-26/+30
|\| | | | |
| * | | | | Don't include defer.returnValue in Measure blockErik Johnston2016-02-231-9/+12
| * | | | | Measure PresenceEventSource.get_new_eventsErik Johnston2016-02-231-34/+35
* | | | | | Merge pull request #601 from Rugvip/pep8Daniel Wagner-Hall2016-02-231-1/+5
|\ \ \ \ \ \
| * | | | | | handlers/sync: style fix, line too longPatrik Oldsberg2016-02-231-1/+5
|/ / / / / /
* | | | | | Merge pull request #595 from matrix-org/markjh/coverageMark Haines2016-02-231-0/+21
|\ \ \ \ \ \
| * | | | | | Check that the disable_registration config key is handled correctlyMark Haines2016-02-221-0/+21
* | | | | | | Pick up currently_active across federationErik Johnston2016-02-231-0/+1
* | | | | | | Merge pull request #597 from Rugvip/account-data-syncErik Johnston2016-02-231-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | handlers/sync: fix SyncResult not counting account_data change when convertin...Patrik Oldsberg2016-02-231-1/+1
|/ / / / / /
* | | | | | Merge pull request #587 from matrix-org/rav/guest_access_after_room_joinRichard van der Hoff2016-02-223-16/+41
|\ \ \ \ \ \
| * | | | | | address review commentsRichard van der Hoff2016-02-221-7/+2
| * | | | | | Interpret unknown visibilities the same as sharedRichard van der Hoff2016-02-191-11/+13
| * | | | | | Merge branch 'develop' into rav/guest_access_after_room_joinRichard van der Hoff2016-02-1946-3610/+1937
| |\ \ \ \ \ \
| * | | | | | | Allow guest users access to messages in rooms they have joinedRichard van der Hoff2016-02-193-14/+42
* | | | | | | | Merge pull request #594 from matrix-org/markjh/coverageMark Haines2016-02-222-0/+9
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Add a test for TreeCache.__contains__Mark Haines2016-02-222-0/+9
* | | | | | | | Merge pull request #591 from matrix-org/markjh/coverageMark Haines2016-02-221-0/+18
|\| | | | | | | | |_|_|/ / / / |/| | | | | |
| * | | | | | Test Filter.filter_roomsMark Haines2016-02-191-0/+18
* | | | | | | Remove superfluous call to get_state_at when we already have an event for tha...Erik Johnston2016-02-221-4/+12
* | | | | | | Merge pull request #589 from matrix-org/erikj/presenceErik Johnston2016-02-221-2/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Correctly filter statesErik Johnston2016-02-191-2/+2
| * | | | | | Only send presence updates to remote hosts if user is oursErik Johnston2016-02-191-2/+10
* | | | | | | Merge pull request #590 from matrix-org/markjh/formattingMark Haines2016-02-1939-364/+359
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix flake8 warnings for testsMark Haines2016-02-1939-364/+359
|/ / / / / /
* | / / / / Add Measures to presenceErik Johnston2016-02-191-57/+62
| |/ / / / |/| | | |
* | | | | Add presence metricErik Johnston2016-02-191-0/+3
* | | | | Remove spurious extra metricsErik Johnston2016-02-191-1/+0
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-22 13:14:02 +0000