summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Run sytests on jenkinsDaniel Wagner-Hall2015-11-161-1/+22
|
* Output results files on jenkinsDaniel Wagner-Hall2015-11-162-4/+18
| | | | | | | Outputs: * results.xml * coverage.xml * violations.flake8.log
* Merge pull request #376 from matrix-org/daniel/jenkinsDaniel Wagner-Hall2015-11-163-1/+9
|\ | | | | Pull out jenkins script into a checked in script
| * Pull out jenkins script into a checked in scriptDaniel Wagner-Hall2015-11-133-1/+9
| |
* | Merge pull request #377 from matrix-org/paul/tiny-fixesPaul Evans2015-11-131-0/+6
|\ \ | |/ |/| Don't complain if /make_join response lacks 'prev_state' list (SYN-517)
| * Don't complain if /make_join response lacks 'prev_state' list (SYN-517)Paul "LeoNerd" Evans2015-11-131-0/+6
| |
| * Merge branch 'develop' into paul/tiny-fixesPaul "LeoNerd" Evans2015-11-13100-1036/+3170
| |\ | |/ |/|
* | Merge pull request #374 from matrix-org/daniel/guestleaveDaniel Wagner-Hall2015-11-131-3/+14
|\ \ | | | | | | Allow guests to /room/:room_id/{join,leave}
| * | Allow guests to /room/:room_id/{join,leave}Daniel Wagner-Hall2015-11-131-3/+14
|/ /
* | Implementation of state rollback in /syncRichard van der Hoff2015-11-132-4/+69
| | | | | | | | | | | | | | Implementation of SPEC-254: roll back the state dictionary to how it looked at the start of the timeline. Merged PR https://github.com/matrix-org/synapse/pull/373
* | Fix a few race conditions in the state calculationRichard van der Hoff2015-11-132-60/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be a bit more careful about how we calculate the state to be returned by /sync. In a few places, it was possible for /sync to return slightly later state than that represented by the next_batch token and the timeline. In particular, the following cases were susceptible: * On a full state sync, for an active room * During a per-room incremental sync with a timeline gap * When the user has just joined a room. (Refactor check_joined_room to make it less magical) Also, use store.get_state_for_events() (and thus the existing stategroups) to calculate the state corresponding to a particular sync position, rather than state_handler.compute_event_context(), which recalculates from first principles (and tends to miss some state). Merged from PR https://github.com/matrix-org/synapse/pull/372
* | Make handlers.sync return a state dictionary, instead of an event list.Richard van der Hoff2015-11-132-32/+40
| | | | | | | | | | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371
* | Update some commentsRichard van der Hoff2015-11-134-14/+98
| | | | | | | | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370.
* | Merge pull request #369 from matrix-org/daniel/guestnoneventsDaniel Wagner-Hall2015-11-122-3/+20
|\ \ | | | | | | Return non-room events from guest /events calls
| * | Return non-room events from guest /events callsDaniel Wagner-Hall2015-11-122-3/+20
| | |
* | | Merge pull request #368 from matrix-org/erikj/fix_federation_profileErik Johnston2015-11-123-6/+13
|\ \ \ | | | | | | | | Fix missing profile data in federation joins
| * | | Fix missing profile data in federation joinsErik Johnston2015-11-123-6/+13
| |/ / | | | | | | | | | | | | There was a regression where we stopped including profile data in initial joins for rooms joined over federation.
* | | Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_fasterErik Johnston2015-11-121-3/+14
|\ \ \ | |/ / |/| | Use a (hopefully) more efficient SQL query for doing recency based room search
| * | 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-122-5/+104
| | | | | | | | | | | | | | | | | | | | | | | | Changes to m.room.power_levels events are supposed to be handled at a high priority; however a typo meant that the relevant bit of code was never executed, so they were handled just like any other state change - which meant that a bad person could cause room state changes by forking the graph from a point in history when they were allowed to do so.
* | | Merge pull request #367 from matrix-org/daniel/readafterleaveDaniel Wagner-Hall2015-11-121-10/+11
|\ \ \ | | | | | | | | | | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions
| * | | Tweak guest access permissionsDaniel Wagner-Hall2015-11-121-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | * Allow world_readable rooms to be read by guests who have joined and left * Allow regular users to access world_readable rooms
* | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsyncDaniel Wagner-Hall2015-11-122-24/+34
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync
| * | | Allow guest access to room initialSyncDaniel Wagner-Hall2015-11-112-24/+34
| | | |
* | | | Fix bug where assumed dict was namedtupleErik Johnston2015-11-121-1/+1
| |/ / |/| |
* | | Merge pull request #364 from matrix-org/daniel/guestdisplaynamesDaniel Wagner-Hall2015-11-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | Allow guests to set their display names Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66
| * | | Allow guests to set their display namesDaniel Wagner-Hall2015-11-121-1/+1
|/ / / | | | | | | | | | | | | Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66
* | | Merge pull request #363 from matrix-org/daniel/guestscanjoinDaniel Wagner-Hall2015-11-121-12/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | Consider joined guest users as joined users Otherwise they're inconveniently allowed to write events to the room but not to read them from the room.
| * | | Consider joined guest users as joined usersDaniel Wagner-Hall2015-11-121-12/+21
|/ / / | | | | | | | | | | | | Otherwise they're inconveniently allowed to write events to the room but not to read them from the room.
* | | Merge pull request #362 from matrix-org/daniel/raceyraceyfunfunDaniel Wagner-Hall2015-11-121-1/+5
|\ \ \ | | | | | | | | Fix race creating directories
| * | | Fix race creating directoriesDaniel Wagner-Hall2015-11-121-1/+5
|/ / /
* | | Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into developErik Johnston2015-11-112-1/+17
|\ \ \
| * | | Update date v0.11.0-rc1Erik Johnston2015-11-111-1/+1
| | | |
| * | | Update CHANGESErik Johnston2015-11-111-1/+1
| | | |
| * | | 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 API
| * | | | 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-1124-141/+738
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #359 from matrix-org/markjh/incremental_indexingErik Johnston2015-11-118-77/+492
|\ \ \ \ | |/ / / |/| | | Incremental background updates for db indexes
| * | | 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
| | | |
| * | | Test for background updatesMark Haines2015-11-102-0/+79
| | | |
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The progress for each background update is stored as a JSON blob in the database. Each background update is broken up into separate batches. The batch size is automatically tuned to try avoid blocking single threaded databases for too long.
* | | | Merge pull request #358 from matrix-org/daniel/publicwritableDaniel Wagner-Hall2015-11-114-29/+71
|\ \ \ \ | | | | | | | | | | Return world_readable and guest_can_join in /publicRooms
| * | | | Return world_readable and guest_can_join in /publicRoomsDaniel Wagner-Hall2015-11-104-29/+71
|/ / / /
* | | | Merge pull request #355 from matrix-org/daniel/anonymouswritingDaniel Wagner-Hall2015-11-107-12/+92
|\ \ \ \ | | | | | | | | | | Allow guest users to join and message rooms
| * | | | 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 client
| * | | | Get display name from identity server, not clientDaniel Wagner-Hall2015-11-092-7/+4
| |/ / /
* | | | Merge pull request #357 from matrix-org/rav/SYN-516Mark Haines2015-11-091-4/+12
|\ \ \ \ | | | | | | | | | | Don't fiddle with results returned by event sources
| * | | | Don't fiddle with results returned by event sourcesRichard van der Hoff2015-11-091-4/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | Overwriting hashes returned by other methods is poor form. Fixes: SYN-516
* | | | Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-092-1/+57
| | | | | | | | | | | | | | | | ... merely because I was trying to figure out how it worked, and couldn't.
* | | | Merge pull request #354 from matrix-org/markjh/SYN-513Mark Haines2015-11-092-3/+2
|\ \ \ \ | | | | | | | | | | SYN-513: Include updates for rooms that have had all their tags deleted
| * \ \ \ Merge branch 'develop' into markjh/SYN-513Mark Haines2015-11-091-1/+1
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: synapse/storage/tags.py
* | | | | 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 ↵Matthew Hodgson2015-11-061-1/+2
| |/ / / |/| | | | | | | | | | | testing against vector
| * | | SYN-513: Include updates for rooms that have had all their tags deletedMark Haines2015-11-092-2/+2
|/ / /
* | | Merge pull request #353 from matrix-org/daniel/oopsDaniel Wagner-Hall2015-11-061-1/+0
|\ \ \ | | | | | | | | Remove accidentally added ID column
| * | | Remove accidentally added ID columnDaniel Wagner-Hall2015-11-061-1/+0
|/ / /
* | | remove references to matrix.org/betaMatthew Hodgson2015-11-061-7/+7
| | |
| * | Remove anonymous access, since its not ready yetErik Johnston2015-11-051-2/+1
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0Erik Johnston2015-11-0514-190/+249
| |\ \ | |/ / |/| |
* | | Merge pull request #350 from matrix-org/erikj/searchErik Johnston2015-11-053-36/+288
|\ \ \ | | | | | | | | Implement pagination, order by and groups in search
| * | | 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 #351 from matrix-org/daniel/fixtoxDaniel Wagner-Hall2015-11-051-3/+4
|\ \ \ \ | | | | | | | | | | Fix tox config after fa1cf5ef34
| * | | | Fix tox config after fa1cf5ef34Daniel Wagner-Hall2015-11-051-3/+4
|/ / / /
* | | | Merge pull request #340 from matrix-org/erikj/server_retriesErik Johnston2015-11-052-4/+13
|\ \ \ \ | | | | | | | | | | Retry dead servers a lot less often
| * | | | Retry dead servers a lot less oftenErik Johnston2015-11-022-4/+13
| | | | |
| | | * | Add PRErik Johnston2015-11-051-1/+1
| | | | |
| | | * | Bump changelog and version numberErik Johnston2015-11-052-1/+18
| | |/ /
| | * | 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-0567-491/+853
| | |\ \ | |_|/ / |/| | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-11-0555-490/+572
|\ \ \ \
| * | | | Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-0520-82/+299
| | | | | | | | | | | | | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents
| * | | | 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
| | * | | | Remove fields that are both unspecified and unused from the filter checks, ↵Mark Haines2015-11-041-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | check the right top level definitions in the filter
| * | | | | 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 branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-11-0512-1/+281
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into ↵Erik Johnston2015-10-260-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | release-v0.10.1
| | * \ \ \ Merge pull request #330 from matrix-org/erikj/login_fallbackErik Johnston2015-10-265-0/+280
| | |\ \ \ \ | | | | | | | | | | | | | | Add login fallback
| | * \ \ \ \ Merge pull request #329 from matrix-org/erikj/staticErik Johnston2015-10-267-1/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Move static folder into synapse
| * | | | | | | 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/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because otherwise it won't get picked up by python packaging. This also fixes the problem where the "static" folder was found if synapse wasn't started from that directory.
| | | * | 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
|\ \ \ \ | | | | | | | | | | 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 branch 'develop' into paul/tiny-fixesPaul "LeoNerd" Evans2015-11-0346-288/+1802
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | 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
| | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-27 19:25:19 +0000