summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Allow hs to do CAS login completely and issue the client with a login token ↵Steven Hammerton2015-11-053-5/+218
| | | | that can be redeemed for the usual successful login response
* Add service URL to CAS configSteven Hammerton2015-11-041-0/+3
|
* Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-11-0412-231/+7
|\
| * Merge pull request #339 from matrix-org/daniel/removesomeliesDaniel Wagner-Hall2015-11-048-42/+7
| |\ | | | | | | Remove unused arguments and code
| | * Merge branch 'develop' into daniel/removesomeliesMark Haines2015-11-0420-270/+579
| | |\ | | |/ | |/| | | | | | | Conflicts: synapse/notifier.py
| * | Merge pull request #346 from matrix-org/markjh/remove_lock_managerMark Haines2015-11-044-189/+0
| |\ \ | | | | | | | | Remove the LockManager class because it wasn't being used
| | * | Remove the LockManager class because it wasn't being usedMark Haines2015-11-044-189/+0
| |/ /
| | * Remove more unused parametersDaniel Wagner-Hall2015-11-026-13/+2
| | |
| | * Remove unused arguments and codeDaniel Wagner-Hall2015-11-023-29/+5
| | |
* | | Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-0433-167/+272
|/ / | | | | | | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.
* | Merge pull request #341 from matrix-org/markjh/v2_sync_receiptsMark Haines2015-11-031-15/+30
|\ \ | | | | | | Include read receipts in v2 sync
| * \ Merge branch 'develop' into markjh/v2_sync_receiptsMark Haines2015-11-0314-25/+524
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py
| * | | 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
|\ \ \ | |_|/ |/| | Fix broken cache for getting retry times.
| * | Don't rearrange transaction_queueErik Johnston2015-11-031-12/+11
| | |
| * | Fix broken cache for getting retry times. This meant we retried remote ↵Erik Johnston2015-11-032-55/+40
| |/ | | | | | | destinations way more frequently than we should
* | Merge pull request #335 from matrix-org/markjh/room_tagsMark Haines2015-11-0314-26/+525
|\ \ | |/ |/| Add APIs for adding and removing tags from rooms
| * 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-0211-30/+339
| |\
| * | Support clients supplying older tokens, fix short poll testMark Haines2015-10-302-3/+3
| | |
| * | 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
| | |
* | | Merge pull request #338 from matrix-org/daniel/fixdbErik Johnston2015-11-021-1/+1
|\ \ \ | |_|/ |/| | Add missing column
| * | Add missing columnDaniel Wagner-Hall2015-10-301-1/+1
|/ /
* | Merge pull request #337 from matrix-org/markjh/v2_sync_joiningMark Haines2015-10-303-5/+9
|\ \ | | | | | | Don't mark newly joined room timelines as limited in an incremental sync
| * | Update the other place check_joined_room is calledMark Haines2015-10-303-2/+4
| | |
| * | 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 results
| * | Optionally return event contexts with search resultsErik Johnston2015-10-281-1/+52
| | |
| * | Merge branch 'erikj/context_api' into erikj/searchErik Johnston2015-10-2817-21/+354
| |\ \
* | \ \ Merge pull request #334 from matrix-org/erikj/context_apiErik Johnston2015-10-284-2/+229
|\ \ \ \ | | |/ / | |/| | Add room context api
| * | | 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 sync
| * | | Implement full_state incremental syncRichard van der Hoff2015-10-262-19/+38
| | |/ | |/| | | | | | | | | | | | | | | | | | | A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation.
* | | Merge pull request #331 from matrix-org/rav/500_on_missing_sigilRichard van der Hoff2015-10-272-3/+8
|\ \ \ | |/ / |/| | Fix a 500 error resulting from empty room_ids
| * | Fix a 500 error resulting from empty room_idsRichard van der Hoff2015-10-262-3/+8
|/ / | | | | | | | | POST /_matrix/client/api/v1/rooms//send/a.b.c gave a 500 error, because we assumed that rooms always had at least one character.
* | Merge pull request #328 from matrix-org/erikj/searchErik Johnston2015-10-261-14/+17
|\| | | | | Pull out sender when computing search results
| * 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 FTS
| * 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 large
| * | Reject events which are too largeDaniel Wagner-Hall2015-10-222-1/+30
| | | | | | | | | | | | SPEC-222
* | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-10-238-12/+65
|\ \ \
| * | | Fix receipts for room initial syncErik Johnston2015-10-221-7/+1
| | | |
| * | | Merge pull request #322 from matrix-org/erikj/password_configErik Johnston2015-10-225-4/+46
| |\ \ \ | | | | | | | | | | Add config option to disable password login
| | * | | Add config option to disable password loginErik Johnston2015-10-225-4/+46
| |/ / /
| * | | Reorder changelog v0.10.1-rc1Erik Johnston2015-10-161-6/+7
| | | |
| * | | Update change logErik Johnston2015-10-151-0/+16
| | | |
| * | | Bump versionErik Johnston2015-10-151-1/+1
| | | |
* | | | Merge pull request #325 from matrix-org/markjh/filter_dictsMark Haines2015-10-221-3/+22
|\ \ \ \ | | | | | | | | | | Support filtering events represented as dicts.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | This is useful because the emphemeral events such as presence and typing are represented as dicts inside synapse.
* | | | | Merge pull request #324 from matrix-org/erikj/searchErik Johnston2015-10-225-16/+61
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Add filters to search.
| * | | 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-220-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #319 from matrix-org/erikj/filter_refactorErik Johnston2015-10-223-125/+92
|\ \ \ \ | | | | | | | | | | Refactor api.filtering to have a Filter API
| | * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-228-27/+329
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | 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 minutes
| * | | | | Cap the time to retry txns to appservices to 8.5 minutesKegan Dougal2015-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's been numerous issues with people playing around with their application service and then not receiving events from their HS for ages due to backoff timers reaching crazy heights (albeit capped at < 1 day). Reduce the max time between pokes to be 8.5 minutes (2^9 secs) which is quick enough for people to wait it out (avg wait time being 4.25 min) but long enough to actually give the AS breathing room if it needs it.
* | | | | | Merge pull request #314 from matrix-org/paul/event-redactionMark Haines2015-10-222-0/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add some unit tests of prune_events()
| * | | | | | Add some unit tests of prune_events()Paul "LeoNerd" Evans2015-10-162-0/+115
| | | | | | |
* | | | | | | Don't keep appending report_stats to demo configErik Johnston2015-10-221-2/+6
| | | | | | |
* | | | | | | Merge pull request #321 from matrix-org/markjh/v2_sync_typingMark Haines2015-10-211-14/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Include typing events in initial v2 sync
| * \ \ \ \ \ \ Merge branch 'develop' into markjh/v2_sync_typingMark Haines2015-10-2127-214/+1027
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py
* | | | | | | | Merge pull request #316 from matrix-org/markjh/v2_sync_archivedMark Haines2015-10-213-9/+163
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Add rooms that the user has left under archived in v2 sync.
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't 500 on /login when the email doesn't map to a valid user ID.
| * | | | | | | | 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
| | | | | | |
| | | | | * | Merge branch 'erikj/filter_refactor' into erikj/searchErik Johnston2015-10-2019-329/+597
| | | | | |\ \ | | | | | |/ / | | | | |/| |
| | | | * | | DocstringErik Johnston2015-10-201-0/+5
| | | | | | |
| | | | * | | Refactor api.filtering to have a Filter APIErik Johnston2015-10-203-126/+88
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-10-202-0/+129
|\| | | | |
| * | | | | Merge pull request #315 from matrix-org/paul/test-vectorsPaul Evans2015-10-192-0/+129
| |\ \ \ \ \ | | | | | | | | | | | | | | Repeatable unit test of event hashing/signing algorithm
| | * | | | | Invoke EventBuilder directly instead of going via the EventBuilderFactoryPaul "LeoNerd" Evans2015-10-191-35/+3
| | | | | | |
| | * | | | | Capture __init__.pyPaul "LeoNerd" Evans2015-10-191-0/+15
| | | | | | |
| | * | | | | Use assertIn() instead of assertTrue on the 'in' operatorPaul "LeoNerd" Evans2015-10-191-6/+6
| | | | | | |
| | * | | | | Another signing test vector using an 'm.room.message' with content, so that ↵Paul "LeoNerd" Evans2015-10-191-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the implementation will have to redact it
| | * | | | | Initial minimial hack at a test of event hashing and signingPaul "LeoNerd" Evans2015-10-191-0/+98
| | | |/ / / | | |/| | |
* | / | | | Allow rejecting invitesDaniel Wagner-Hall2015-10-208-93/+353
|/ / / / / | | | | | | | | | | | | | | | | | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave.
* | | | | Merge pull request #312 from matrix-org/daniel/3pidinvitesDaniel Wagner-Hall2015-10-192-8/+15
|\ \ \ \ \ | | | | | | | | | | | | Stuff signed data in a standalone object
| * | | | | Stuff signed data in a standalone objectDaniel Wagner-Hall2015-10-162-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes both generating it in sydent, and verifying it here, simpler at the cost of some repetition
* | | | | | Merge pull request #307 from matrix-org/erikj/searchErik Johnston2015-10-1910-2/+365
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | Add basic search API
| * | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-161-2/+2
| |\ \ \ \ \ \
| * | | | | | | Explicitly check for Sqlite3EngineErik Johnston2015-10-161-2/+5
| | | | | | | |
| * | | | | | | docstringErik Johnston2015-10-161-0/+10
| | | | | | | |
| * | | | | | | Add docstringErik Johnston2015-10-161-0/+11
| | | | | | | |
| * | | | | | | Comment on the LIMIT 500Erik Johnston2015-10-161-0/+2
| | | | | | | |
| * | | | | | | Split up run_upgradeErik Johnston2015-10-161-5/+11
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-157-171/+294
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Remove unused constatnsErik Johnston2015-10-141-19/+0
| | | | | | | |
| * | | | | | | Make 'keys' optionalErik Johnston2015-10-141-1/+3
| | | | | | | |
| * | | | | | | Fix to work with SQLiteErik Johnston2015-10-141-4/+11
| | | | | | | |
| * | | | | | | More TODO markersErik Johnston2015-10-141-0/+3
| | | | | | | |
| * | | | | | | Add TODO markersErik Johnston2015-10-141-1/+4
| | | | | | | |
| * | | | | | | Add paranoia limitErik Johnston2015-10-131-1/+1
| | | | | | | |
| * | | | | | | Remove constraints in preperation of using filtersErik Johnston2015-10-132-71/+20
| | | | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/searchErik Johnston2015-10-132-24/+50
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'erikj/store_engine' into erikj/searchErik Johnston2015-10-136-5/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add SQLite supportErik Johnston2015-10-131-5/+12
| | | | | | | | | |
| * | | | | | | | | Merge branch 'erikj/store_engine' into erikj/searchErik Johnston2015-10-139-409/+464
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Search left rooms tooErik Johnston2015-10-131-5/+2
| | | | | | | | | | |
| * | | | | | | | | | Add sqlite schemaErik Johnston2015-10-131-5/+64
| | | | | | | | | | |
| * | | | | | | | | | Filter events to only thsoe that the user is allowed to seeErik Johnston2015-10-122-13/+17
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into erikj/searchErik Johnston2015-10-1211-65/+258
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unused room_id parameterErik Johnston2015-10-125-14/+61
| | | | | | | | | | | |
| * | | | | | | | | | | PEP8Erik Johnston2015-10-121-2/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Keep FTS indexes up to date. Only search through rooms currently joinedErik Johnston2015-10-126-12/+55
| | | | | | | | | | | |
| * | | | | | | | | | | Add basic full text search impl.Erik Johnston2015-10-098-1/+268
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #313 from matrix-org/paul/tiny-fixesPaul Evans2015-10-161-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Surely we don't need to preserve 'events_default' twice
| * | | | | | | | | | | | Surely we don't need to preserve 'events_default' twicePaul "LeoNerd" Evans2015-10-161-1/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #306 from matrix-org/markjh/unused_methodsMark Haines2015-10-162-101/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Remove some login classes from synapse.
| * | | | | | | | | | | synapse.client.v1.login.LoginFallbackRestServlet and ↵Mark Haines2015-10-151-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse.client.v1.login.PasswordResetRestServlet are unused
| * | | | | | | | | | | synapse.util.emailutils was unusedMark Haines2015-10-151-71/+0
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #310 from matrix-org/markjh/bcrypt_roundsMark Haines2015-10-162-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Add config for how many bcrypt rounds to use for password hashes
| * | | | | | | | | | Add config for how many bcrypt rounds to use for password hashesMark Haines2015-10-162-1/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default we leave it at the default value of 12. But now we can reduce it for preparing users for loadtests or running integration tests.
* | | | | | | | | | Merge pull request #311 from matrix-org/markjh/postgres_fixesErik Johnston2015-10-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix FilteringStore.get_user_filter to work with postgres
| * | | | | | | | | | Fix FilteringStore.get_user_filter to work with postgresMark Haines2015-10-161-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #302 from matrix-org/daniel/3pidinvitesDaniel Wagner-Hall2015-10-1612-24/+392
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | Implement third party identifier invites
| * | | | | | | | Add signing host and keyname to signaturesDaniel Wagner-Hall2015-10-162-6/+10
| | | | | | | | |
| * | | | | | | | Verify third party ID server certificatesDaniel Wagner-Hall2015-10-164-9/+43
| | | | | | | | |
| * | | | | | | | Use non-placeholder name for endpointDaniel Wagner-Hall2015-10-151-1/+1
| | | | | | | | |
| * | | | | | | | Look for keys on the right objectsDaniel Wagner-Hall2015-10-153-4/+6
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-1517-588/+758
| |\| | | | | | |
| * | | | | | | | Use more descriptive error codeDaniel Wagner-Hall2015-10-131-1/+1
| | | | | | | | |
| * | | | | | | | Remove unnecessary class-wrappingDaniel Wagner-Hall2015-10-138-91/+94
| | | | | | | | |
| * | | | | | | | Move logic into handlerDaniel Wagner-Hall2015-10-132-115/+150
| | | | | | | | |
| * | | | | | | | Add loggingDaniel Wagner-Hall2015-10-131-2/+2
| | | | | | | | |
| * | | | | | | | Re-add accidentally removed codeDaniel Wagner-Hall2015-10-131-1/+1
| | | | | | | | |
| * | | | | | | | Add some docstringDaniel Wagner-Hall2015-10-131-0/+15
| | | | | | | | |
| * | | | | | | | Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-137-21/+35
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-1311-65/+292
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Remove merge thinkoDaniel Wagner-Hall2015-10-061-4/+0
| | | | | | | | | |
| * | | | | | | | | Add third party invites to auth_events for joinsDaniel Wagner-Hall2015-10-061-0/+5
| | | | | | | | | |
| * | | | | | | | | Fix lint errorsDaniel Wagner-Hall2015-10-062-4/+4
| | | | | | | | | |
| * | | | | | | | | Revert "Revert "Merge pull request #283 from ↵Daniel Wagner-Hall2015-10-061-76/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
| * | | | | | | | | Merge branch 'daniel/useragent' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-061-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'daniel/useragent' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-052-6/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"Daniel Wagner-Hall2015-10-051-131/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing changes made to b43930d4c9479973fb7225818e2e51bec022c4e6.
| * | | | | | | | | | | | Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-0510-83/+218
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-0111-19/+275
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #309 from matrix-org/erikj/_filter_events_for_clientErik Johnston2015-10-163-97/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | Amalgamate _filter_events_for_client
| * | | | | | | | | | | | | Amalgamate _filter_events_for_clientErik Johnston2015-10-163-97/+51
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #308 from matrix-org/markjh/v2_filter_encodingMark Haines2015-10-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Encode the filter JSON as UTF-8 before storing in the database.
| * | | | | | | | | | | | Encode the filter JSON as UTF-8 before storing in the database.Mark Haines2015-10-161-2/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we are using a binary column type to store the filter JSON.
* | | | | | | | | | | | Merge pull request #305 from matrix-org/markjh/v2_sync_apiMark Haines2015-10-143-170/+211
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update the v2 sync API to work as specified in the current spec.
| * | | | | | | | | | | | Fix v2 sync pollingMark Haines2015-10-141-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-149-382/+485
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add a get_invites_for_user method to the storage to find out the rooms a ↵Mark Haines2015-10-132-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user is invited to
| * | | | | | | | | | | | | Include invites in incremental syncMark Haines2015-10-132-7/+26
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Include invited rooms in the initial syncMark Haines2015-10-132-11/+26
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'develop' into markjh/v2_sync_apiMark Haines2015-10-1311-34/+242
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Start spliting out the rooms into joined and invited in v2 syncMark Haines2015-10-132-27/+49
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update the filters to match the latest spec.Mark Haines2015-10-124-42/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response.
| * | | | | | | | | | | | | Merge branch 'markjh/presence_races' into markjh/v2_sync_apiMark Haines2015-10-091-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Set the user as online if they start polling the v2 syncMark Haines2015-10-091-3/+11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_apiMark Haines2015-10-0911-123/+272
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Format the presence events correctly for v2Mark Haines2015-10-091-3/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update the v2 room sync format to match the current v2 specMark Haines2015-10-082-21/+18
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update the sync response to match the latest specMark Haines2015-10-071-24/+22
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Move the rooms out into a room_map mapping from room_id to room.Mark Haines2015-10-053-32/+47
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Start updating the sync API to match the specificationMark Haines2015-10-013-90/+54
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #304 from matrix-org/erikj/remove_unused_argErik Johnston2015-10-144-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | Remove unused room_id arg
| * | | | | | | | | | | | | | Remove unused room_id argErik Johnston2015-10-144-12/+12
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #303 from matrix-org/markjh/twisted_debuggingMark Haines2015-10-134-1/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | Bounce all deferreds through the reactor to make debugging easier.
| * | | | | | | | | | | | | Enable stack traces for the demo scriptsMark Haines2015-10-131-0/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Only turn on the twisted deferred debugging if full_twisted_stacktraces is ↵Mark Haines2015-10-132-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set in the config
| * | | | | | | | | | | | | Fix pep8 warnings.Mark Haines2015-10-131-8/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Bounce all deferreds through the reactor to make debugging easier.Mark Haines2015-10-132-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If all deferreds wait a reactor tick before resolving then there is always a chance to add an errback to the deferred so that stacktraces get reported, rather than being discarded.
* | | | | | | | | | | | | | Merge pull request #301 from matrix-org/markjh/v2_filteringErik Johnston2015-10-132-24/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Update the v2 filters to support filtering presence.
| * | | | | | | | | | | | | update filtering testsMark Haines2015-10-131-6/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update the v2 filters to support filtering presence and remove support for ↵Mark Haines2015-10-131-18/+44
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public/private user data
* | | | | | | | | | | | | Merge pull request #300 from matrix-org/erikj/store_engineErik Johnston2015-10-136-381/+402
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | Split out the schema preparation and update logic into its own module
| * | | | | | | | | | | rename schema_prepare to prepare_databaseErik Johnston2015-10-135-4/+4
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Expose error more nicelyErik Johnston2015-10-136-9/+5
| | | | | | | | | | |
| * | | | | | | | | | Split out the schema preparation and update logic into its own moduleErik Johnston2015-10-134-377/+402
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #299 from stevenhammerton/sh-cas-required-attributeErik Johnston2015-10-122-27/+61
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | SH CAS Required Attribute
| * | | | | | | | | Add a comment to clarify why we split on closing curly brace when reading ↵Steven Hammerton2015-10-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CAS attribute tags
| * | | | | | | | | Unpack dictionary in for loop for nicer syntaxSteven Hammerton2015-10-121-4/+4
| | | | | | | | | |
| * | | | | | | | | Default cas_required_attributes to empty dictionarySteven Hammerton2015-10-121-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove not required parenthesisSteven Hammerton2015-10-121-1/+1
| | | | | | | | | |
| * | | | | | | | | Support multiple required attributes in CAS response, and in a nicer config ↵Steven Hammerton2015-10-122-22/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format too
| * | | | | | | | | Allow optional config params for a required attribute and it's value, if ↵Steven Hammerton2015-10-122-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified any CAS user must have the given attribute and the value must equal
| * | | | | | | | | Parse both user and attributes from CAS responseSteven Hammerton2015-10-121-26/+38
| | | | | | | | | |
* | | | | | | | | | Merge pull request #296 from matrix-org/markjh/eventstream_presenceMark Haines2015-10-121-35/+52
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Split the sections of EventStreamHandler.get_stream that handle presence
| * | | | | | | | | Split the sections of EventStreamHandler.get_stream that handle presenceMark Haines2015-10-091-35/+52
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into separate functions. This makes the code a bit easier to read, and means that we can reuse the logic when implementing the v2 sync API.
* | | | | | | | | 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…
| * | | | | | | Fix some races in the synapse presence handler caused by not yielding on ↵Mark Haines2015-10-091-3/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | deferreds
* | | | | | | add steve to authorsMatthew Hodgson2015-10-101-1/+4
| | | | | | |
* | | | | | | Fix previous merge to s/version_string/user_agent/Erik Johnston2015-10-101-2/+2
| | | | | | |
* | | | | | | Merge pull request #295 from stevenhammerton/sh-cas-authErik Johnston2015-10-105-21/+184
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Provide ability to login using CAS
| * | | | | | | Raise LoginError if CasResponse doensn't contain userSteven Hammerton2015-10-101-1/+1
| | | | | | | |
| * | | | | | | Fix my broken line splittingSteven Hammerton2015-10-101-4/+6
| | | | | | | |
| * | | | | | | Use UserId to create FQ user idSteven Hammerton2015-10-101-1/+1
| | | | | | | |
| * | | | | | | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than ↵Steven Hammerton2015-10-102-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests
| * | | | | | | Formatting changesSteven Hammerton2015-10-102-6/+14
| | | | | | | |
| * | | | | | | Provide ability to login using CASSteven Hammerton2015-10-104-2/+135
|/ / / / / / /
* | | | | | | Merge pull request #294 from matrix-org/markjh/initial_sync_archived_flagMark Haines2015-10-092-6/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a flag to initial sync to include we want rooms that the user has left
| * | | | | | | Use 'true' rather than '1' for archived flagMark Haines2015-10-081-1/+1
| | | | | | | |
| * | | | | | | Add a flag to initial sync to indicate we want rooms that the user has leftMark Haines2015-10-082-6/+11
| |/ / / / / /
* | | | | | / Use raw string for regex here, otherwise \b is the backspace character. ↵David Baker2015-10-081-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Fixes displayname matching.
* | | | | | Merge pull request #292 from matrix-org/daniel/useragentDaniel Wagner-Hall2015-10-062-6/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | Allow synapse's useragent to be customized
| * | | | | Use space not dash as delimiterDaniel Wagner-Hall2015-10-061-1/+1
| | | | | |
| * | | | | Use space not dash as delimiterDaniel Wagner-Hall2015-10-061-1/+1
| | | | | |
| * | | | | Merge branch 'develop' into daniel/useragentDaniel Wagner-Hall2015-10-0610-88/+220
| |\| | | | | | |_|_|/ | |/| | |
| * | | | Preserve version string in user agentDaniel Wagner-Hall2015-10-052-4/+4
| | | | |
| * | | | Allow synapse's useragent to be customizedDaniel Wagner-Hall2015-10-022-6/+10
| | |/ / | |/| | | | | | | | | | | | | | This will allow me to write tests which verify which server made HTTP requests in a federation context.
* | | | Merge pull request #293 from matrix-org/markjh/remove_spamy_error_loggingMark Haines2015-10-061-1/+0
|\ \ \ \ | |_|/ / |/| | | Remove log line that was generated whenever an error was created.
| * | | Remove log line that was generated whenever an error was created. We are now ↵Mark Haines2015-10-061-1/+0
|/ / / | | | | | | | | | creating error objects that aren't raised so it's probably a bit too confusing to keep
* | / Explicitly add Create event as auth eventErik Johnston2015-10-021-2/+3
| |/ |/|
* | Add 'trusted_private_chat' to room creation presetsErik Johnston2015-10-022-0/+6
| |
* | Merge pull request #275 from matrix-org/erikj/invite_stateErik Johnston2015-10-023-5/+34
|\ \ | | | | | | Bundle in some room state in invites.
| * | Also bundle in senderErik Johnston2015-10-021-0/+1
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_stateErik Johnston2015-09-2552-266/+1142
| |\ \
| * | | Bundle in some room state in the unsigned bit of the invite when sending to ↵Erik Johnston2015-09-104-7/+35
| | | | | | | | | | | | | | | | invited servers
* | | | Merge pull request #279 from matrix-org/erikj/unfederatableErik Johnston2015-10-023-4/+32
|\ \ \ \ | | | | | | | | | | Add flag which disables federation of the room
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-0262-947/+1423
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #283 from matrix-org/erikj/atomic_join_federationErik Johnston2015-10-021-76/+131
|\ \ \ \ \ | | | | | | | | | | | | Atomically persist events when joining a room over federation/
| * | | | | CommentErik Johnston2015-09-301-0/+8
| | | | | |
| * | | | | Rename varErik Johnston2015-09-301-3/+3
| | | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-09-170-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | erikj/atomic_join_federation
| * | | | | | Revert change of scripts/check_auth.pyErik Johnston2015-09-171-1/+1
| | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 20:42:24 +0000