summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Track the cpu used in the main thread by each logging contextMark Haines2015-12-033-10/+72
* Merge pull request #414 from matrix-org/erikj/if_not_existsErik Johnston2015-12-031-1/+1
|\
| * Older versions of SQLite don't like IF NOT EXISTS in virtual tablesErik Johnston2015-12-021-1/+1
* | Merge pull request #415 from matrix-org/daniel/endpointsDaniel Wagner-Hall2015-12-036-35/+11
|\ \
| * | Update endpoints to reflect current specDaniel Wagner-Hall2015-12-026-35/+11
* | | Merge pull request #418 from matrix-org/daniel/whoisDaniel Wagner-Hall2015-12-032-18/+12
|\ \ \
| * | | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-022-18/+12
| |/ /
* | | Just replace the table definition with the one from full_schema 16David Baker2015-12-021-11/+10
* | | Fix schema delta 15 on postgres in the very unlikley event that anyone upgrad...David Baker2015-12-021-1/+1
* | | Make state updates in the C+S API idempotentMark Haines2015-12-021-0/+12
|/ /
* | Merge pull request #412 from matrix-org/erikj/searchErik Johnston2015-12-021-11/+36
|\ \ | |/ |/|
| * Throw if unrecognized DB typeErik Johnston2015-12-021-1/+4
| * Fix so highlight matching works againErik Johnston2015-12-021-8/+13
| * Remove deuplication. Add comment about regex.Erik Johnston2015-12-021-21/+11
| * Search: Add prefix matching supportErik Johnston2015-12-021-5/+32
* | Merge pull request #410 from matrix-org/markjh/edu_frequencyMark Haines2015-12-022-5/+15
|\ \
| * | Use the context returned by _handle_new_eventMark Haines2015-12-021-4/+1
| * | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-1/+1
| |\ \
| * | | Add commentsMark Haines2015-12-022-0/+6
| * | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-029-56/+91
| |\ \ \
| * | | | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
| * | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-0142-235/+835
| |\ \ \ \
| * | | | | Only fire user_joined_room on the distributor if the user has actually joined...Mark Haines2015-12-011-4/+6
* | | | | | Merge pull request #413 from matrix-org/markjh/reuse_http_clientMark Haines2015-12-023-18/+10
|\ \ \ \ \ \
| * | | | | | Reuse a single http client, rather than creating new onesMark Haines2015-12-023-18/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #411 from matrix-org/default_dont_notifyDavid Baker2015-12-021-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change the m.room.message rule to be disabled by default so we only notify fo...David Baker2015-12-021-0/+1
| | |/ / / | |/| | |
* | | | | Fix typo in collect_presencelike_dataMark Haines2015-12-021-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #409 from MadsRC/developErik Johnston2015-12-021-0/+1
|\ \ \ \
| * | | | Added a single line to explain what the server_name is used forMads R. Christensen2015-12-021-0/+1
* | | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
|\ \ \ \ \
| * | | | | Wrap calls to distributor.fire in appropriately named functions so that stati...Mark Haines2015-12-017-53/+78
| | |/ / / | |/| | |
* | | | | Merge pull request #406 from matrix-org/erikj/searchErik Johnston2015-12-021-3/+12
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Search: Don't disregard grouping info in pagination tokensErik Johnston2015-12-011-3/+12
* | | | Add API for setting account_data globaly or on a per room basisMark Haines2015-12-0111-25/+476
* | | | Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-0126-115/+130
|/ / /
* | | Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-012-2/+2
|\ \ \
| * | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ...Mark Haines2015-12-012-2/+2
| | |/ | |/|
* | | Merge pull request #402 from matrix-org/markjh/event_formattingMark Haines2015-12-011-9/+7
|\ \ \
| * | | Only add the user_id if the sender is presentMark Haines2015-12-011-1/+3
| * | | Copy rather than move the fields to shuffle between a v1 and a v2 event.Mark Haines2015-11-301-9/+5
* | | | Tidy up a bitErik Johnston2015-12-011-8/+9
* | | | Allow paginating search ordered by recentsErik Johnston2015-11-304-84/+219
| |/ / |/| |
* | | Return words to highlight in search resultsErik Johnston2015-11-272-22/+120
|/ /
* | Allow user to redact with an equal powerErik Johnston2015-11-261-1/+1
* | Fix SQL for postgres againDaniel Wagner-Hall2015-11-231-1/+1
* | Fix SQL for postgresDaniel Wagner-Hall2015-11-231-1/+1
* | Remove size specifier for database columnDaniel Wagner-Hall2015-11-231-1/+3
* | Merge pull request #375 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-231-10/+15
|\ \ | |/ |/|
| * Clean up room initialSync for guest usersDaniel Wagner-Hall2015-11-131-10/+15
* | Merge pull request #385 from matrix-org/daniel/forgetroomsMark Haines2015-11-206-5/+118
|\ \
| * \ Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into danie...Daniel Wagner-Hall2015-11-1914-74/+112
| |\ \
| | * \ Merge branch 'develop' into daniel/forgetroomsPaul "LeoNerd" Evans2015-11-1914-74/+112
| | |\ \
| * | | | Ignore forgotten rooms in v2 syncDaniel Wagner-Hall2015-11-191-1/+1
| |/ / /
| * | | Simplify codeDaniel Wagner-Hall2015-11-192-8/+6
| * | | Apply forgetting properly to historical eventsDaniel Wagner-Hall2015-11-182-3/+41
| * | | Allow users to forget roomsDaniel Wagner-Hall2015-11-176-4/+81
* | | | Fix typoErik Johnston2015-11-202-3/+3
* | | | Don't limit connections to perspective serversErik Johnston2015-11-202-22/+21
* | | | Merge pull request #394 from matrix-org/erikj/searchErik Johnston2015-11-201-1/+54
|\ \ \ \
| * | | | Add option to include the current room stateErik Johnston2015-11-201-0/+24
| * | | | Optionally include historic profile infoErik Johnston2015-11-201-1/+30
| | |/ / | |/| |
* | | | Merge pull request #389 from matrix-org/rav/flatten_sync_responseRichard van der Hoff2015-11-202-27/+17
|\ \ \ \
| * | | | Merge branch 'develop' into rav/flatten_sync_responsePaul "LeoNerd" Evans2015-11-1915-75/+113
| |\| | |
| * | | | Put back the 'state.events' subobjectRichard van der Hoff2015-11-191-1/+1
| * | | | v2 /sync: Rename the keys of the 'rooms' object to match member statesRichard van der Hoff2015-11-191-3/+3
| * | | | Flatten the /sync response to remove the event_mapRichard van der Hoff2015-11-192-24/+14
* | | | | Merge pull request #391 from matrix-org/erikj/remove_token_from_flowErik Johnston2015-11-201-1/+10
|\ \ \ \ \
| * | | | | CommentErik Johnston2015-11-201-0/+8
| * | | | | Remove m.login.token from advertised flows.Erik Johnston2015-11-191-1/+2
* | | | | | Merge pull request #393 from matrix-org/erikj/destination_retry_maxErik Johnston2015-11-201-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use min and not max to set an upper bound on retry intervalErik Johnston2015-11-201-2/+2
| |/ / / /
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-11-191-1/+1
|\| | | |
| * | | | Bump changes and versionErik Johnston2015-11-191-1/+1
* | | | | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_dataMark Haines2015-11-1911-49/+66
|\ \ \ \ \
| * | | | | Rename the database tableMark Haines2015-11-181-0/+17
| * | | | | s/private_user_data/account_data/Mark Haines2015-11-1810-49/+49
| | |_|/ / | |/| | |
* | | | | Take a boolean not a list of lambdasDaniel Wagner-Hall2015-11-192-9/+18
| |/ / / |/| | |
* | | | CommentErik Johnston2015-11-191-0/+2
* | | | Split out text for missing config options.Erik Johnston2015-11-181-16/+26
| |/ / |/| |
* | | Bump changelog and versionErik Johnston2015-11-171-1/+1
|/ /
* | Add commentErik Johnston2015-11-171-0/+2
* | Only retry federation requests for a long time for background requestsErik Johnston2015-11-172-7/+20
* | Implement required method 'resumeProducing'Erik Johnston2015-11-171-0/+3
* | Slightly more aggressive retry timers at HTTP levelErik Johnston2015-11-171-2/+3
* | Bump changelog and versionErik Johnston2015-11-171-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-177-42/+219
|\ \
| * | Always check guest = true in macaroonsSteven Hammerton2015-11-171-1/+2
| * | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-1728-284/+1003
| |\ \
| | * | Don't complain if /make_join response lacks 'prev_state' list (SYN-517)Paul "LeoNerd" Evans2015-11-131-0/+6
| | |/
| | * Allow guests to /room/:room_id/{join,leave}Daniel Wagner-Hall2015-11-131-3/+14
| * | Snakes not camelsSteven Hammerton2015-11-111-5/+5
| * | Minor review fixesSteven Hammerton2015-11-112-17/+14
| * | Share more code between macaroon validationSteven Hammerton2015-11-112-57/+17
| * | Updates to fallback CAS login to do new token loginSteven Hammerton2015-11-061-26/+12
| * | Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-0540-295/+1435
| |\ \
| * | | Allow hs to do CAS login completely and issue the client with a login token t...Steven Hammerton2015-11-053-5/+218
| * | | Add service URL to CAS configSteven Hammerton2015-11-041-0/+3
* | | | Bump version and change log v0.11.0-rc2Erik Johnston2015-11-131-1/+1
| |_|/ |/| |
* | | Implementation of state rollback in /syncRichard van der Hoff2015-11-132-4/+69
* | | Fix a few race conditions in the state calculationRichard van der Hoff2015-11-132-60/+77
* | | Make handlers.sync return a state dictionary, instead of an event list.Richard van der Hoff2015-11-132-32/+40
* | | Update some commentsRichard van der Hoff2015-11-134-14/+98
* | | Merge pull request #369 from matrix-org/daniel/guestnoneventsDaniel Wagner-Hall2015-11-121-3/+17
|\ \ \
| * | | Return non-room events from guest /events callsDaniel Wagner-Hall2015-11-121-3/+17
* | | | Merge pull request #368 from matrix-org/erikj/fix_federation_profileErik Johnston2015-11-123-6/+13
|\ \ \ \
| * | | | Fix missing profile data in federation joinsErik Johnston2015-11-123-6/+13
| |/ / /
* | | | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_fasterErik Johnston2015-11-121-3/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Trailing whitespaceErik Johnston2015-11-121-1/+1
| * | | Expand commentErik Johnston2015-11-121-0/+6
| * | | CommentErik Johnston2015-11-121-0/+2
| * | | Fix SQL syntaxErik Johnston2015-11-121-2/+3
| * | | Use a (hopefully) more efficient SQL query for doing recency based room searchErik Johnston2015-11-121-4/+6
* | | | Fix an issue with ignoring power_level changes on divergent graphsRichard van der Hoff2015-11-121-5/+11
* | | | Merge pull request #367 from matrix-org/daniel/readafterleaveDaniel Wagner-Hall2015-11-121-10/+11
|\ \ \ \
| * | | | Tweak guest access permissionsDaniel Wagner-Hall2015-11-121-10/+11
* | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-122-24/+34
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow guest access to room initialSyncDaniel Wagner-Hall2015-11-112-24/+34
* | | | | Fix bug where assumed dict was namedtupleErik Johnston2015-11-121-1/+1
| |/ / / |/| | |
* | | | Allow guests to set their display namesDaniel Wagner-Hall2015-11-121-1/+1
* | | | Consider joined guest users as joined usersDaniel Wagner-Hall2015-11-121-12/+21
* | | | Fix race creating directoriesDaniel Wagner-Hall2015-11-121-1/+5
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-112-5/+11
|\ \ \ \
| * \ \ \ Merge pull request #361 from matrix-org/daniel/guestcontextErik Johnston2015-11-112-5/+11
| |\ \ \ \
| | * | | | Allow guests to access room context APIDaniel Wagner-Hall2015-11-112-5/+11
| | |/ / /
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-1119-134/+594
|\| | | |
| * | | | Merge pull request #359 from matrix-org/markjh/incremental_indexingErik Johnston2015-11-116-77/+413
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix param style to work on both sqlite and postgresMark Haines2015-11-111-2/+6
| | * | | Fix the background updateMark Haines2015-11-113-17/+19
| | * | | Use a background task to update databases to use the full text searchMark Haines2015-11-102-80/+28
| | * | | Run the background updates when starting synapse.Mark Haines2015-11-104-10/+67
| | * | | Add background update task for reindexing event searchMark Haines2015-11-091-2/+96
| | * | | Add storage module for tracking background updates.Mark Haines2015-11-092-0/+231
| * | | | Return world_readable and guest_can_join in /publicRoomsDaniel Wagner-Hall2015-11-103-29/+69
| * | | | Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-107-12/+92
| * | | | Merge pull request #356 from matrix-org/daniel/3pidyetagainDaniel Wagner-Hall2015-11-102-7/+4
| |\ \ \ \
| | * | | | Get display name from identity server, not clientDaniel Wagner-Hall2015-11-092-7/+4
| | |/ / /
| * | | | Don't fiddle with results returned by event sourcesRichard van der Hoff2015-11-091-4/+12
| * | | | Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-091-1/+1
| * | | | Merge branch 'develop' into markjh/SYN-513Mark Haines2015-11-091-1/+1
| |\ \ \ \
| | * | | | fix comedy important missing comma breaking recent-ordered FTS on sqliteMatthew Hodgson2015-11-081-1/+1
| | * | | | add a key existence check to tags_by_room to avoid /events 500'ing when testi...Matthew Hodgson2015-11-061-1/+2
| | |/ / /
| * / / / SYN-513: Include updates for rooms that have had all their tags deletedMark Haines2015-11-092-2/+2
| |/ / /
| * | / Remove accidentally added ID columnDaniel Wagner-Hall2015-11-061-1/+0
| | |/ | |/|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-0513-187/+245
|\| |
| * | Merge pull request #350 from matrix-org/erikj/searchErik Johnston2015-11-053-36/+288
| |\ \
| | * | Be explicit about what we're doingErik Johnston2015-11-051-1/+1
| | * | Remove redundant testErik Johnston2015-11-051-1/+0
| | * | Increment by one, not fiveErik Johnston2015-11-051-1/+1
| * | | Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-0510-180/+230
| * | | Merge pull request #340 from matrix-org/erikj/server_retriesErik Johnston2015-11-052-4/+13
| |\ \ \
| | * | | Retry dead servers a lot less oftenErik Johnston2015-11-022-4/+13
* | | | | Bump changelog and version numberErik Johnston2015-11-051-1/+1
| |_|/ / |/| | |
* | | | COMMENTSErik Johnston2015-11-051-4/+26
* | | | Error handlingErik Johnston2015-11-051-1/+8
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-11-0555-330/+1126
|\| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-11-0543-329/+434
| |\ \ \
| | * | | Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-0516-56/+210
| | * | | Merge pull request #347 from matrix-org/markjh/check_filterMark Haines2015-11-051-18/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Remove fields that are both unspecified and unused from the filter checks, ch...Mark Haines2015-11-041-18/+2
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-11-048-114/+6
| | |\ \ \
| | | * | | Merge branch 'develop' into daniel/removesomeliesMark Haines2015-11-0418-160/+577
| | | |\| |
| | | | * | Remove the LockManager class because it wasn't being usedMark Haines2015-11-043-81/+0
| | | * | | Remove more unused parametersDaniel Wagner-Hall2015-11-023-4/+1
| | | * | | Remove unused arguments and codeDaniel Wagner-Hall2015-11-023-29/+5
| | | | |/ | | | |/|
| | * | | Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-0427-149/+224
| | | |/ | | |/|
| * | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-11-0512-1/+692
| |\ \ \ | | |/ / | |/| |
| | * | Use correct service urlErik Johnston2015-10-261-3/+1
| | * | Add login fallbackErik Johnston2015-10-265-0/+280
| | * | Move static folder into synapseErik Johnston2015-10-267-1/+414
* | | | Implement basic pagination for search resultsErik Johnston2015-11-053-50/+86
* | | | Implement order and group byErik Johnston2015-11-042-17/+205
|/ / /
* | | Merge pull request #341 from matrix-org/markjh/v2_sync_receiptsMark Haines2015-11-031-15/+30
|\ \ \
| * \ \ Merge branch 'develop' into markjh/v2_sync_receiptsMark Haines2015-11-0313-23/+522
| |\ \ \
| * | | | Include read receipts in v2 syncMark Haines2015-11-021-15/+30
| | |_|/ | |/| |
* | | | Merge pull request #343 from matrix-org/erikj/fix_retriesErik Johnston2015-11-032-46/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't rearrange transaction_queueErik Johnston2015-11-031-12/+11
| * | | Fix broken cache for getting retry times. This meant we retried remote destin...Erik Johnston2015-11-032-55/+40
| |/ /
* | | Merge pull request #335 from matrix-org/markjh/room_tagsMark Haines2015-11-0313-24/+523
|\ \ \ | |/ / |/| |
| * | That TODO was doneMark Haines2015-11-031-1/+0
| * | Spell "deferred" more correctlyMark Haines2015-11-031-1/+1
| * | Include room tags in v2 /syncMark Haines2015-11-023-11/+70
| * | Store room tag content and return the content in the m.tag eventMark Haines2015-11-024-22/+41
| * | Merge branch 'develop' into markjh/room_tagsMark Haines2015-11-029-28/+331
| |\ \
| * | | Support clients supplying older tokens, fix short poll testMark Haines2015-10-301-1/+1
| * | | Include tags in v1 room initial syncMark Haines2015-10-301-0/+11
| * | | Include room tags v1 /initialSyncMark Haines2015-10-301-0/+12
| * | | Inform the client of new room tags using v1 /eventsMark Haines2015-10-296-14/+91
| * | | Fix pyflakes errorsMark Haines2015-10-282-3/+5
| * | | Add APIs for adding and removing tags from roomsMark Haines2015-10-285-0/+320
* | | | Add missing columnDaniel Wagner-Hall2015-10-301-1/+1
| |/ / |/| |
* | | Update the other place check_joined_room is calledMark Haines2015-10-302-2/+3
* | | 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-284-2/+229
|\| | |
| * | | DocsErik Johnston2015-10-282-0/+39
| * | | Add room context apiErik Johnston2015-10-284-2/+190
* | | | Merge pull request #332 from matrix-org/rav/full_state_syncRichard van der Hoff2015-10-282-19/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Implement full_state incremental syncRichard van der Hoff2015-10-262-19/+38
| |/ /
* / / Fix a 500 error resulting from empty room_idsRichard van der Hoff2015-10-261-1/+1
|/ /
* | Merge pull request #328 from matrix-org/erikj/searchErik Johnston2015-10-261-14/+17
|\ \
| * | Pull out sender when computing search resultsErik Johnston2015-10-231-14/+17
* | | Merge pull request #327 from matrix-org/erikj/searchErik Johnston2015-10-233-2/+30
|\| |
| * | Implement rank function for SQLite FTSErik Johnston2015-10-233-2/+30
* | | Merge pull request #323 from matrix-org/daniel/sizelimitsDaniel Wagner-Hall2015-10-232-1/+30
|\ \ \
| * | | Reject events which are too largeDaniel Wagner-Hall2015-10-222-1/+30
* | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-10-237-12/+48
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix receipts for room initial syncErik Johnston2015-10-221-7/+1
| * | | Add config option to disable password loginErik Johnston2015-10-225-4/+46
| * | | Bump versionErik Johnston2015-10-151-1/+1
* | | | Merge pull request #325 from matrix-org/markjh/filter_dictsMark Haines2015-10-221-3/+22
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't assume that the event has a room_id or senderMark Haines2015-10-221-2/+2
| * | | Support filtering events represented as dicts.Mark Haines2015-10-221-3/+22
| * | | Merge pull request #319 from matrix-org/erikj/filter_refactorErik Johnston2015-10-222-99/+61
| |\ \ \
* | | | | Actually filter resultsErik Johnston2015-10-221-3/+5
* | | | | RenameErik Johnston2015-10-221-3/+3
* | | | | LESS THANErik Johnston2015-10-221-1/+2
* | | | | Use namedtuple as return valueErik Johnston2015-10-222-4/+18
* | | | | Limit max number of SQL varsErik Johnston2015-10-221-4/+6
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-225-25/+208
|\| | | |
| * | | | Merge pull request #320 from matrix-org/appservice-retry-capErik Johnston2015-10-221-2/+2
| |\ \ \ \
| | * | | | Cap the time to retry txns to appservices to 8.5 minutesKegan Dougal2015-10-211-2/+2
| * | | | | Merge branch 'develop' into markjh/v2_sync_typingMark Haines2015-10-2124-212/+896
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #316 from matrix-org/markjh/v2_sync_archivedMark Haines2015-10-213-9/+163
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Include banned rooms in the archived section of v2 syncMark Haines2015-10-212-8/+11
| | | * | | | Fix pep8Mark Haines2015-10-191-1/+0
| | | * | | | Add rooms that the user has left under archived in v2 sync.Mark Haines2015-10-193-9/+161
| | * | | | | Merge pull request #318 from matrix-org/syn-502-login-bad-emailsKegsay2015-10-211-0/+2
| | |\ \ \ \ \
| | | * | | | | Use 403 and message to match handlers/authKegan Dougal2015-10-211-3/+1
| | | * | | | | Don't 500 when the email doesn't map to a valid user ID.Kegan Dougal2015-10-201-0/+4
| | | | |/ / / | | | |/| | |
| * | | | | | 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
| | |_|/ / / | |/| | | |
* | | | | | PEP8Erik Johnston2015-10-221-1/+2
* | | | | | Move FTS to delta 25Erik Johnston2015-10-222-3/+3
* | | | | | Filter room ids before hitting the databaseErik Johnston2015-10-212-1/+21
* | | | | | Filter search resultsErik Johnston2015-10-211-2/+7
| |_|_|/ / |/| | | |
* | | | | DocstringErik Johnston2015-10-201-0/+5
* | | | | Refactor api.filtering to have a Filter APIErik Johnston2015-10-202-100/+57
| |/ / / |/| | |
* | | | Allow rejecting invitesDaniel Wagner-Hall2015-10-207-91/+351
| |/ / |/| |
* | | Merge pull request #312 from matrix-org/daniel/3pidinvitesDaniel Wagner-Hall2015-10-192-8/+15
|\ \ \
| * | | Stuff signed data in a standalone objectDaniel Wagner-Hall2015-10-162-8/+15
* | | | Merge pull request #307 from matrix-org/erikj/searchErik Johnston2015-10-1910-2/+365
|\ \ \ \
| * | | | Explicitly check for Sqlite3EngineErik Johnston2015-10-161-2/+5
| * | | | TypingErik Johnston2015-10-161-2/+2
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-1613-25/+393
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 07:28:07 +0000