summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add CS extension for masquerading as users within the namespaces specified by...Kegan Dougal2015-02-051-0/+23
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-0527-401/+716
|\
| * Merge branch 'federation_client_retries' of github.com:matrix-org/synapse int...Erik Johnston2015-02-058-89/+169
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien...Erik Johnston2015-02-053-5/+82
| | |\
| | * | Connection errors in twisted aren't RuntimeErrorsErik Johnston2015-02-051-2/+2
| | * | Pass through list of room hosts from room alias query to federation so that i...Erik Johnston2015-02-053-15/+22
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien...Erik Johnston2015-02-0416-49/+146
| | |\ \
| | * \ \ Merge branch 'signature_failures' of github.com:matrix-org/synapse into feder...Erik Johnston2015-02-043-9/+15
| | |\ \ \
| | * | | | Apply sanity to the transport client interface. Convert 'make_join' and 'send...Erik Johnston2015-02-046-71/+130
| | * | | | When returning lists of servers from alias lookups, put the current server fi...Erik Johnston2015-02-041-1/+10
| | * | | | Retry make_joinErik Johnston2015-02-041-7/+12
| * | | | | Merge pull request #47 from matrix-org/signature_failuresErik Johnston2015-02-059-272/+429
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Change context.auth_events to what the auth_events would be bases on context....Erik Johnston2015-02-043-9/+15
| | |/ /
| | * | Brief comment on why we do some things on every call to persist_event and not...Erik Johnston2015-02-041-0/+6
| | * | Fix state resolution to remember join_rules is a type of auth event.Erik Johnston2015-02-041-1/+13
| | * | Rearrange persist_event so that do all the queries that need to be done befor...Erik Johnston2015-02-043-72/+77
| | * | Add doc to get_eventErik Johnston2015-02-031-0/+15
| | * | New lineErik Johnston2015-02-031-1/+1
| | * | Neaten the handling of state and auth_chain up a bitErik Johnston2015-02-031-27/+30
| | * | Actually, the old prune_event function was non-deterministic, so no point kee...Erik Johnston2015-02-032-91/+4
| | * | Remove unused importsErik Johnston2015-02-031-5/+0
| | * | Add new FederationBaseErik Johnston2015-02-031-0/+126
| | * | Keep around the old (buggy) version of the prune_event function so that we ca...Erik Johnston2015-02-034-137/+92
| | * | Don't completely die if get auth_chain or querying auth_chain requests failErik Johnston2015-02-031-63/+72
| | * | Set combinations is | and not +Erik Johnston2015-02-031-2/+2
| | * | SpellingErik Johnston2015-02-031-1/+1
| | * | Give exception better messageErik Johnston2015-02-031-1/+1
| | * | Add FIXME note.Erik Johnston2015-02-031-0/+2
| | * | PEP8Erik Johnston2015-02-031-1/+0
| | * | Return rejected events if asked for it over federation.Erik Johnston2015-02-031-0/+1
| | * | Try to ensure we don't persist an event we have already persisted. In persist...Erik Johnston2015-02-033-19/+68
| | * | Don't bother requesting PDUs with bad signatures from the same serverErik Johnston2015-02-021-16/+17
| | * | Don't fail an entire request if one of the returned events fails a signature ...Erik Johnston2015-02-022-34/+94
| * | | SYN-202: Log as WARN the 404 'Presence information not visible' errors instea...Erik Johnston2015-02-051-5/+12
| * | | Print out the auth events on failureErik Johnston2015-02-051-1/+1
| * | | Add script to check and auth chain and current state of a roomErik Johnston2015-02-041-0/+65
| * | | Mention new pydenticon dep.Erik Johnston2015-02-041-0/+5
| | |/ | |/|
| * | More s/instance_handle/profile_tag/David Baker2015-02-041-5/+5
| * | s/instance_handle/profile_tag/David Baker2015-02-038-37/+37
| * | Use set_tweak instead of set_soundDavid Baker2015-02-032-3/+4
* | | Fix user query checks. HS>AS pushing now works.Kegan Dougal2015-02-052-21/+44
* | | Serialize events before sending to ASesKegan Dougal2015-02-051-0/+10
* | | Fix unit tests.Kegan Dougal2015-02-051-2/+5
* | | Glue AS work to general event notifications. Add more exception handling when...Kegan Dougal2015-02-054-16/+42
* | | Add unit test for appservice_handler.query_room_alias_existsKegan Dougal2015-02-051-1/+30
* | | Add unknown room alias check. Call it from directory_handler.get_associationKegan Dougal2015-02-052-43/+61
* | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when searc...Kegan Dougal2015-02-052-5/+20
* | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-057-20/+35
* | | Impl push_bulk functionKegan Dougal2015-02-052-2/+19
* | | Add SimpleHttpClient.put_json with the same semantics as get_json.Kegan Dougal2015-02-041-2/+46
* | | Update user/alias query APIs to use new format of SimpleHttpClient.get_jsonKegan Dougal2015-02-042-8/+10
* | | Modify API for SimpleHttpClient.get_json and update usages.Kegan Dougal2015-02-043-47/+61
* | | Add query_user/alias APIs.Kegan Dougal2015-02-042-14/+59
* | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-047-5/+101
|\| |
| * | Merge pull request #46 from matrix-org/identiconsMark Haines2015-02-024-0/+55
| |\ \
| | * | Add pydenticon to python_dependenciesMark Haines2015-02-021-0/+1
| | * | Add Cache-Control header to identiconMark Haines2015-02-021-0/+3
| | * | Fix setting identicon width and heightMark Haines2015-02-021-2/+2
| | * | Spell height more correctlyMark Haines2015-02-021-1/+1
| | * | Add a media/v1/identicon resource for generating identicons using pydenticonMark Haines2015-02-023-0/+51
| * | | less obscure xargsMatthew Hodgson2015-02-021-1/+1
| * | | Generate a list of dependencies from synapse/python_dependencies.pyMark Haines2015-02-021-0/+41
| * | | fix typoMatthew Hodgson2015-02-021-1/+1
| |/ /
| * | Merge master into developMark Haines2015-02-023-4/+4
| |\ \ | | |/ | |/|
| | * fix OSX stuff and typosMatthew Hodgson2015-02-021-2/+3
| | * Merge pull request #45 from matrix-org/hotfixes-v0.6.1d v0.6.1dMark Haines2015-02-023-3/+4
| | |\
| | | * Bump version to 0.6.1dMark Haines2015-02-022-2/+2
| | | * Pin the version of Twisted to 14.0.2 since we are using some of its internalsMark Haines2015-02-021-1/+2
| | |/
| | * Tell people to "source" the activate script for virtualenv, Remove --user fro...Mark Haines2015-02-021-7/+7
| | * Update documentation to recommend virtual envMark Haines2015-02-021-21/+15
| | * Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse v0.6.1cErik Johnston2015-02-023-4/+4
| | |\
| | | * Use >= for version of webclientErik Johnston2015-02-021-1/+1
| | | * Bump versionErik Johnston2015-02-022-2/+2
| | | * Bump version of webclient pulled in.Erik Johnston2015-02-021-2/+2
| | |/
* | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-044-9/+207
* | | Begin to add unit tests for appservice glue and regex testing.Kegan Dougal2015-02-045-4/+158
* | | Add stub ApplicationServiceApi and glue it with the handler.Kegan Dougal2015-02-044-4/+39
* | | Add appservice package and move ApplicationService into it.Kegan Dougal2015-02-034-105/+138
* | | Implement restricted namespace checks. Begin fleshing out the main hook for n...Kegan Dougal2015-02-032-5/+35
* | | Add namespace constants. Add restrict_to option to limit namespace checks.Kegan Dougal2015-02-032-27/+39
* | | Everyone loves SQL typosKegan Dougal2015-02-031-1/+1
* | | Implement regex checks for app services.Kegan Dougal2015-02-032-29/+67
* | | Add defers in the right places.Kegan Dougal2015-02-021-0/+2
* | | Implement txns for AS (un)registration.Kegan Dougal2015-02-023-23/+102
* | | Actually merge into develop.Kegan Dougal2015-02-021-8/+1
* | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-0277-1554/+6385
|\| |
| * | Ignore empty strings for display names & room names in notificationsDavid Baker2015-01-311-2/+2
| * | fix OSX stuff and typosMatthew Hodgson2015-01-311-2/+3
| * | Again, don't assume all member events have displayname.David Baker2015-01-301-1/+1
| * | Don't assume all member events have a display nme.David Baker2015-01-301-4/+5
| * | Resign events when we return them via /query_auth/Erik Johnston2015-01-301-0/+9
| * | s/homeserver.config/homeserver.yaml/ because that's what synctl looks for.David Baker2015-01-301-5/+5
| * | Add twisted to setup requires so it gets processed before setuptools_trialDavid Baker2015-01-301-0/+1
| * | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Reset badge count to zero when last active time is bumpedDavid Baker2015-01-284-3/+76
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 19:32:42 +0000