summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* add generate config instruction to the HS setup partDavid Baker2015-01-301-0/+9
* Tell people to "source" the activate script for virtualenv, Remove --user fro...Mark Haines2015-01-301-7/+7
* Update documentation to recommend virtual envMark Haines2015-01-301-30/+15
* 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-3016-172/+708
|\
| * 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-3019-25/+1166
| |\
| * \ Merge branch 'replication_split' of github.com:matrix-org/synapse into reject...Erik Johnston2015-01-304-10/+7
| |\ \
| * | | Fix bug where we superfluously asked for current state. Change API of /query_...Erik Johnston2015-01-305-49/+43
| * | | Revert accidental bumping of angluar_sdk depErik Johnston2015-01-301-2/+2
| * | | 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-3051-326/+2392
| |\ \ \
| * | | | 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-298-81/+210
| * | | | 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
* | | | | Allow any greater version for webclientErik Johnston2015-01-301-1/+1
* | | | | 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-293-164/+166
| |\ \ \ \ \
| * | | | | | 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-292-2/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-2915-20/+1100
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-282-2/+2
| * | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-2842-300/+2092
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix FormattingMark Haines2015-01-274-14/+9
| * | | | | | | | | | Wait for events if the incremental sync is empty and a timeout is givenMark Haines2015-01-273-8/+61
| * | | | | | | | | | 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-268-21/+60
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add handler for /sync APIMark Haines2015-01-261-0/+110
| * | | | | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-262-1/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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-3052-333/+2390
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge pull request #40 from matrix-org/rejections_storageMark Haines2015-01-306-11/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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-3014-11/+1140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-3011-5/+1072
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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-293-164/+166
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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-292-2/+3
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge changes from developMark Haines2015-01-2942-302/+2052
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move bump schema deltaMark Haines2015-01-291-0/+0
| * | | | | | | | | | | | | Add filter_room_state unit tests.Kegan Dougal2015-01-291-0/+56
| * | | | | | | | | | | | | Add basic filtering public API unit tests. Use defers in the right places.Kegan Dougal2015-01-292-5/+60
| * | | | | | | | | | | | | Add more unit tests for the filter algorithm.Kegan Dougal2015-01-291-5/+259
| * | | | | | | | | | | | | Implement filter algorithm. Add basic event type unit tests to assert it works.Kegan Dougal2015-01-292-1/+93
| * | | | | | | | | | | | | 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-284-11/+128
| * | | | | | | | | | | | | Created schema deltaPaul "LeoNerd" Evans2015-01-272-1/+25
| * | | | | | | | | | | | | Initial stab at real SQL storage implementation of user filter definitionsPaul "LeoNerd" Evans2015-01-274-15/+78
| * | | | | | | | | | | | | More unit-testing of REST errorsPaul "LeoNerd" Evans2015-01-271-1/+35
| * | | | | | | | | | | | | Move storage of user filters into real datastore layer; now have to mock it o...Paul "LeoNerd" Evans2015-01-275-27/+79
| * | | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-273-7/+22
| * | | | | | | | | | | | | Initial trivial unittest of Filtering objectPaul "LeoNerd" Evans2015-01-271-0/+67
| * | | | | | | | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ...Paul "LeoNerd" Evans2015-01-273-13/+58
| * | | | | | | | | | | | | Use new V2AlphaRestTestCasePaul "LeoNerd" Evans2015-01-271-38/+2
| * | | | | | | | | | | | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-278-21/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh...Paul "LeoNerd" Evans2015-01-271-5/+7
| * | | | | | | | | | | | | | Initial trivial REST test of v2_alpha filter APIPaul "LeoNerd" Evans2015-01-261-0/+74
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge pull request #38 from matrix-org/new_state_resolutionMark Haines2015-01-302-121/+441
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add a slightly more helpful commentErik Johnston2015-01-301-1/+2
| | | | | | * | | | | | | | | | 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 '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
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | 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
| | * | | | | | | 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
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | 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
|/ / / / / / / /
| * | | | | | | 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
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | 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
| * | | | | | | 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
| | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | | * | 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 13:21:14 +0000