summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Return empty list rather than None when there are no emphemeral events for a ...Mark Haines2015-01-301-1/+1
* | | Fix bug where accepting invite over federation didn't work. Add logging.Erik Johnston2015-01-301-8/+49
* | | Merge pull request #43 from matrix-org/rejectionsErik Johnston2015-01-3015-172/+706
|\ \ \
| * | | Briefly doc structure of query_auth API.Erik Johnston2015-01-301-0/+18
| * | | Only auth_events with event if event in event.auth_eventsErik Johnston2015-01-301-1/+3
| * | | Remove debug loggingErik Johnston2015-01-301-9/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-3016-22/+552
| |\ \ \
| * \ \ \ Merge branch 'replication_split' of github.com:matrix-org/synapse into reject...Erik Johnston2015-01-303-9/+6
| |\ \ \ \
| * | | | | Fix bug where we superfluously asked for current state. Change API of /query_...Erik Johnston2015-01-305-49/+43
| * | | | | Fix bad merge fo python_dependencies.pyErik Johnston2015-01-301-1/+0
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-3043-115/+2105
| |\ \ \ \ \
| * | | | | | Update the current state of an event if we update auth events.Erik Johnston2015-01-301-1/+3
| * | | | | | Fix bug in timeout handling in keyclientErik Johnston2015-01-301-3/+4
| * | | | | | Fix regression where we no longer correctly handled the case of gaps in our e...Erik Johnston2015-01-302-2/+9
| * | | | | | Fix bug where we changes in outlier in metadata dict propogated to other eventsErik Johnston2015-01-303-4/+8
| * | | | | | Initial implementation of auth conflict resolutionErik Johnston2015-01-297-81/+208
| * | | | | | Make post_json(...) actually send data.Erik Johnston2015-01-291-1/+1
| * | | | | | Add post_json(...) method to federation clientErik Johnston2015-01-291-0/+37
| * | | | | | Start implementing auth conflict resErik Johnston2015-01-286-52/+253
| * | | | | | Make it the responsibility of the replication layer to check signature and ha...Erik Johnston2015-01-263-26/+173
* | | | | | | Spit out server default rules too.David Baker2015-01-302-10/+17
* | | | | | | Merge pull request #41 from matrix-org/client_v2_syncMark Haines2015-01-307-46/+794
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add doc string for __nonzero__ overrides for sync results, raise not implemen...Mark Haines2015-01-301-1/+8
| * | | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-302-10/+2
| |\ \ \ \ \ \
| * | | | | | | Check if the user has joined the room between incremental syncsMark Haines2015-01-301-4/+27
| * | | | | | | Pass client info to the sync_configMark Haines2015-01-302-3/+4
| * | | | | | | Fix token formattingMark Haines2015-01-302-5/+5
| * | | | | | | Filter the recent events before applying the limit when doing an initial syncMark Haines2015-01-301-11/+10
| * | | | | | | Filter the recent events before applying the limit when doing an incremental ...Mark Haines2015-01-304-24/+54
| * | | | | | | Update todo for the filtering on syncMark Haines2015-01-291-1/+2
| * | | | | | | Add basic filtering supportMark Haines2015-01-291-5/+14
| * | | | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-292-113/+109
| |\ \ \ \ \ \ \
| * | | | | | | | Fix indentMark Haines2015-01-291-1/+1
| * | | | | | | | Move typing notifs to an "emphermal" event list on the room objectMark Haines2015-01-292-7/+9
| * | | | | | | | Fix check for empty room updateMark Haines2015-01-291-1/+1
| * | | | | | | | Fix v2 initial syncMark Haines2015-01-291-1/+2
| * | | | | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-299-40/+54
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-2912-17/+493
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of chang...Mark Haines2015-01-292-11/+52
| * | | | | | | | | | | Remove typing TODOMark Haines2015-01-291-1/+0
| * | | | | | | | | | | Add typing notifications to syncMark Haines2015-01-292-19/+29
| * | | | | | | | | | | Include transaction ids in unsigned section of events in the sync results for...Mark Haines2015-01-292-12/+22
| * | | | | | | | | | | Add support for formatting events in the way a v2 client expectsMark Haines2015-01-291-39/+52
| * | | | | | | | | | | Add ports back to demo/start.shMark Haines2015-01-281-1/+1
| * | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2835-91/+1822
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix FormattingMark Haines2015-01-274-14/+9
| * | | | | | | | | | | | Wait for events if the incremental sync is empty and a timeout is givenMark Haines2015-01-272-7/+60
| * | | | | | | | | | | | Start implementing incremental initial syncMark Haines2015-01-273-34/+241
| * | | | | | | | | | | | Start implementing the non-incremental sync portion of the v2 /sync APIMark Haines2015-01-264-54/+146
| * | | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-267-21/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Add handler for /sync APIMark Haines2015-01-261-0/+110
| * | | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-232-1/+7
| * | | | | | | | | | | | | Start implementing the v2_alpha sync APIMark Haines2015-01-235-0/+272
* | | | | | | | | | | | | | Merge pull request #42 from matrix-org/replication_splitMark Haines2015-01-305-886/+993
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli...Erik Johnston2015-01-3044-123/+2104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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-2340-199/+229
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Add glob asterisks when running rules.David Baker2015-01-302-4/+6
* | | | | | | | | | | | | | | Remove merge conflictErik Johnston2015-01-301-3/+0
* | | | | | | | | | | | | | | Remember to add schema file to listErik Johnston2015-01-301-0/+1
* | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-3011-8/+526
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-308-2/+458
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_userMark Haines2015-01-302-10/+2
| | * | | | | | | | | | | | | | Unused importMark Haines2015-01-301-2/+0
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-292-113/+109
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'develop' into client_v2_filterMark Haines2015-01-298-27/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix code-styleMark Haines2015-01-291-13/+6
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge in auth changes from developMark Haines2015-01-291-2/+2
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge changes from developMark Haines2015-01-2936-93/+1827
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Move bump schema deltaMark Haines2015-01-291-0/+0
| | * | | | | | | | | | | | Add basic filtering public API unit tests. Use defers in the right places.Kegan Dougal2015-01-291-4/+7
| | * | | | | | | | | | | | Implement filter algorithm. Add basic event type unit tests to assert it works.Kegan Dougal2015-01-291-0/+49
| | * | | | | | | | | | | | Add filtering public API; outline filtering algorithm.Kegan Dougal2015-01-291-8/+52
| | * | | | | | | | | | | | Add filtering.filter_events function, with stub passes_filter function.Kegan Dougal2015-01-291-0/+15
| | * | | | | | | | | | | | Also edit the filter column on the delta SQLKegan Dougal2015-01-291-1/+1
| | * | | | | | | | | | | | s/definition/filter_json/ since definition is now used to mean a component of...Kegan Dougal2015-01-282-3/+3
| | * | | | | | | | | | | | Add filter JSON sanity checks.Kegan Dougal2015-01-283-7/+108
| | * | | | | | | | | | | | Created schema deltaPaul "LeoNerd" Evans2015-01-272-1/+25
| | * | | | | | | | | | | | Initial stab at real SQL storage implementation of user filter definitionsPaul "LeoNerd" Evans2015-01-273-14/+60
| | * | | | | | | | | | | | Move storage of user filters into real datastore layer; now have to mock it o...Paul "LeoNerd" Evans2015-01-273-24/+52
| | * | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-272-5/+19
| | * | | | | | | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ...Paul "LeoNerd" Evans2015-01-273-13/+58
| | * | | | | | | | | | | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-277-21/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ...Paul "LeoNerd" Evans2015-01-262-1/+109
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Add room member count condition and default rule to make a noise on rooms of ...David Baker2015-01-303-6/+63
| * | | | | | | | | | | | Add a slightly more helpful commentErik Johnston2015-01-301-1/+2
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolu...Erik Johnston2015-01-3065-368/+2394
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Be more specific in naming columns in selects.Erik Johnston2015-01-301-1/+1
* | | | | | | | | | | | | | Put CREATE rejections into seperate .sqlErik Johnston2015-01-302-7/+21
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-3065-367/+2380
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | We do need Twisted 14, not 15: we use internal Twisted things that have been ...David Baker2015-01-301-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | 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-2814-46/+77
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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-2814-46/+74
| | * | | | | | | | Return the device_id from get_auth_by_reqMark Haines2015-01-2811-29/+32
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | 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
| * | | | | | | | Move pushers delta to v12 and bump schema versionDavid Baker2015-01-282-1/+1
| * | | | | | | | 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-2831-207/+364
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | 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
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | 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
| | | |_|_|_|/ | | |/| | | |
| | * | | | | 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
| | * | | | | Remove hs.parse_eventidMark Haines2015-01-231-9/+0
| | * | | | | Replace hs.parse_roomalias with RoomAlias.from_stringMark Haines2015-01-234-13/+10
| | * | | | | Replace hs.parse_roomid with RoomID.from_stringMark Haines2015-01-233-10/+3
| | * | | | | Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-2315-63/+71
| | * | | | | Merge rest servlets into the client json resource objectMark Haines2015-01-233-24/+9
| * | | | | | 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
| * | | | | | 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-2245-513/+514
| |\| | | | |
| | * | | | | Move rest APIs back under the rest directoryMark Haines2015-01-2228-3/+17
| | * | | | | Move client v1 api rest servlets into a "client/v1" directoryMark Haines2015-01-2215-3/+17
| * | | | | | 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-13133-413/+882
| |\ \ \ \ \ \
| * | | | | | | 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-1870-1511/+3135
| |\ \ \ \ \ \ \
| * | | | | | | | schema version is now 10David Baker2014-12-182-1/+1
| * | | | | | | | Merge branch 'master' into pushersDavid Baker2014-12-1810-11/+41
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | | | Merge branch 'develop' into pushersDavid Baker2014-12-0220-225/+541
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-206-88/+84
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | 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-211-32/+71
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | 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-166-97/+60
* | | | | | | | | | 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
* | | | | | | | | | Don't try to cancel already-expired timers - SYN-230Paul "LeoNerd" Evans2015-01-131-2/+8
* | | | | | | | | | Remove unused functionsMark Haines2015-01-133-19/+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-132-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Bump versionErik Johnston2015-01-131-1/+1
| * | | | | | | | 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
* | | | | | | | | Make typing notification timeouts print a (debug) logging messagePaul "LeoNerd" Evans2015-01-121-1/+7
* | | | | | | | | SYN-178: Fix off by one.Kegan Dougal2015-01-121-2/+6
* | | | | | | | | 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
* | | | | | | | | Merge branch 'master' into developMark Haines2015-01-082-4/+4
|\| | | | | | | |
| * | | | | | | | Bump versionMark Haines2015-01-081-1/+1
| * | | | | | | | SYN-231: User agent header brokenMark Haines2015-01-081-3/+3
* | | | | | | | | 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
* | | | | | | | | 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
|/ / / / / / / /
* | | | | | | | Bump version and changelogErik Johnston2015-01-071-1/+1
* | | | | | | | Remove unused importErik Johnston2015-01-071-2/+0
* | | | | | | | 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
| | |\ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-23 07:17:30 +0000