summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli...Erik Johnston2015-01-3052-333/+2390
|\
| * Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej...Erik Johnston2015-01-300-0/+0
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolu...Erik Johnston2015-01-30125-2084/+3048
| | |\
| * | \ Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-30125-2083/+3034
| |\ \ \ | | | |/ | | |/|
| | * | We do need Twisted 14, not 15: we use internal Twisted things that have been ...David Baker2015-01-302-2/+2
| | * | Include content in notification pokesDavid Baker2015-01-291-0/+2
| | * | Change 'from' in notification pokes to 'sender' to match client API v2. Send ...David Baker2015-01-292-5/+14
| | * | Add default push rules including setting a sound for messages mentioning your...David Baker2015-01-292-8/+74
| | * | Renumber priority classes so we can use 0 for defaults.David Baker2015-01-291-5/+5
| | * | Allow kind to be set to null to delete a pusher.David Baker2015-01-291-1/+10
| | * | Code style fixes.Mark Haines2015-01-298-26/+42
| | * | Only send a badge-reset if the user actually has unread notifications.David Baker2015-01-291-2/+7
| | * | SYN-252: Supply the stream and topological parts in the correct order to the ...Mark Haines2015-01-291-3/+3
| | * | Allow the push rule delete method to take more specifiers.David Baker2015-01-281-8/+11
| | * | Change uses of get_user_by_req because it returns a tuple now.David Baker2015-01-282-4/+4
| | * | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-2819-50/+97
| | |\ \
| | | * | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ...Mark Haines2015-01-282-3/+3
| | | * | Add a : to the doc string after the type of the return valueMark Haines2015-01-281-1/+1
| | | * | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-2818-48/+92
| | | * | Return the device_id from get_auth_by_reqMark Haines2015-01-2813-31/+34
| | * | | Merge branch 'master' into developDavid Baker2015-01-281-1/+1
| | |\ \ \
| | | * | | Add matrix.org as a trusted ID server because it's now passed through on port...David Baker2015-01-281-1/+1
| | | * | | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse v0.6.1bErik Johnston2015-01-133-3/+3
| | | |\ \ \
| | * | | | | Move pushers delta to v12 and bump schema versionDavid Baker2015-01-282-1/+1
| | * | | | | Merge pull request #35 from matrix-org/pushers2David Baker2015-01-2821-248/+1948
| | |\ \ \ \ \
| | | * | | | | Use %s instead of +David Baker2015-01-281-2/+2
| | | * | | | | NewlineDavid Baker2015-01-281-0/+1
| | | * | | | | Redundant parensDavid Baker2015-01-281-1/+1
| | | * | | | | unnecessary newlinesDavid Baker2015-01-281-2/+0
| | | * | | | | More magic commas (including the place I copied it from...)David Baker2015-01-281-4/+4
| | | * | | | | Google doc styleDavid Baker2015-01-281-4/+5
| | | * | | | | spacesDavid Baker2015-01-281-2/+2
| | | * | | | | Unnecessary newlines.David Baker2015-01-281-5/+0
| | | * | | | | Unnecessary newline.David Baker2015-01-281-1/+0
| | | * | | | | Better styleDavid Baker2015-01-281-2/+5
| | | * | | | | Another superfluous newlineDavid Baker2015-01-281-1/+0
| | | * | | | | Ah, the comma of doom.David Baker2015-01-281-1/+1
| | | * | | | | Brackets are nicerDavid Baker2015-01-281-2/+2
| | | * | | | | Unnecessary new lineDavid Baker2015-01-281-1/+0
| | | * | | | | Easy on the newlinesDavid Baker2015-01-281-1/+0
| | | * | | | | 2015David Baker2015-01-281-1/+1
| | | * | | | | doc style fixDavid Baker2015-01-281-1/+1
| | | * | | | | It is 2015David Baker2015-01-281-1/+1
| | | * | | | | Oops, bad merge: needed to change the base class of the rest servlets too.David Baker2015-01-283-6/+7
| | | * | | | | More code style thingsDavid Baker2015-01-281-3/+4
| | | * | | | | Brackets rather than slashes at endDavid Baker2015-01-281-3/+3
| | | * | | | | Redundant bracketing & missed spaceDavid Baker2015-01-281-2/+2
| | | * | | | | Update copyrightDavid Baker2015-01-281-1/+1
| | | * | | | | Unused importDavid Baker2015-01-281-1/+0
| | | * | | | | Merge branch 'develop' into pushersDavid Baker2015-01-2851-299/+527
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Initial cut of a shared base class for REST unit testsPaul "LeoNerd" Evans2015-01-271-0/+45
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #34 from matrix-org/remove_serialize_event_from_hsMark Haines2015-01-267-21/+45
| | |\ \ \ \ \
| | | * | | | | Remove unused import from server.pyMark Haines2015-01-261-1/+0
| | | * | | | | Pass the current time to serialize event, rather than passing anMark Haines2015-01-267-20/+45
| | * | | | | | Create (empty) v2_alpha REST tests directoryPaul "LeoNerd" Evans2015-01-261-0/+15
| | |/ / / / /
| | * | | | | Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-236-1/+132
| | * | | | | Stop complaining about Synapse Angular SDK 0.6.1Paul "LeoNerd" Evans2015-01-231-1/+1
| | | * | | | Reset badge count to zero when last active time is bumpedDavid Baker2015-01-284-3/+76
| | | * | | | Oops, remove debuggingDavid Baker2015-01-271-1/+0
| | | * | | | or of course we could just return the deferredDavid Baker2015-01-271-2/+1
| | | * | | | Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the...David Baker2015-01-271-0/+1
| | | * | | | Unbreak bad presence merge - don't add these blocks together with an and: the...David Baker2015-01-271-12/+14
| | | * | | | Support membership events and more camelcase/underscoresDavid Baker2015-01-262-4/+8
| | | * | | | Add brackets to make get room name / alias workDavid Baker2015-01-261-2/+2
| | | * | | | Pushers should only try & look for rejected devices in something that's a lis...David Baker2015-01-261-1/+1
| | | * | | | Add API to delete push rules.David Baker2015-01-232-1/+49
| | | * | | | Use push settings!David Baker2015-01-233-26/+117
| | | * | | | more pep8 suggestionsDavid Baker2015-01-231-2/+1
| | | * | | | more pep8David Baker2015-01-231-2/+4
| | | * | | | Make string format tuple an actual tupleDavid Baker2015-01-231-1/+1
| | | * | | | redundant parensDavid Baker2015-01-231-1/+1
| | | * | | | stray spaceDavid Baker2015-01-231-1/+1
| | | * | | | make per-device rules workDavid Baker2015-01-231-5/+15
| | | * | | | Add slightly pedantic trailing slash error.David Baker2015-01-232-3/+19
| | | * | | | right super() paramDavid Baker2015-01-231-1/+1
| | | * | | | Fix adding rules without before/after & add the rule that we couldn't find to...David Baker2015-01-232-5/+7
| | | * | | | This really serves me right for ever making a map called 'map'.David Baker2015-01-231-1/+1
| | | * | | | Merge branch 'develop' into pushersDavid Baker2015-01-231-273/+193
| | | |\ \ \ \
| | | * | | | | As yet fairly untested GET API for push rulesDavid Baker2015-01-223-15/+145
| | | * | | | | oops, this is not its own schema fileDavid Baker2015-01-221-1/+0
| | | * | | | | Insufficient newlinesDavid Baker2015-01-221-0/+1
| | | * | | | | Merge branch 'develop' into pushersDavid Baker2015-01-2291-1712/+645
| | | |\ \ \ \ \
| | | * | | | | | Oops: second part of commit dc938606David Baker2015-01-226-7/+45
| | | * | | | | | Add rest API & store for creating push rulesDavid Baker2015-01-222-0/+391
| | | * | | | | | use underscores everywhere, not camelcase.David Baker2015-01-201-3/+3
| | | * | | | | | add instance_handles to pushers so we have a way to refer to them even if the...David Baker2015-01-207-27/+39
| | | * | | | | | Require device language when adding a pusher.David Baker2015-01-165-5/+11
| | | * | | | | | Send room name and first alias in notification poke.David Baker2015-01-153-3/+61
| | | * | | | | | Don't make the pushers' event streams cause people to appear onlineDavid Baker2015-01-152-22/+25
| | | * | | | | | Honour the 'rejected' return from push gatewaysDavid Baker2015-01-136-19/+81
| | | * | | | | | Merge branch 'develop' into pushersDavid Baker2015-01-13150-438/+1097
| | | |\ \ \ \ \ \
| | | * | | | | | | Split out function to decide whether to notify or a given eventDavid Baker2015-01-131-2/+17
| | | * | | | | | | If we didn't get any events, advance the token or we'll just keep not getting...David Baker2014-12-181-0/+1
| | | * | | | | | | Merge branch 'develop' into pushersDavid Baker2014-12-1899-2160/+4634
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | schema version is now 10David Baker2014-12-182-1/+1
| | | * | | | | | | | Merge branch 'master' into pushersDavid Baker2014-12-1813-12/+63
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Thank you, pyflakesDavid Baker2014-12-181-1/+0
| | | * | | | | | | | | ...and bump SCHEMA_VERSIONDavid Baker2014-12-181-1/+1
| | | * | | | | | | | | Rename the pusher SQL delta to v9 which the next free oneDavid Baker2014-12-181-0/+0
| | | * | | | | | | | | after a few rethinks, a working implementation of pushers.David Baker2014-12-188-73/+158
| | | * | | | | | | | | Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.David Baker2014-12-037-130/+213
| | | * | | | | | | | | convert to spaces before I start a holy warDavid Baker2014-12-021-205/+205
| | | * | | | | | | | | Merge branch 'develop' into pushersDavid Baker2014-12-0244-248/+6663
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP p...David Baker2014-11-217-20/+150
| | | * | | | | | | | | | Merge branch 'develop' into pushersDavid Baker2014-11-208-342/+373
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into pushersDavid Baker2014-11-2035-140/+193
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'http_client_refactor' into pushersDavid Baker2014-11-2011-93/+170
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | remove random half-lineDavid Baker2014-11-191-1/+0
| | | * | | | | | | | | | | | | Start creating a module to do generic notifications (just prints them to stdo...David Baker2014-11-1912-3/+449
| * | | | | | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej...Erik Johnston2015-01-301-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Remove commented lineErik Johnston2015-01-301-1/+0
| | * | | | | | | | | | | | | | Style changes.Erik Johnston2015-01-301-6/+5
* | | | | | | | | | | | | | | | Split up replication_layer module into client, server and transaction queueErik Johnston2015-01-265-603/+654
* | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-2396-1707/+599
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update .gitignoreErik Johnston2015-01-231-0/+6
| * | | | | | | | | | | | | | | Merge pull request #33 from matrix-org/extract_rest_servlet_from_client_v1Mark Haines2015-01-2312-72/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add RestServlet base class in synapse/http/servlet.pyMark Haines2015-01-231-0/+56
| | * | | | | | | | | | | | | | | Extract the client v1 base RestServlet to a separate classMark Haines2015-01-2311-72/+44
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #32 from matrix-org/remove_parse_id_from_hsMark Haines2015-01-2335-179/+168
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Remove hs.parse_eventidMark Haines2015-01-231-9/+0
| | * | | | | | | | | | | | | | | Replace hs.parse_roomalias with RoomAlias.from_stringMark Haines2015-01-238-26/+18
| | * | | | | | | | | | | | | | | Replace hs.parse_roomid with RoomID.from_stringMark Haines2015-01-238-21/+15
| | * | | | | | | | | | | | | | | Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-2331-133/+145
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #31 from matrix-org/client_api_resourceMark Haines2015-01-235-28/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge rest servlets into the client json resource objectMark Haines2015-01-235-28/+18
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is...Paul "LeoNerd" Evans2015-01-221-3/+3
| * | | | | | | | | | | | | | Much merging of test case setUp() methods to make them much morePaul "LeoNerd" Evans2015-01-221-273/+193
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #30 from matrix-org/client_api_restructureMark Haines2015-01-2237-62/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Move client rest tests back under restMark Haines2015-01-229-5/+19
| | * | | | | | | | | | | | | Move rest APIs back under the rest directoryMark Haines2015-01-2231-19/+33
| | * | | | | | | | | | | | | Move client v1 api rest servlets into a "client/v1" directoryMark Haines2015-01-2223-24/+52
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix manifest. Ignore contrib and docs directories when checking manifest agai...Mark Haines2015-01-223-5/+9
| * | | | | | | | | | | | | Add demo and scripts to python manifestMark Haines2015-01-221-2/+11
| * | | | | | | | | | | | | update .gitignore, set media-store-path in demoMark Haines2015-01-222-9/+5
| * | | | | | | | | | | | | Move experiments, graph and cmdclient into contribMark Haines2015-01-226-0/+0
| * | | | | | | | | | | | | Remove jsfiddlesMark Haines2015-01-2216-1079/+0
| * | | | | | | | | | | | | Move scripts into scriptsMark Haines2015-01-226-2/+2
| * | | | | | | | | | | | | Abstract out the room ID from presence tests, so it's stored in selfPaul "LeoNerd" Evans2015-01-211-8/+10
| * | | | | | | | | | | | | Use common base class for two Presence unit-tests, avoiding boilerplate copyp...Paul "LeoNerd" Evans2015-01-211-54/+25
* | | | | | | | | | | | | | Add storage method have_eventsErik Johnston2015-01-231-0/+29
* | | | | | | | | | | | | | Split out TransactionQueue from replication layerErik Johnston2015-01-222-289/+316
* | | | | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej...Erik Johnston2015-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | fix pyflakesErik Johnston2015-01-221-1/+1
* | | | | | | | | | | | | Add support for storing rejected events in EventContext and data storesErik Johnston2015-01-226-11/+83
|/ / / / / / / / / / / /
* | | | | | | | | | | | Remove unused function. Add comment.Erik Johnston2015-01-211-16/+12
* | | | | | | | | | | | Implement new state resolution algorithmErik Johnston2015-01-212-103/+428
|/ / / / / / / / / / /
* | | | | | | | | | | Only start the notifier timeout once we've had a chance to check for updates....Mark Haines2015-01-191-2/+2
* | | | | | | | | | | Fix pyflakes errorsMark Haines2015-01-191-1/+1
* | | | | | | | | | | Fix syntaxMark Haines2015-01-191-2/+3
* | | | | | | | | | | Allow ':memory:' as the database path for sqlite3Mark Haines2015-01-192-2/+11
* | | | | | | | | | | Finish renaming "context" to "room_id" in federation codebaseMark Haines2015-01-167-99/+62
* | | | | | | | | | | Fold _do_request_for_transaction into the methods that called it since it was...Mark Haines2015-01-161-44/+11
* | | | | | | | | | | Split transport layer into client and server partsMark Haines2015-01-163-272/+321
* | | | | | | | | | | Remove temporary debug logging that was accidentally committedMark Haines2015-01-161-2/+0
* | | | | | | | | | | Have /join/:room_id return the room ID in response anyway, for consistency of...Paul "LeoNerd" Evans2015-01-131-1/+1
* | | | | | | | | | | Have MockClock detect attempts to cancel expired timers, to prevent a repeat ...Paul "LeoNerd" Evans2015-01-131-4/+16
* | | | | | | | | | | Don't try to cancel already-expired timers - SYN-230Paul "LeoNerd" Evans2015-01-131-2/+8
* | | | | | | | | | | Remove unused functionsMark Haines2015-01-134-30/+0
* | | | | | | | | | | get_room_events isn't called anywhereMark Haines2015-01-131-30/+0
* | | | | | | | | | | Fix stream token orderingMark Haines2015-01-131-72/+101
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into developErik Johnston2015-01-133-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Bump versionErik Johnston2015-01-132-2/+2
| * | | | | | | | | Insert 'age' into top level when returning events to clientsErik Johnston2015-01-131-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Use float rather than integer divisions to turn msec into sec - so timeouts u...Paul "LeoNerd" Evans2015-01-121-1/+1
* | | | | | | | | Check that setting typing notification still works after explicit timeout at ...Paul "LeoNerd" Evans2015-01-121-1/+50
* | | | | | | | | Make typing notification timeouts print a (debug) logging messagePaul "LeoNerd" Evans2015-01-121-1/+7
* | | | | | | | | Don't make @unittest.DEBUG print the huge amount of verbosity generated by th...Paul "LeoNerd" Evans2015-01-121-0/+2
* | | | | | | | | Check that setting typing notification still works after explicit timeout - S...Paul "LeoNerd" Evans2015-01-121-0/+26
* | | | | | | | | SYN-178: Fix off by one.Kegan Dougal2015-01-121-2/+6
* | | | | | | | | Add copyrighter script for sqlMark Haines2015-01-121-0/+33
* | | | | | | | | don't clobber pythonpathMatthew Hodgson2015-01-091-2/+2
* | | | | | | | | oopsMatthew Hodgson2015-01-081-1/+1
* | | | | | | | | spell out that local libs may need to be explicitly given priorityMatthew Hodgson2015-01-081-0/+9
* | | | | | | | | Check the existance and versions of necessary modules when starting synapse, ...Mark Haines2015-01-082-0/+85
* | | | | | | | | SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with 100MB/...Kegan Dougal2015-01-081-1/+4
* | | | | | | | | make our JPEG thumbnail quality less horrifically uglyMatthew Hodgson2015-01-081-1/+1
* | | | | | | | | Add raw query param for scrollback.Kegan Dougal2015-01-082-3/+9
* | | | | | | | | Add better help message for --server-name config option.Erik Johnston2015-01-081-2/+6
* | | | | | | | | Return the raw federation event rather than adding extra keys for federation ...Kegan Dougal2015-01-086-19/+27
* | | | | | | | | Add missing continuation indent.Erik Johnston2015-01-081-1/+2
* | | | | | | | | Add 'raw' query parameter to expose the event graph and signatures to savvy c...Kegan Dougal2015-01-086-16/+28
* | | | | | | | | Add optional limit to graph scriptErik Johnston2015-01-081-6/+24
* | | | | | | | | Merge branch 'master' into developMark Haines2015-01-083-5/+5
|\| | | | | | | |
| * | | | | | | | Merge branch 'hotfixes-v0.6.1' v0.6.1aMark Haines2015-01-083-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bump versionMark Haines2015-01-082-2/+2
| | * | | | | | | | SYN-231: User agent header brokenMark Haines2015-01-081-3/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse v0.6.1Erik Johnston2015-01-07137-310/+601
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Log server version on startupErik Johnston2015-01-071-0/+3
* | | | | | | | | | Change error message for missing pillow libs.Kegan Dougal2015-01-071-2/+4
* | | | | | | | | | PEP8 and pyflakes warningsKegan Dougal2015-01-072-2/+4
* | | | | | | | | | Update testsKegan Dougal2015-01-071-1/+1
* | | | | | | | | | SYN-154: Tweak how the m.room.create check is done.Kegan Dougal2015-01-072-12/+12
* | | | | | | | | | SYN-154: Better error messages when joining an unknown room by ID.Kegan Dougal2015-01-073-6/+17
* | | | | | | | | | *cough*Matthew Hodgson2015-01-071-1/+1
* | | | | | | | | | Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse into developErik Johnston2015-01-073-2/+10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Improve change logErik Johnston2015-01-071-2/+2
| * | | | | | | | | Bump version and changelogErik Johnston2015-01-073-2/+10
|/ / / / / / / / /
* | | | | | | | | Remove unused importErik Johnston2015-01-071-2/+0
* | | | | | | | | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into developErik Johnston2015-01-072-9/+16
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-01-072-1/+2
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' into developMark Haines2015-01-062-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'hotfixes-v0.6.0a' v0.6.0bMark Haines2014-12-291-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Return the argument passed to the callback in a deferred callback, otherwise ...Mark Haines2014-12-291-0/+1
| * | | | | | | | | | improve error msgMatthew Hodgson2014-12-241-1/+1
| |/ / / / / / / / /
| | * / / / / / / / Optimize FrozenEvent creationErik Johnston2015-01-062-9/+16
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Use time.time() instead of time.clock()Erik Johnston2015-01-061-4/+4
* | | | | | | | | Fix typo where we used wrong var.Erik Johnston2015-01-061-2/+2
* | | | | | | | | Only fetch the columns we need.Erik Johnston2015-01-061-1/+1
* | | | | | | | | RoomsForUser now has sender instead of user_idErik Johnston2015-01-061-1/+1
* | | | | | | | | Add delta and bump DB versionErik Johnston2015-01-062-1/+17
* | | | | | | | | Add index on transaction_id to sent_transcationsErik Johnston2015-01-062-4/+1
* | | | | | | | | Actually time that functionErik Johnston2015-01-061-0/+1
* | | | | | | | | Time how long calls to _get_destination_retry_timings takeErik Johnston2015-01-062-12/+64
* | | | | | | | | Don't include None's in _get_events_txnErik Johnston2015-01-061-1/+3
* | | | | | | | | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into developErik Johnston2015-01-062-26/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Name 'user_rooms_intersect' transactionErik Johnston2015-01-061-16/+18
| * | | | | | | | | We don't need the full events for get_rooms_for_user_where_membership_isErik Johnston2015-01-062-10/+36
* | | | | | | | | | SYN-32 Use the ANTIALIAS resize method for thumbnailing imagesMark Haines2015-01-061-3/+3
* | | | | | | | | | Add some logging for when we are sending transactions.Matrix2015-01-061-0/+6
* | | | | | | | | | Increase default maximum attachment size to 10MMark Haines2015-01-061-1/+1
* | | | | | | | | | Merge pull request #28 from matrix-org/erikj-perfMark Haines2015-01-065-111/+118
|\| | | | | | | | |
| * | | | | | | | | PEP8Erik Johnston2015-01-062-3/+4
| * | | | | | | | | Remove debug linesErik Johnston2015-01-061-7/+0
| * | | | | | | | | Don't do batching when getting events.Erik Johnston2015-01-061-35/+4
| * | | | | | | | | Only fetch prev_content when a client is streaming/paginating. Use transactio...Erik Johnston2015-01-062-86/+92
| * | | | | | | | | Temporarily turn off 'redacted_because' and 'prev_content' keysErik Johnston2015-01-061-0/+2
| * | | | | | | | | More debug loggingErik Johnston2015-01-061-0/+4
| * | | | | | | | | Add some debug loggingErik Johnston2015-01-061-0/+12
| * | | | | | | | | ReformatErik Johnston2015-01-061-13/+14
| * | | | | | | | | Add RoomMemberStore.get_users_in_room, so that we can get the list of joined ...Erik Johnston2015-01-062-8/+18
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-01-066-7/+46
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:matrix-org/synapse into erikj-perfErik Johnston2014-12-214-6/+26
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perfErik Johnston2014-12-198-15/+72
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perfErik Johnston2014-12-185-44/+79
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Test some ideas that might help performance a bitErik Johnston2014-12-174-23/+32
* | | | | | | | | | | | | Update copyright noticesMark Haines2015-01-06132-128/+212
* | | | | | | | | | | | | Set a content-length for JSON responsesMark Haines2015-01-061-0/+1
* | | | | | | | | | | | | SYN-208/SYN-228: Add runtime checks on startup to enforce that JPEG/PNG suppo...Kegan Dougal2015-01-061-0/+29
* | | | | | | | | | | | | SYN-229: Include Content-Length when downloading filesMark Haines2015-01-063-7/+23
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | spell out that VoIP needs TURNMatthew Hodgson2014-12-241-0/+3
* | | | | | | | | | | | clarify these instructions a media-repo specificMatthew Hodgson2014-12-241-1/+3
* | | | | | | | | | | | spell out that upgrading is just installing over the topMatthew Hodgson2014-12-241-0/+5
* | | | | | | | | | | | Include version in User-Agent and Server headersMark Haines2014-12-224-6/+35
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'hotfixes-v0.6.0' v0.6.0aMark Haines2014-12-198-13/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mock ratelimiter to make tests pass.Kegan Dougal2014-12-192-4/+16
| * | | | | | | | | | | more changelogsMatthew Hodgson2014-12-191-0/+6
| * | | | | | | | | | | Rate limit display names and avatar urls per request rather than per event.Kegan Dougal2014-12-191-2/+4
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Set a state_key for the topic and room name, otherwise they won't be treated ...Mark Haines2014-12-191-0/+2
| * | | | | | | | | | Look for name, topic in the event content rather than the event itself when p...Mark Haines2014-12-191-4/+4
| * | | | | | | | | | bump_presence_active_time when sending a message eventMark Haines2014-12-191-0/+6
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-16 16:19:48 +0000