summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #677 from matrix-org/erikj/dns_cacheErik Johnston2016-04-082-19/+56
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cacheErik Johnston2016-04-0760-1250/+2294
| |\
| * | TestsErik Johnston2016-04-061-2/+29
| * | Allow clock to be passed in to funcErik Johnston2016-03-311-3/+3
| * | Read from DNS cache if within TTLErik Johnston2016-03-312-17/+27
* | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_dataErik Johnston2016-04-081-15/+0
|\ \ \
| * | | changed_presencelike_data isn't observed anywhere in synapse so can be removedMark Haines2016-04-081-15/+0
* | | | Remove some unused functions (#711)Mark Haines2016-04-0815-485/+4
* | | | Merge pull request #710 from matrix-org/markjh/move_fireMark Haines2016-04-085-39/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Move all the wrapper functions for distributor.fireMark Haines2016-04-085-39/+24
|/ / /
* | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_dataMark Haines2016-04-082-37/+1
|\ \ \
| * | | Call profile handler get_displayname directly rather than using collect_prese...Mark Haines2016-04-072-37/+1
* | | | Merge pull request #701 from DoubleMalt/ldap-authErik Johnston2016-04-074-10/+134
|\ \ \ \
| * | | | Add myself to AUTHORS.rstChristoph Witzany2016-04-071-0/+3
| * | | | fix check for failed authenticationChristoph Witzany2016-04-061-2/+4
| * | | | remove lineChristoph Witzany2016-04-061-1/+0
| * | | | make tests for ldap more specific to not be fooled by MocksChristoph Witzany2016-04-061-3/+3
| * | | | output ldap version for info and to pacify pep8Christoph Witzany2016-04-061-0/+2
| * | | | conditionally import ldapChristoph Witzany2016-04-062-3/+5
| * | | | fix pep8Christoph Witzany2016-04-061-2/+1
| * | | | fix exception handlingChristoph Witzany2016-04-061-2/+2
| * | | | code styleChristoph Witzany2016-04-061-6/+13
| * | | | cleanupChristoph Witzany2016-04-061-5/+0
| * | | | add tls property and twist my head around twistedChristoph Witzany2016-04-061-15/+29
| * | | | add tls propertyChristoph Witzany2016-04-061-6/+10
| * | | | move LDAP authentication to AuthenticationHandlerChristoph Witzany2016-04-062-61/+48
| * | | | Introduce LDAP authenticationChristoph Witzany2016-04-064-1/+111
* | | | | Merge pull request #706 from matrix-org/markjh/slaveIVMark Haines2016-04-074-5/+54
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add tests for redactionsMark Haines2016-04-074-5/+54
|/ / / /
* | | | Merge pull request #704 from matrix-org/markh/slaveIIIMark Haines2016-04-072-1/+95
|\ \ \ \
| * | | | Add sensible __eq__ operators inside the tests.Mark Haines2016-04-072-10/+28
| * | | | Add tests for get_latest_event_ids_in_room and get_current_stateMark Haines2016-04-073-0/+76
| | |_|/ | |/| |
* | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joinsErik Johnston2016-04-074-2/+125
|\ \ \ \ | |/ / / |/| | |
| * | | Rename thingsErik Johnston2016-04-071-5/+5
| * | | Log contexts and squash things togetherErik Johnston2016-04-071-17/+15
| * | | Add commentErik Johnston2016-04-071-0/+8
| * | | Deduplicate joinsErik Johnston2016-04-074-1/+118
* | | | Merge pull request #703 from matrix-org/erikj/memberErik Johnston2016-04-071-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Set profile information when joining rooms remotelyErik Johnston2016-04-071-0/+5
|/ / /
* | | Merge pull request #699 from matrix-org/rav/show_own_leave_eventRichard van der Hoff2016-04-061-11/+40
|\ \ \ | |/ / |/| |
| * | Let users see their own leave eventsRichard van der Hoff2016-04-061-11/+40
* | | Merge pull request #702 from matrix-org/markjh/slaveIIMark Haines2016-04-062-11/+67
|\ \ \
| * | | Test that room membership is replicatedMark Haines2016-04-062-11/+67
|/ / /
* | | Merge pull request #697 from matrix-org/markjh/slaveIMark Haines2016-04-0610-2/+485
|\ \ \ | |/ / |/| |
| * | Add a slaved events store classMark Haines2016-04-0610-2/+485
* | | Merge pull request #698 from matrix-org/erikj/port_script_fixErik Johnston2016-04-0613-86/+69
|\ \ \ | |/ / |/| |
| * | Don't require config to create databaseErik Johnston2016-04-0613-86/+69
* | | Merge pull request #694 from matrix-org/markjh/cachesMark Haines2016-04-062-33/+34
|\ \ \
| * | | Move _get_cache_dict into the SQLBaseStoreMark Haines2016-04-062-33/+34
| |/ /
* | | Merge pull request #695 from matrix-org/markjh/cachesIIMark Haines2016-04-064-26/+29
|\ \ \ | |/ / |/| |
| * | Make the cache objects be per instance rather than being globalMark Haines2016-04-064-26/+29
|/ /
* | Merge pull request #692 from matrix-org/markjh/replicate_reshuffleMark Haines2016-04-051-44/+55
|\ \
| * | Separate generating the replication response...Mark Haines2016-04-051-44/+55
* | | Merge pull request #693 from matrix-org/erikj/backfill_selfErik Johnston2016-04-051-1/+4
|\ \ \
| * | | Don't backfill from selfErik Johnston2016-04-051-1/+4
* | | | Merge pull request #691 from matrix-org/erikj/memberErik Johnston2016-04-054-16/+58
|\ \ \ \
| * | | | Fix stuck invitesErik Johnston2016-04-054-16/+58
* | | | | Merge pull request #690 from matrix-org/erikj/memberErik Johnston2016-04-055-32/+155
|\| | | | | |_|/ / |/| | |
| * | | Docs and indentsErik Johnston2016-04-043-14/+31
| * | | Add upgrade path, rename tableErik Johnston2016-04-042-6/+20
| * | | Store invites in a separate table.Erik Johnston2016-04-045-32/+124
* | | | Merge pull request #689 from matrix-org/erikj/memberErik Johnston2016-04-046-154/+192
|\| | |
| * | | Use computed prev event idsErik Johnston2016-04-014-13/+41
| * | | Remove state hack from _create_new_client_eventErik Johnston2016-04-011-43/+0
| * | | Do checks for memberships before creating eventsErik Johnston2016-04-013-98/+151
* | | | Merge pull request #686 from matrix-org/markjh/doc_stringsMark Haines2016-04-0114-169/+242
|\ \ \ \ | |/ / / |/| | |
| * | | Use google style doc strings.Mark Haines2016-04-0114-169/+242
* | | | Merge pull request #684 from matrix-org/markjh/backfill_id_genMark Haines2016-04-0111-61/+71
|\ \ \ \
| * | | | Assert that the step != 0Mark Haines2016-04-011-0/+1
| * | | | use google style doc stringsMark Haines2016-04-011-11/+12
| * | | | Rename direction to step, apply checks consistentlyMark Haines2016-04-012-16/+16
| * | | | Use a stream id generator for backfilled idsMark Haines2016-04-0111-61/+69
| |/ / /
* | | | Merge pull request #685 from matrix-org/erikj/sync_leaveErik Johnston2016-04-014-72/+85
|\ \ \ \
| * | | | CommentErik Johnston2016-04-011-1/+1
| * | | | Add concurrently_execute functionErik Johnston2016-04-014-75/+82
| * | | | Filter rooms list before chunkingErik Johnston2016-04-011-6/+12
|/ / / /
* | | | Merge pull request #682 from matrix-org/markjh/fix_invalidateMark Haines2016-04-011-1/+1
|\ \ \ \
| * | | | Fix the invalidation of the names and aliases cacheMark Haines2016-04-011-1/+1
| |/ / /
* | | | Merge pull request #681 from matrix-org/markjh/remove_outlierMark Haines2016-03-313-11/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Remove outlier parameter from compute_event_contextMark Haines2016-03-313-11/+7
|/ / /
* | | Merge pull request #680 from matrix-org/markjh/remove_is_new_stateMark Haines2016-03-313-56/+57
|\ \ \
| * | | Move the check for backfilled outside the for loopMark Haines2016-03-311-5/+5
| * | | Remove the is_new_state argument to persist event.Mark Haines2016-03-313-56/+57
* | | | Merge pull request #679 from matrix-org/erikj/memberErik Johnston2016-03-313-603/+651
|\ \ \ \ | |/ / / |/| | |
| * | | Split out RoomMemberHandlerErik Johnston2016-03-313-603/+651
| |/ /
* | | Merge pull request #676 from matrix-org/markjh/replicate_stateIIIMark Haines2016-03-313-5/+128
|\ \ \ | |/ / |/| |
| * | Use a namedtuple rather than tuple unpackingMark Haines2016-03-312-12/+15
| * | Add replication streams for ex outliers and current state resetsMark Haines2016-03-303-2/+113
| * | Add a entry to current_state_resets table when the current state is resetMark Haines2016-03-301-0/+9
* | | Line lengthErik Johnston2016-03-311-1/+3
* | | Merge pull request #678 from matrix-org/dbkr/push_obey_enableDavid Baker2016-03-311-2/+3
|\ \ \ | |_|/ |/| |
| * | Don't ignore the obey overlay if the rule has an enabled attribute of FalseDavid Baker2016-03-311-2/+3
|/ /
* | spell out more packagesMatthew Hodgson2016-03-301-8/+21
* | typoMatthew Hodgson2016-03-301-1/+1
* | Merge pull request #675 from matrix-org/markjh/replicate_stateIIMark Haines2016-03-304-12/+93
|\ \
| * | return the state_group for backfillMark Haines2016-03-301-1/+2
| |/
| * Add a replication stream for state groupsMark Haines2016-03-304-11/+91
|/
* Merge pull request #674 from matrix-org/markjh/replicate_stateMark Haines2016-03-304-50/+60
|\
| * Use a stream id generator to assign state group idsMark Haines2016-03-304-50/+60
* | Merge pull request #673 from matrix-org/erikj/forgetErik Johnston2016-03-302-6/+54
|\ \
| * | Only forget room if you were in the roomErik Johnston2016-03-301-1/+2
| * | Remove spurious commentErik Johnston2016-03-301-1/+0
| * | Require user to have left room to forget roomErik Johnston2016-03-302-6/+54
| |/
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-03-303-3/+71
|\ \ | |/ |/|
| * Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse v0.14.0Erik Johnston2016-03-30180-5320/+6403
| |\
| | * Bump version and changelogErik Johnston2016-03-302-1/+6
| | * Bump version and changelog v0.14.0-rc2 github/release-v0.14.0 release-v0.14.0Erik Johnston2016-03-232-1/+22
| | * Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0Erik Johnston2016-03-2345-474/+923
| | |\
| | * | English v0.14.0-rc1Erik Johnston2016-03-151-1/+1
| | * | Bump version and changelogErik Johnston2016-03-152-1/+40
| * | | Merge pull request #672 from nikriek/new-authorErik Johnston2016-03-291-2/+5
| |\ \ \
| | * | | Add new authorNiklas Riekenbrauck2016-03-291-2/+5
| |/ / /
* | | | Merge pull request #671 from nikriek/jwt-supportErik Johnston2016-03-294-1/+93
|\ \ \ \
| * | | | Add JWT supportNiklas Riekenbrauck2016-03-294-1/+93
|/ / / /
* | | | Merge pull request #668 from matrix-org/markjh/deduplicateMark Haines2016-03-244-2/+75
|\ \ \ \
| * | | | Fix typoMark Haines2016-03-241-1/+1
| * | | | Add a response cache for getting the public room listMark Haines2016-03-241-1/+11
| * | | | Deduplicate identical /sync requestsMark Haines2016-03-243-1/+64
|/ / / /
* | | | Merge pull request #667 from matrix-org/dbkr/never_notify_member_eventsDavid Baker2016-03-241-20/+21
|\ \ \ \ | |_|_|/ |/| | |
| * | | Never notify for member events. This fixes https://github.com/vector-im/vecto...David Baker2016-03-241-20/+21
|/ / /
* | | Merge pull request #666 from matrix-org/erikj/internErik Johnston2016-03-238-31/+100
|\ \ \
| * | | Simplify intern_dictErik Johnston2016-03-231-17/+10
| * | | Don't bother interning keys that are already internedErik Johnston2016-03-231-3/+1
| * | | Intern all the thingsErik Johnston2016-03-238-45/+97
| * | | Intern sender, event_id and room_id in eventsErik Johnston2016-03-231-0/+5
| * | | Intern type and state_key on eventsErik Johnston2016-03-231-0/+7
| * | | String internErik Johnston2016-03-232-3/+17
|/ / /
* | | Merge pull request #664 from matrix-org/erikj/public_room_listErik Johnston2016-03-232-18/+51
|\ \ \
| * | | Comment about weird SQLErik Johnston2016-03-231-1/+3
| * | | SQLite and postgres doesn't share a true literalErik Johnston2016-03-231-1/+1
| * | | Ensure all old public rooms have aliasesErik Johnston2016-03-232-4/+26
| * | | Ensure published rooms have public join rulesErik Johnston2016-03-231-0/+7
| * | | CommentErik Johnston2016-03-231-0/+3
| * | | Don't require alias in public room list.Erik Johnston2016-03-231-14/+13
* | | | 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
| |/ / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 14:27:41 +0000