summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #710 from matrix-org/markjh/move_fireMark Haines2016-04-085-39/+24
|\ | | | | Move all the wrapper functions for distributor.fire
| * Move all the wrapper functions for distributor.fireMark Haines2016-04-085-39/+24
|/ | | | | | | Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file.
* Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_dataMark Haines2016-04-082-37/+1
|\ | | | | Call profile handler get_displayname directly
| * Call profile handler get_displayname directly rather than using ↵Mark Haines2016-04-072-37/+1
| | | | | | | | collect_presencelike_data
* | Merge pull request #701 from DoubleMalt/ldap-authErik Johnston2016-04-074-10/+134
|\ \ | | | | | | Add LDAP authentication
| * | Add myself to AUTHORS.rstChristoph Witzany2016-04-071-0/+3
| | | | | | | | | | | | Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
| * | 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 redactions
| * | Add tests for redactionsMark Haines2016-04-074-5/+54
|/ /
* | Merge pull request #704 from matrix-org/markh/slaveIIIMark Haines2016-04-072-1/+95
|\ \ | | | | | | Add tests for get_latest_event_ids_in_room and get_current_state
| * | Add sensible __eq__ operators inside the tests.Mark Haines2016-04-072-10/+28
| | | | | | | | | | | | | | | Rather than adding them globally. This limits the changes to only affect the tests.
| * | 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
|\ \ \ | |/ / |/| | Deduplicate membership changes
| * | 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 remotely
| * | 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 events
| * Let users see their own leave eventsRichard van der Hoff2016-04-061-11/+40
| | | | | | | | | | | | | | ... otherwise clients get confused. Fixes https://matrix.org/jira/browse/SYN-662, https://github.com/vector-im/vector-web/issues/368
* | Merge pull request #702 from matrix-org/markjh/slaveIIMark Haines2016-04-062-11/+67
|\ \ | | | | | | Test that room membership is replicated
| * | 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 class
| * Add a slaved events store classMark Haines2016-04-0610-2/+485
| | | | | | | | | | Add a test to check that get_room_names_and_aliases does the same thing on both the master and on the slave data store.
* | Merge pull request #698 from matrix-org/erikj/port_script_fixErik Johnston2016-04-0613-86/+69
|\ \ | |/ |/| Don't require config to create database
| * 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 SQLBaseStore
| * | 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 global
| * 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...
| * Separate generating the replication response...Mark Haines2016-04-051-44/+55
| | | | | | | | | | from doing the http request parsing to make it easier to write unit tests for replication.
* | Merge pull request #693 from matrix-org/erikj/backfill_selfErik Johnston2016-04-051-1/+4
|\ \ | | | | | | Don't backfill from self
| * | 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 invites
| * | | Fix stuck invitesErik Johnston2016-04-054-16/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject.
* | | | Merge pull request #690 from matrix-org/erikj/memberErik Johnston2016-04-055-32/+155
|\| | | | |_|/ |/| | Store invites in a separate table.
| * | 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
|\| | | | | | | | Do checks for memberships before creating events
| * | 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.
| * | Use google style doc strings.Mark Haines2016-04-0114-169/+242
| | | | | | | | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format.
* | | Merge pull request #684 from matrix-org/markjh/backfill_id_genMark Haines2016-04-0111-61/+71
|\ \ \ | | | | | | | | Use a stream id generator for backfilled ids
| * | | 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
|\ \ \ | | | | | | | | Add concurrently_execute function
| * | | 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 cache
| * | | 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_context
| * | Remove outlier parameter from compute_event_contextMark Haines2016-03-313-11/+7
|/ / | | | | | | Use event.internal_metadata.is_outlier instead.
* | Merge pull request #680 from matrix-org/markjh/remove_is_new_stateMark Haines2016-03-313-56/+57
|\ \ | | | | | | Remove the is_new_state argument to persist event.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms.
* | | Merge pull request #679 from matrix-org/erikj/memberErik Johnston2016-03-313-603/+651
|\ \ \ | |/ / |/| | Split out RoomMemberHandler
| * | Split out RoomMemberHandlerErik Johnston2016-03-313-603/+651
| |/
* | Merge pull request #676 from matrix-org/markjh/replicate_stateIIIMark Haines2016-03-313-5/+128
|\ \ | |/ |/| Add replication streams for ex outliers and current state resets
| * 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 False
| * | Don't ignore the obey overlay if the rule has an enabled attribute of FalseDavid Baker2016-03-311-2/+3
|/ / | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1244
* | 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
|\ \ | | | | | | Add a replication stream for state groups
| * | 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 ids
| * 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
|\ \ | | | | | | Require user to have left room to forget room
| * | 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
| |/ | | | | | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event.
* | 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 author
| | * | | Add new authorNiklas Riekenbrauck2016-03-291-2/+5
| |/ / /
* | | | Merge pull request #671 from nikriek/jwt-supportErik Johnston2016-03-294-1/+93
|\ \ \ \ | | | | | | | | | | Support login using Javascript Web Tokens (JWT)
| * | | | Add JWT supportNiklas Riekenbrauck2016-03-294-1/+93
|/ / / /
* | | | Merge pull request #668 from matrix-org/markjh/deduplicateMark Haines2016-03-244-2/+75
|\ \ \ \ | | | | | | | | | | Deduplicate identical /sync requests
| * | | | 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.
| * | | Never notify for member events. This fixes ↵David Baker2016-03-241-20/+21
|/ / / | | | | | | | | | https://github.com/vector-im/vector-web/issues/828
* | | Merge pull request #666 from matrix-org/erikj/internErik Johnston2016-03-238-31/+100
|\ \ \ | | | | | | | | Intern lots of strings
| * | | 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
|\ \ \ | | | | | | | | Don't require alias in public room list.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rooms now no longer require an alias to be published. Also, changes the way we pull out state of each room to not require fetching all state events.
* | | | Merge pull request #663 from matrix-org/erikj/invite_for_userErik Johnston2016-03-232-7/+5
|\ \ \ \ | | | | | | | | | | Make get_invites return RoomsForUser
| * | | | 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
|\ \ \ \ | | | | | | | | | | Only cache events in the event cache
| * | | | 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
|\ \ \ \ | |/ / / |/| | | Make StateHandler._state_cache only store event_ids.
| * | | 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
|\ \ \ | | | | | | | | Fix membership count for BulkPushRuleEvaluator
| * | | Use get_users_in_room to count the number of room members rather than using ↵Mark Haines2016-03-221-1/+3
| | | | | | | | | | | | | | | | read_receipts
* | | | Merge pull request #660 from matrix-org/erikj/state_cacheErik Johnston2016-03-221-60/+48
|\ \ \ \ | | | | | | | | | | Don't cache events in _state_group_cache
| * | | | Don't cache events in _state_group_cacheErik Johnston2016-03-221-60/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, simply cache the event ids, relying on the event cache to cache the actual events. The problem was that while the state groups cache was limited in the number of groups it could hold, each individual group could consist of thousands of events.
* | | | | Merge pull request #659 from matrix-org/erikj/state_cache_factorErik Johnston2016-03-221-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Make stateGroupCache honour CACHE_SIZE_FACTOR
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | Add published room list edit API
| * | | | 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 some unused parameters from persist_event
| * | | 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
|\ \ \ | | | | | | | | Yield on EDU handling
| * | | 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
|\ \ \ \ | | | | | | | | | | Dedupe requested event list in _get_events
| * \ \ \ 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
|\ \ \ \ \ | | | | | | | | | | | | Update aliases event after deletion
| * | | | | Check canonical alias event existsErik Johnston2016-03-171-1/+2
| | | | | |
| * | | | | Update aliases event after deletionErik Johnston2016-03-172-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it.
| | * | | | 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
|\ \ \ \ | | | | | | | | | | Make registration idempotent, part 2
| * | | | 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 ↵David Baker2016-03-163-6/+42
| |/ / / | | | | | | | | | | | | a username.
* | | | Merge pull request #651 from matrix-org/markjh/unused_IIMark Haines2016-03-174-112/+0
|\ \ \ \ | | | | | | | | | | Remove dead code left over from presence changes
| * | | | 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
|\ \ \ | | | | | | | | Make registration idempotent
| * | | 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 ↵David Baker2016-03-162-13/+74
|/ / / | | | | | | | | | you an access token for the user that was registered on previous uses of that session. Tweak the UI auth layer to not delete sessions when their auth has completed and hence expire themn so they don't hang around until server restart. Allow server-side data to be associated with UI auth sessions.
* | | Merge pull request #647 from matrix-org/markjh/pushers_streamMark Haines2016-03-168-18/+120
|\ \ \ | | | | | | | | Add replication stream for pushers
| * | | Add a comment to offer a hint to an explanation for why we have a unique ↵Mark Haines2016-03-161-0/+1
| | | | | | | | | | | | | | | | constraint on (app_id, pushkey, user_id)
| * | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | Password reset docs and script
| * | | | 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
|/ / / / | | | | | | | | | | | | | | | | Replace the bash/perl gen_password script with a python one, and write a note on how to use it.
* | | | Merge pull request #646 from matrix-org/erikj/reject_invite_federationErik Johnston2016-03-151-1/+16
|\ \ \ \ | |_|_|/ |/| | | Persist rejection of invites over federation
| * | | 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 invite
| * | | Add config to create guest account on 3pid inviteErik Johnston2016-03-142-25/+36
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when a 3pid invite request is sent to an identity server, it includes a provisioned guest access token. This allows the link in the, say, invite email to include the guest access token ensuring that the same account is used each time the link is clicked. This flow has a number of flaws, including when using different servers or servers that have guest access disabled. For now, we keep this implementation but hide it behind a config option until a better flow is implemented.
* / / 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
| * | Fix regression where synapse checked whether push rules were valid JSON ↵Mark Haines2016-03-142-6/+19
|/ / | | | | | | before the compatibility hack that handled clients sending invalid JSON
* | Merge pull request #642 from matrix-org/erikj/logoutErik Johnston2016-03-113-15/+113
|\ \ | | | | | | Implement logout
| * | 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 bodies
| * | 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
|\ \ | | | | | | Fix logout on password change
| * | more pep8David Baker2016-03-111-1/+1
| | |
| * | Make select more sensible when dseleting access tokens, rename pusher ↵David Baker2016-03-113-7/+5
| | | | | | | | | | | | deletion to match access token deletion and make exception arg optional.
| * | Delete old, unused methods and rename new one to just be ↵David Baker2016-03-112-16/+3
| | | | | | | | | | | | `user_delete_access_tokens` with an `except_token_ids` argument doing what it says on the tin.
| * | 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
| | | | | | | | | | | | password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f05491ce65a4fc34326519754cd1edd9c54
* | | Merge pull request #640 from matrix-org/erikj/keyclient_hostErik Johnston2016-03-111-0/+3
|\ \ \ | | | | | | | | Make key client send a Host header
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Use topological orders for initial sync timeline
| * | | 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 register
| * | | | 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 manner
| * | | Update users table in a batched mannerErik Johnston2016-03-101-9/+14
|/ / /
* | | Merge pull request #637 from blide/developErik Johnston2016-03-102-11/+20
|\ \ \ | |/ / |/| | SYN-646 - Register endpoint returns refresh_token
| * | Flake8 fixblide2016-03-101-6/+6
| | |
| * | Register endpoint returns refresh_tokenblide2016-03-102-17/+26
|/ / | | | | | | Guest registration still doesn't return refresh_token
* | Merge pull request #634 from matrix-org/erikj/pin_saml2_versionErik Johnston2016-03-091-1/+1
|\ \ | | | | | | Pin pysaml2 version to 3.x
| * | Pin pysaml2 version to 3.xErik Johnston2016-03-091-1/+1
| | | | | | | | | | | | | | | This is due to the fact that `from saml2 import config` fails in version 4.x
* | | Merge pull request #628 from matrix-org/markjh/parse_jsonMark Haines2016-03-0911-121/+97
|\ \ \ | |/ / |/| | | | | | | | | | | Add a parse_json_object function to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.
| * | Add a parse_json_object functionMark Haines2016-03-0911-121/+97
|/ / | | | | | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.
* | 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 py27
| * | 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
|\ \ \ | | | | | | | | Idempotent-ise schema update script
| * \ \ 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
|\ \ \ \ | |_|/ / |/| | | Encode unicode objects given to post_urlencode*
| * | | pep8David Baker2016-03-081-2/+5
| | | |
| * | | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ↵David Baker2016-03-081-2/+12
| | | | | | | | | | | | | | | | chokes.
* | | | Merge pull request #631 from matrix-org/markjh/py3v1Mark Haines2016-03-088-10/+10
|\ \ \ \ | | | | | | | | | | Use syntax that's valid on both py2.7 and py3
| * | | | 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
|\ \ \ \ | |/ / / |/| | | Send the user ID matching the guest access token
| * | | Fix testsDavid Baker2016-03-073-20/+20
| | | |
| * | | Send the user ID matching the guest access token, since there is no Matrix ↵David Baker2016-03-072-2/+7
|/ / / | | | | | | | | | API to discover what user ID an access token is for.
* | | Merge pull request #626 from matrix-org/erikj/visibilityErik Johnston2016-03-071-0/+26
|\ \ \ | | | | | | | | Send history visibility on boundary changes
| * | | 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
|\ \ \ \ | | | | | | | | | | Add a stream for push rule updates
| * | | | Prefill from the correct streamMark Haines2016-03-041-1/+1
| | | | |
| * | | | prefill the push rules stream change cacheMark Haines2016-03-041-2/+9
| | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-21 14:58:54 +0000