summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove more unused parametersDaniel Wagner-Hall2015-11-022-2/+0
* Remove unused arguments and codeDaniel Wagner-Hall2015-11-022-26/+2
* Update the other place check_joined_room is calledMark Haines2015-10-301-1/+1
* Don't mark newly joined room timelines as limited in an incremental syncMark Haines2015-10-291-3/+5
* Make search API honour limit set in filterErik Johnston2015-10-291-0/+3
* Merge pull request #336 from matrix-org/erikj/searchErik Johnston2015-10-281-1/+52
|\
| * Optionally return event contexts with search resultsErik Johnston2015-10-281-1/+52
* | Merge pull request #334 from matrix-org/erikj/context_apiErik Johnston2015-10-282-1/+57
|\|
| * DocsErik Johnston2015-10-281-0/+13
| * Add room context apiErik Johnston2015-10-282-1/+44
* | Implement full_state incremental syncRichard van der Hoff2015-10-261-17/+34
|/
* Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-10-231-7/+1
|\
| * Fix receipts for room initial syncErik Johnston2015-10-221-7/+1
* | RenameErik Johnston2015-10-221-3/+3
* | Use namedtuple as return valueErik Johnston2015-10-221-1/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-221-17/+168
|\ \
| * \ Merge branch 'develop' into markjh/v2_sync_typingMark Haines2015-10-215-85/+451
| |\ \
| | * \ Merge pull request #316 from matrix-org/markjh/v2_sync_archivedMark Haines2015-10-211-3/+127
| | |\ \
| | | * | Include banned rooms in the archived section of v2 syncMark Haines2015-10-211-6/+9
| | | * | Fix pep8Mark Haines2015-10-191-1/+0
| | | * | Add rooms that the user has left under archived in v2 sync.Mark Haines2015-10-191-3/+125
| * | | | Doc string for the SyncHandler.typing_by_room methodMark Haines2015-10-211-0/+12
| * | | | Include typing events in initial v2 syncMark Haines2015-10-201-14/+29
| | |/ / | |/| |
* | | | Filter room ids before hitting the databaseErik Johnston2015-10-211-1/+1
* | | | Filter search resultsErik Johnston2015-10-211-2/+7
| |/ / |/| |
* | | Allow rejecting invitesDaniel Wagner-Hall2015-10-202-82/+229
* | | Merge pull request #307 from matrix-org/erikj/searchErik Johnston2015-10-192-0/+95
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-163-5/+192
| |\ \
| * | | Remove unused importErik Johnston2015-10-161-3/+1
| * | | Remove duplicate _filter_events_for_clientErik Johnston2015-10-161-46/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-163-97/+51
| |\ \ \
| * | | | docstringErik Johnston2015-10-161-0/+10
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-151-92/+105
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Make 'keys' optionalErik Johnston2015-10-141-1/+3
| * | | | More TODO markersErik Johnston2015-10-141-0/+3
| * | | | Add TODO markersErik Johnston2015-10-141-1/+4
| * | | | Remove constraints in preperation of using filtersErik Johnston2015-10-131-51/+10
| * | | | Search left rooms tooErik Johnston2015-10-131-5/+2
| * | | | Filter events to only thsoe that the user is allowed to seeErik Johnston2015-10-121-6/+10
| * | | | Merge remote-tracking branch 'origin/develop' into erikj/searchErik Johnston2015-10-124-43/+100
| |\ \ \ \
| * | | | | Remove unused room_id parameterErik Johnston2015-10-124-8/+56
| * | | | | PEP8Erik Johnston2015-10-121-2/+9
| * | | | | Keep FTS indexes up to date. Only search through rooms currently joinedErik Johnston2015-10-121-9/+22
| * | | | | Add basic full text search impl.Erik Johnston2015-10-092-0/+97
* | | | | | Merge pull request #310 from matrix-org/markjh/bcrypt_roundsMark Haines2015-10-161-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add config for how many bcrypt rounds to use for password hashesMark Haines2015-10-161-1/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #302 from matrix-org/daniel/3pidinvitesDaniel Wagner-Hall2015-10-163-5/+192
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Verify third party ID server certificatesDaniel Wagner-Hall2015-10-161-2/+29
| * | | | Use non-placeholder name for endpointDaniel Wagner-Hall2015-10-151-1/+1
| * | | | Look for keys on the right objectsDaniel Wagner-Hall2015-10-151-2/+2
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-153-99/+112
| |\| | |
| * | | | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-132-9/+10
| * | | | Move logic into handlerDaniel Wagner-Hall2015-10-131-0/+132
| * | | | Re-add accidentally removed codeDaniel Wagner-Hall2015-10-131-1/+1
| * | | | Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-133-7/+11
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-134-43/+100
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Remove merge thinkoDaniel Wagner-Hall2015-10-061-4/+0
| * | | | Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_fed...Daniel Wagner-Hall2015-10-061-76/+131
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"Daniel Wagner-Hall2015-10-051-131/+76
| * | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-054-78/+182
| |\ \ \ \
| * | | | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-013-4/+27
* | | | | | Amalgamate _filter_events_for_clientErik Johnston2015-10-163-97/+51
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #305 from matrix-org/markjh/v2_sync_apiMark Haines2015-10-141-92/+105
|\ \ \ \ \
| * | | | | Fix v2 sync pollingMark Haines2015-10-141-3/+3
| * | | | | Add a get_invites_for_user method to the storage to find out the rooms a user...Mark Haines2015-10-131-6/+2
| * | | | | Include invites in incremental syncMark Haines2015-10-131-6/+25
| * | | | | Include invited rooms in the initial syncMark Haines2015-10-131-10/+6
| * | | | | Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-132-5/+40
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Start spliting out the rooms into joined and invited in v2 syncMark Haines2015-10-131-18/+40
| * | | | | Update the filters to match the latest spec.Mark Haines2015-10-121-3/+3
| * | | | | Merge branch 'markjh/presence_races' into markjh/v2_sync_apiMark Haines2015-10-091-3/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_apiMark Haines2015-10-095-118/+236
| |\ \ \ \ \ \
| * | | | | | | Update the v2 room sync format to match the current v2 specMark Haines2015-10-081-14/+11
| * | | | | | | Move the rooms out into a room_map mapping from room_id to room.Mark Haines2015-10-051-18/+9
| * | | | | | | Start updating the sync API to match the specificationMark Haines2015-10-011-36/+28
| | |_|_|/ / / | |/| | | | |
* | | | | | | Remove unused room_id argErik Johnston2015-10-143-7/+7
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #296 from matrix-org/markjh/eventstream_presenceMark Haines2015-10-121-35/+52
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Split the sections of EventStreamHandler.get_stream that handle presenceMark Haines2015-10-091-35/+52
| | |_|_|/ | |/| | |
* | | | | Merge pull request #297 from matrix-org/markjh/presence_racesMark Haines2015-10-121-3/+8
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix some races in the synapse presence handler caused by not yielding on defe...Mark Haines2015-10-091-3/+8
| |/ / /
* | | | Formatting changesSteven Hammerton2015-10-101-1/+2
* | | | Provide ability to login using CASSteven Hammerton2015-10-101-0/+31
* | | | Add a flag to initial sync to indicate we want rooms that the user has leftMark Haines2015-10-081-5/+8
|/ / /
* | / Explicitly add Create event as auth eventErik Johnston2015-10-021-2/+3
| |/ |/|
* | Add 'trusted_private_chat' to room creation presetsErik Johnston2015-10-021-0/+5
* | Merge pull request #275 from matrix-org/erikj/invite_stateErik Johnston2015-10-022-4/+30
|\ \
| * | Also bundle in senderErik Johnston2015-10-021-0/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_stateErik Johnston2015-09-253-88/+160
| |\ \
| * | | Bundle in some room state in the unsigned bit of the invite when sending to i...Erik Johnston2015-09-102-4/+29
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-024-240/+302
|\ \ \ \
| * \ \ \ Merge pull request #283 from matrix-org/erikj/atomic_join_federationErik Johnston2015-10-021-76/+131
| |\ \ \ \
| | * | | | CommentErik Johnston2015-09-301-0/+8
| | * | | | Rename varErik Johnston2015-09-301-3/+3
| | * | | | Fix getting an event for a room the server forgot it was inErik Johnston2015-09-171-47/+59
| | * | | | Also persist stateErik Johnston2015-09-171-1/+1
| | * | | | Capture errErik Johnston2015-09-171-2/+2
| | * | | | Also handle stateErik Johnston2015-09-171-3/+3
| | * | | | Don't bail out of joining if we encounter a rejected eventErik Johnston2015-09-171-13/+20
| | * | | | Refactor do_invite_joinErik Johnston2015-09-171-28/+56
| * | | | | Merge pull request #287 from matrix-org/erikj/canonical_aliasErik Johnston2015-09-301-1/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove double indentationErik Johnston2015-09-301-7/+6
| | * | | | Set m.room.canonical_alias on room creation.Erik Johnston2015-09-231-1/+11
| | | |_|/ | | |/| |
| * | | | Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-282-75/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | synapse/handlers/room.py:_should_invite_join was unusedMark Haines2015-09-231-26/+0
| | * | | synapse/handlers/federation.py:_handle_auth_events was unusedMark Haines2015-09-231-49/+0
| * | | | Merge pull request #271 from matrix-org/erikj/default_historyErik Johnston2015-09-231-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change default history visibility for private roomsErik Johnston2015-09-091-1/+1
| | | |/ | | |/|
| * | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-212-85/+158
| |\ \ \ | | |_|/ | |/| |
| | * | Clarify that room_initial_sync returns a python dictMark Haines2015-09-211-1/+1
| | * | Fix doc string to point at the right classMark Haines2015-09-211-2/+3
| | * | Add explicit "elif event.membership == Membership.LEAVE" for clarityMark Haines2015-09-211-1/+2
| | * | Clamp the "to" token for /rooms/{roomId}/messages to when the user leftMark Haines2015-09-211-0/+4
| | * | Allow users to GET individual state events for rooms that they have leftMark Haines2015-09-101-7/+13
| | * | Allow users that have left a room to get the messages that happend in the roo...Mark Haines2015-09-091-4/+27
| | * | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-092-19/+3
| | * | Allow users that have left the room to view the member list from the point th...Mark Haines2015-09-091-36/+0
| | * | Allow rooms/{roomId}/state for a room that has been leftMark Haines2015-09-091-5/+13
| | * | Allow room initialSync for users that have left the room, returning a snapsho...Mark Haines2015-09-091-9/+76
| | * | Include rooms that a user has left in an initialSync. Include the state and m...Mark Haines2015-09-081-6/+21
| | |/
| * / Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-091-2/+1
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-09-141-1/+16
|\|
| * Merge pull request #262 from matrix-org/redactyoselfDaniel Wagner-Hall2015-09-021-1/+16
| |\
| | * Merge branch 'develop' into redactyoselfDaniel Wagner-Hall2015-08-283-27/+29
| | |\
| | * | Allow users to redact their own eventsDaniel Wagner-Hall2015-08-281-2/+17
* | | | Add flag which disables federation of the roomErik Johnston2015-09-011-2/+6
|/ / /
* | | Merge pull request #258 from matrix-org/slowtestsmakemesadDaniel Wagner-Hall2015-08-282-4/+26
|\ \ \ | |_|/ |/| |
| * | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| * | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-262-3/+26
| |/
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-283-27/+29
|\ \ | |/ |/|
| * Remove needless existence checksErik Johnston2015-08-261-7/+3
| * Don't loop over all rooms ever in typing.get_new_events_for_userErik Johnston2015-08-261-2/+2
| * Do auth checks *before* persisting the eventErik Johnston2015-08-241-16/+16
| * Don't make pushers handle presence/typing eventsErik Johnston2015-08-241-2/+8
| * Doc stringErik Johnston2015-08-211-0/+6
| * When logging in fetch user by user_id case insensitively, *unless* there are ...Erik Johnston2015-08-211-8/+23
| * Don't allow people to register user ids which only differ by case to an exist...Erik Johnston2015-08-211-2/+2
* | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-262-10/+33
* | Fix up one more referenceDaniel Wagner-Hall2015-08-251-1/+0
* | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-252-6/+4
* | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-211-1/+1
|\|
| * Add missing param in store.get_state_groups invocationErik Johnston2015-08-211-1/+1
* | Fix bad mergeDaniel Wagner-Hall2015-08-201-8/+1
* | Fix indentationDaniel Wagner-Hall2015-08-201-1/+2
* | Fix flake8 warningsDaniel Wagner-Hall2015-08-201-4/+6
* | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-201-3/+3
|\ \
| * | Remove incorrect whitespaceDaniel Wagner-Hall2015-08-201-3/+3
| * | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-206-15/+78
| |\|
* | | Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-204-3/+46
|\ \ \ | | |/ | |/|
| * | Merge pull request #235 from matrix-org/erikj/room_avatarsErik Johnston2015-08-201-2/+3
| |\ \
| | * | Add m.room.avatar to default power levels. Change default required power leve...Erik Johnston2015-08-201-2/+3
| * | | Another use of check_password that got missed in the yield fixDavid Baker2015-08-201-1/+1
| |/ /
| * | Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-202-1/+18
| |\ \
| | * | Check that the canonical room alias actually points to the roomErik Johnston2015-08-201-1/+17
| | * | Add canonical alias to the default power levelsErik Johnston2015-08-191-0/+1
| * | | Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-0/+25
| |\ \ \
| | * | | Add endpoint that proxies ID server request token and errors if the given ema...David Baker2015-08-041-0/+25
* | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-201-5/+30
* | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-202-24/+31
* | | | | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-201-6/+13
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-192-4/+3
| |\ \ \ | | | |/ | | |/|
| * | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-191-4/+4
| * | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-181-4/+4
| * | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-181-4/+4
| * | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-184-49/+136
| |\ \ \
| * | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-181-6/+13
* | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_usersErik Johnston2015-08-193-12/+32
| |_|/ / |/| | |
* | | | Remove an access token log lineErik Johnston2015-08-191-1/+1
* | | | Fix regression where we incorrectly responded with a 200 to /loginErik Johnston2015-08-191-1/+2
* | | | Merge pull request #227 from matrix-org/erikj/receipts_take2Erik Johnston2015-08-181-2/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-174-122/+86
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts_t...Erik Johnston2015-08-131-7/+3
| |\ \ \ \
| * | | | | Re-enable receiptsErik Johnston2015-08-131-2/+0
* | | | | | TypoErik Johnston2015-08-181-1/+1
* | | | | | None checkErik Johnston2015-08-181-0/+2
* | | | | | More helpful variable namesErik Johnston2015-08-181-7/+7
* | | | | | Doc stringsErik Johnston2015-08-181-0/+28
* | | | | | Remove debug try/catchErik Johnston2015-08-181-47/+43
* | | | | | Implement a batched presence_handler.get_state and use itErik Johnston2015-08-172-12/+69
| |_|/ / / |/| | | |
* | | | | Merge pull request #221 from matrix-org/authDaniel Wagner-Hall2015-08-144-122/+86
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Merge password checking implementationsDaniel Wagner-Hall2015-08-121-20/+15
| * | | Simplify LoginHander and AuthHandlerDaniel Wagner-Hall2015-08-124-108/+77
| | |/ | |/|
* | | Remove pointless mapErik Johnston2015-08-131-7/+3
| |/ |/|
* | Fix _filter_events_for_clientErik Johnston2015-08-122-6/+2
* | Simplify staggered deferred listsErik Johnston2015-08-121-2/+2
* | Use list comprehension instead of filterErik Johnston2015-08-122-20/+6
* | Remove debug loggersErik Johnston2015-08-112-6/+0
* | Fix application of ACLsErik Johnston2015-08-113-14/+30
* | Don't be too enthusiatic with defer.gatherResultsErik Johnston2015-08-071-4/+8
* | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-051-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perfErik Johnston2015-08-041-1/+1
|\|
| * Add vector.im as trusted ID serverDavid Baker2015-08-031-1/+1
* | Speed up event filtering (for ACL) logicErik Johnston2015-08-043-3/+15
|/
* Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-1/+2
* Disable receipts for nowMatrix2015-07-221-0/+2
* Don't do any database hits in receipt handling if from_key == to_keyMatrix2015-07-181-0/+3
* Merge pull request #199 from matrix-org/erikj/receiptsErik Johnston2015-07-165-5/+224
|\
| * DocsErik Johnston2015-07-141-3/+8
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receiptsErik Johnston2015-07-135-1/+197
| |\
| * | CommentsErik Johnston2015-07-131-4/+12
| * | Remove spurious commentErik Johnston2015-07-091-2/+0
| * | Integer timestampsErik Johnston2015-07-091-1/+1
| * | Change format of receipts to allow inclusion of dataErik Johnston2015-07-091-8/+16
| * | Add a cache to fetching of receipt streamsErik Johnston2015-07-081-24/+7
| * | Split receipt events up into one per roomErik Johnston2015-07-081-30/+21
| * | Hook up receipts to v1 initialSyncErik Johnston2015-07-082-4/+57
| * | Wire together receipts and the notifer/federationErik Johnston2015-07-071-21/+60
| * | Fix various typosErik Johnston2015-07-072-2/+6
| * | Consolidate duplicate code in notifierErik Johnston2015-07-023-4/+4
| * | Add basic ReceiptHandlerErik Johnston2015-07-011-0/+130
* | | Merge pull request #203 from matrix-org/erikj/room_creation_presetsErik Johnston2015-07-161-19/+77
|\ \ \
| * | | Implement specifying custom initial state for /createRoomErik Johnston2015-07-161-40/+60
| * | | s/everyone_ops/original_invitees_have_ops/Erik Johnston2015-07-141-3/+3
| * | | Capitalize contantsErik Johnston2015-07-141-4/+4
| * | | Implement presets at room creationErik Johnston2015-07-131-22/+60
| | |/ | |/|
* | | Add back in support for remembering parameters submitted to a user-interactiv...David Baker2015-07-151-2/+4
* | | Merge pull request #193 from matrix-org/erikj/bulk_persist_eventErik Johnston2015-07-141-106/+121
|\ \ \ | |/ / |/| |
| * | Add bulk insert events APIErik Johnston2015-06-251-106/+121
| |/
* | Merge pull request #196 from matrix-org/erikj/room_historyErik Johnston2015-07-104-1/+168
|\ \
| * | Add commentErik Johnston2015-07-091-0/+4
| * | Add m.room.history_visibility to newly created rooms' m.room.power_levelsErik Johnston2015-07-061-0/+1
| * | Rename key and values for m.room.history_visibility. Support 'invited' valueErik Johnston2015-07-063-23/+60
| * | Filter and redact events that the other server doesn't have permission to see...Erik Johnston2015-07-031-0/+44
| * | Respect m.room.history_visibility in v2_alpha sync APIErik Johnston2015-07-031-0/+33
| * | Make v1 initial syncs respect room history ACLErik Johnston2015-07-021-17/+34
| * | Add basic impl for room history ACL on GET /messages client APIErik Johnston2015-07-021-1/+32
| |/
* | code beautifyMuthu Subramanian2015-07-081-1/+0
* | Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-081-0/+30
|/
* Merge pull request #189 from matrix-org/erikj/room_init_syncErik Johnston2015-06-192-35/+45
|\
| * Use another deferred listErik Johnston2015-06-161-18/+27
| * Use DeferredListErik Johnston2015-06-161-9/+9
| * Don't do unecessary db ops in presence.get_stateErik Johnston2015-06-162-14/+15
* | Fix bug where synapse was sending AS user queries incorrectly.Kegan Dougal2015-06-171-1/+1
|/
* Merge pull request #176 from matrix-org/erikj/backfill_authErik Johnston2015-06-031-1/+46
|\
| * Add a timeoutErik Johnston2015-06-021-0/+1
| * Handle the fact we might be missing auth eventsErik Johnston2015-06-021-15/+19
| * Add some loggingErik Johnston2015-06-021-0/+5
| * Correctly look up auth_eventsErik Johnston2015-06-021-9/+12
| * Don't process events we've already processed. Remember to process state eventsErik Johnston2015-06-021-0/+22
| * Correctly pass in auth_eventsErik Johnston2015-06-011-1/+11
* | Merge pull request #180 from matrix-org/erikj/prev_state_contextErik Johnston2015-06-031-1/+3
|\ \
| * | Don't needlessly compute prev_stateErik Johnston2015-06-031-1/+3
| |/
* / Don't needlessly compute contextErik Johnston2015-06-031-2/+4
|/
* Merge branch 'develop' into markjh/SYT-8-recaptchaMark Haines2015-05-291-0/+1
|\
| * SYN-395: Fix CAPTCHA, don't double decode jsonErik Johnston2015-05-281-2/+3
* | Add config for setting the recaptcha verify api endpoint, so we can test it i...Mark Haines2015-05-291-3/+3
|/
* Merge pull request #163 from matrix-org/markjh/presence_list_cacheMark Haines2015-05-221-9/+15
|\
| * Add a cache for getting the presence list for a userMark Haines2015-05-221-9/+15
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_f...Erik Johnston2015-05-223-69/+105
|\|
| * Merge pull request #156 from matrix-org/erikj/join_perfMark Haines2015-05-221-22/+56
| |\