summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Filter the recent events before applying the limit when doing an incremental ↵Mark Haines2015-01-304-24/+54
| | | | sync with a gap
* 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
|\
| * Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-292-113/+109
| | | | | | | | | | split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event
* | 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 'develop' into client_v2_filterMark Haines2015-01-298-27/+48
| |\
| | * 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
| | |
| * | Fix code-styleMark Haines2015-01-291-13/+6
| | |
* | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-291-2/+2
|\| |
| * | Merge in auth changes from developMark Haines2015-01-291-2/+2
| | |
* | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-2912-17/+493
|\| | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py
| * | Merge changes from developMark Haines2015-01-2936-93/+1827
| |\|
| | * SYN-252: Supply the stream and topological parts in the correct order to the ↵Mark Haines2015-01-291-3/+3
| | | | | | | | | | | | constructor
| | * 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
| | |
| * | 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 ↵Kegan Dougal2015-01-282-3/+3
| | | | | | | | | | | | of the filter, rather than the complete json
| * | 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 ↵Paul "LeoNerd" Evans2015-01-273-24/+52
| | | | | | | | | | | | out in the REST-level tests
| * | Have the Filtering API return Deferreds, so we can do the Datastore ↵Paul "LeoNerd" Evans2015-01-272-5/+19
| | | | | | | | | | | | implementation nicely
| * | Initial trivial implementation of an actual 'Filtering' object; move storage ↵Paul "LeoNerd" Evans2015-01-273-13/+58
| | | | | | | | | | | | of user filters into there
| * | 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
| | | | | | | | | | | | | | | | actual filter implementation
* | | | Use get_room_events_stream to get changes to the rooms if the number of ↵Mark Haines2015-01-292-11/+52
| | | | | | | | | | | | | | | | changes is small
* | | | 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 ↵Mark Haines2015-01-292-12/+22
| | | | | | | | | | | | | | | | for the clients that made those requests
* | | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-2814-46/+77
| |\ \ \ | | | | | | | | | | Extract the device id and token id from the access token when autheniticating users
| | * | | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ↵Mark Haines2015-01-282-3/+3
| | | | | | | | | | | | | | | | | | | | identifier
| | * | | 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 ↵Mark Haines2015-01-2814-46/+74
| | | | | | | | | | | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events
| | * | | 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 ↵David Baker2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).
| * | | | 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
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py
| * | | | 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 ↵David Baker2015-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | the cb gets executed.
| * | | | Unbreak bad presence merge - don't add these blocks together with an and: ↵David Baker2015-01-271-12/+14
| | | | | | | | | | | | | | | | | | | | they're different things.
| * | | | 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 ↵David Baker2015-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | list or tuple.
| * | | | 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 ↵David Baker2015-01-232-5/+7
| | | | | | | | | | | | | | | | | | | | to the error
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py
| * | | | | Oops: second part of commit dc938606David Baker2015-01-226-7/+45
| | | | | |
| * | | | | Add rest API & store for creating push rulesDavid Baker2015-01-222-0/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make unrecognised request error look more like synapse errors because it makes it easier to throw them from within rest classes.
| * | | | | 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 ↵David Baker2015-01-207-27/+39
| | | | | | | | | | | | | | | | | | | | | | | | the push token changes.
| * | | | | Require device language when adding a pusher.David Baker2015-01-165-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because this seems like it might be useful to do sooner rather than later.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a timestamp to push tokens so we know the last time they we got them from the device. Send it to the push gateways so it can determine whether its failure is more recent than the token. Stop and remove pushers that have been rejected.
| * | | | | 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 ↵David Baker2014-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | getting the same events again.
| * | | | | | Merge branch 'develop' into pushersDavid Baker2014-12-1870-1511/+3135
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
| * | | | | | | 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 ↵David Baker2014-11-217-20/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pokes work or not yet but the retry semantics are pretty good.
| * | | | | | | | | 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 ↵David Baker2014-11-1912-3/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdout currently!)
* | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed.
* | | | | | | | | | | | Add handler for /sync APIMark Haines2015-01-261-0/+110
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py
| * | | | | | | | | | | 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 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
|/ / / / / / / / / / /
* | | | | | | | | | | 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
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | 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
| | | | | | | | | |
* | | | | | | | | | Only start the notifier timeout once we've had a chance to check for ↵Mark Haines2015-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have
* | | | | | | | | | 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 ↵Mark Haines2015-01-161-44/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was a trivial wrapper around client.get_json
* | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of clients (SYN-234)
* | | | | | | | | | 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 ↵Paul "LeoNerd" Evans2015-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | under 1000msec will actually work
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log which modules are used
* | | | | | | | | SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with ↵Kegan Dougal2015-01-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 100MB/file for now.
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data.
* | | | | | | | | Add missing continuation indent.Erik Johnston2015-01-081-1/+2
| | | | | | | | |
* | | | | | | | | Add 'raw' query parameter to expose the event graph and signatures to savvy ↵Kegan Dougal2015-01-086-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clients.
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't perform the check in auth.is_host_in_room but instead do it in _do_join and also assert that there are no m.room.members in the room before doing so.
* | | | | | | | | SYN-154: Better error messages when joining an unknown room by ID.Kegan Dougal2015-01-073-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The simple fix doesn't work here because room creation also involves unknown room IDs. The check relies on the presence of m.room.create for rooms being created, whereas bogus room IDs have no state events at all.
* | | | | | | | | *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
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Return the argument passed to the callback in a deferred callback, otherwise ↵Mark Haines2014-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | twisted will replace the deferred result with 'None'
| | * | | | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database performance improvements.
| * | | | | | | | | 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 ↵Erik Johnston2015-01-062-86/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions for event streams.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | users without having to retrieve the full events
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-01-064-6/+35
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:matrix-org/synapse into erikj-perfErik Johnston2014-12-211-2/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perfErik Johnston2014-12-196-13/+39
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perfErik Johnston2014-12-183-36/+58
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Test some ideas that might help performance a bitErik Johnston2014-12-174-23/+32
| | | | | | | | | | | | |
* | | | | | | | | | | | | Update copyright noticesMark Haines2015-01-06131-127/+211
| | | | | | | | | | | | |
* | | | | | | | | | | | | 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 ↵Kegan Dougal2015-01-061-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support is included when installing pillow.
* | | | | | | | | | | | | SYN-229: Include Content-Length when downloading filesMark Haines2015-01-063-7/+23
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Include version in User-Agent and Server headersMark Haines2014-12-224-6/+35
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as room state
* | | | | | | | | | Look for name, topic in the event content rather than the event itself when ↵Mark Haines2014-12-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | persisting room name and topic events
* | | | | | | | | | bump_presence_active_time when sending a message eventMark Haines2014-12-191-0/+6
| | | | | | | | | |
* | | | | | | | | | Don't ratelimit room create eventsMark Haines2014-12-192-3/+4
| | | | | | | | | |
* | | | | | | | | | Set display name when joining via aliasMark Haines2014-12-191-0/+5
| | | | | | | | | |
* | | | | | | | | | Remove unneeded federation keys from eventsMark Haines2014-12-191-0/+3
| | | | | | | | | |
* | | | | | | | | | SYN-203: Handle requests for thunbnails for images that are smallMark Haines2014-12-191-5/+14
| | | | | | | | | |
* | | | | | | | | | s/user_id/sender/Mark Haines2014-12-191-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Supply auth_chain along with current state in '/state/', fetch auth events ↵Mark Haines2014-12-183-31/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from a remote server if we are missing some of them
* | | | | | | | | Replace distributor deferred list, with a simple for loop until I understand ↵Mark Haines2014-12-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | why the former breaks and the latter doesn't
* | | | | | | | | Don't yield on sending the event accross federation.Mark Haines2014-12-181-2/+2
|/ / / / / / / /
* | | | | | | | Use _get_events_txn instead of _parse_events_txnErik Johnston2014-12-161-7/+1
| | | | | | | |
* | | | | | | | Fix where we pulled in event.state_events from hotfixes branchErik Johnston2014-12-161-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into ↵Erik Johnston2014-12-162-10/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | release-v0.6.0
| * | | | | | | | Add FIXMEErik Johnston2014-12-161-0/+1
| | | | | | | | |
| * | | | | | | | Fix bug where we did not send the full auth chain to people that joined over ↵Erik Johnston2014-12-162-10/+13
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | federation
* | | | | | | | Make error messages slightly more helpfulErik Johnston2014-12-161-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0Erik Johnston2014-12-1612-231/+40
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/state.py
| * | | | | | | Merge branch 'release-v0.6.0' into developMark Haines2014-12-166-9/+90
| |\ \ \ \ \ \ \
| * | | | | | | | SYN-142: Use a default log file 'homeserver.log' so people get logging by ↵Kegan Dougal2014-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default.
| * | | | | | | | Remove send_message since nothing was calling it. Remove Snapshot because ↵Mark Haines2014-12-162-118/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only send_message was using it
| * | | | | | | | Construct the EventContext in the state handler rather than constructing one ↵Mark Haines2014-12-163-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and then immediately calling state_handler.annotate_context_with_state
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-14 19:30:33 +0000