summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix bug in logging.Erik Johnston2015-03-101-5/+5
* in_thread takes no argumentsErik Johnston2015-03-101-1/+1
* Fix bug in logging.Erik Johnston2015-03-101-1/+1
* Merge pull request #105 from matrix-org/erikj-perfErik Johnston2015-03-101-15/+46
|\
| * Split out the 'run' from 'setup'Erik Johnston2015-03-101-26/+27
| * Add documentation. When starting via twistd respect soft_file_limit config op...Erik Johnston2015-03-101-2/+17
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-03-09145-2445/+10126
| |\
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-01-2230-497/+617
| |\ \
| * | | Add twisted Service interfaceErik Johnston2015-01-072-3/+19
* | | | Merge pull request #101 from matrix-org/neaten-federation-servletsErik Johnston2015-03-091-182/+157
|\ \ \ \
| * | | | Appease pep8Paul "LeoNerd" Evans2015-03-051-19/+27
| * | | | Append a $ on PATH at registration time, meaning each PATH attribute doesn't ...Paul "LeoNerd" Evans2015-03-051-13/+14
| * | | | Slightly neater(?) arrangement of authentication wrapper for HTTP servlet met...Paul "LeoNerd" Evans2015-03-051-25/+37
| * | | | Remove the dead 'rate_limit_origin' method from TransportLayerServerPaul "LeoNerd" Evans2015-03-051-6/+0
| * | | | Move federation API responding code out of weird mix of lambdas into Servlet-...Paul "LeoNerd" Evans2015-03-051-170/+130
* | | | | Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This us...Erik Johnston2015-03-095-11/+12
| |_|_|/ |/| | |
* | | | D'oh: underscore, not hyphenDavid Baker2015-03-091-1/+1
* | | | Call notifications should be override else they'll get clobbered by sender/ro...David Baker2015-03-061-21/+21
* | | | Merge branch 'develop' into release-v0.8.0Erik Johnston2015-03-061-7/+13
|\ \ \ \
| * | | | When setting display name more graciously handle failures to update room state.Erik Johnston2015-03-061-7/+13
* | | | | Dial down logging for failed pushersDavid Baker2015-03-061-1/+1
* | | | | Specify when we don't want to highlightDavid Baker2015-03-061-2/+17
* | | | | Remove the fallback rule - we probably don't want to be notifying for everyth...David Baker2015-03-061-9/+1
|/ / / /
* | | | Add attribute so push gateways can tell if a member event is about the user i...David Baker2015-03-061-0/+1
* | | | Bump versionErik Johnston2015-03-061-1/+1
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-03-062-54/+57
|\ \ \ \
| * | | | Bump versionErik Johnston2015-03-031-1/+1
| * | | | Also bump version of downloaded sywebErik Johnston2015-03-031-2/+2
| * | | | Bump syweb dependencyErik Johnston2015-03-032-2/+2
| * | | | Bump versionErik Johnston2015-02-211-1/+1
| * | | | Don't exit if we can't work out if we're running in a git repoErik Johnston2015-02-211-53/+56
* | | | | Merge pull request #96 from matrix-org/pushrules2Erik Johnston2015-03-065-17/+226
|\ \ \ \ \
| * | | | | Schema change as delta in v14David Baker2015-03-061-0/+0
| * | | | | Add more server default rules so we have default rules for whether you get no...David Baker2015-03-062-6/+76
| * | | | | Comment typoDavid Baker2015-03-061-1/+1
| * | | | | Suppress notices should trump content/room/sender rules.David Baker2015-03-061-13/+13
| * | | | | Add the highlight tweak where messages should be highlighted a different colo...David Baker2015-03-061-0/+4
| * | | | | Add default rule to suppress notices.David Baker2015-03-041-0/+13
| * | | | | Merge branch 'develop' into pushrules2David Baker2015-03-0430-607/+329
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into pushrules2David Baker2015-03-0426-168/+873
| |\ \ \ \ \ \
| * | | | | | | Use if not results rather than len, as per feedback.David Baker2015-03-041-1/+1
| * | | | | | | s/user_name/user/ as per mjark's commentDavid Baker2015-03-023-8/+8
| * | | | | | | Oops, missed a replacement.David Baker2015-03-021-1/+1
| * | | | | | | Blank linesDavid Baker2015-03-022-0/+2
| * | | | | | | Rename the room-with-two-people rule to be more compatible if we have actual ...David Baker2015-03-021-1/+1
| * | | | | | | It's set_tweak now, not set_soundDavid Baker2015-02-271-1/+1
| * | | | | | | SYN-267 Add a fallback rule as an explicit server default rule and make the d...David Baker2015-02-262-1/+16
| * | | | | | | Add API for getting/setting enabled-ness of push rules.David Baker2015-02-263-9/+77
| * | | | | | | whitespaceDavid Baker2015-02-261-1/+2
| * | | | | | | Add enable/disable overlay for push rules (REST API not yet hooked up)David Baker2015-02-255-0/+46
* | | | | | | | Unused importErik Johnston2015-03-061-1/+1
* | | | | | | | Don't look for an TLS private key if we have set --no-tlsErik Johnston2015-03-063-8/+17
* | | | | | | | Add some randomness to the user specified timeout on event streams to mitigat...Erik Johnston2015-03-061-0/+9
* | | | | | | | Log error message when we fail to fetch remote server keysErik Johnston2015-03-051-2/+11
* | | | | | | | Merge pull request #100 from matrix-org/missing_pdu_compatErik Johnston2015-03-052-15/+114
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | DocsErik Johnston2015-03-051-0/+2
| * | | | | | | Remove unecessary checkErik Johnston2015-03-051-6/+0
| * | | | | | | Respect min_depth argumentErik Johnston2015-03-051-4/+6
| * | | | | | | Docs.Erik Johnston2015-03-051-0/+16
| * | | | | | | Handle if get_missing_pdu returns 400 or not all events.Erik Johnston2015-03-052-15/+100
* | | | | | | | Slightly reduce the insane amounts of indentation in main http server respons...Paul "LeoNerd" Evans2015-03-051-21/+23
* | | | | | | | Rename rooms_to_listeners to room_to_listeners, for consistency with user_ an...Paul "LeoNerd" Evans2015-03-051-8/+8
|/ / / / / / /
* | | / / / / Give LruCache a __len__, so that len(cache) worksPaul "LeoNerd" Evans2015-03-041-0/+7
| |_|/ / / / |/| | | | |
* | | | | | Note that we don't specify execution orderErik Johnston2015-03-041-0/+4
* | | | | | s/schema_deltas/applied_schema_deltas/Erik Johnston2015-03-042-9/+11
* | | | | | s/%r/%s/Erik Johnston2015-03-041-1/+1
* | | | | | Add example directory structures in docErik Johnston2015-03-041-1/+36
* | | | | | Don't assume db conn is a Context Manager.Erik Johnston2015-03-041-1/+5
* | | | | | Add unique constraint on schema_version.lock schema. Use conflict clause in sql.Erik Johnston2015-03-042-4/+5
* | | | | | Change to use logger in db upgrade scriptErik Johnston2015-03-041-1/+4
* | | | | | Use context manager with db conn to correctly commit and rollbackErik Johnston2015-03-041-11/+11
* | | | | | Actually add full_schemas dirErik Johnston2015-03-0412-0/+645
* | | | | | More docs. Rename 'schema/current' to 'schema/full_schemas'Erik Johnston2015-03-0413-652/+23
* | | | | | Add some docs and remove unused variablesErik Johnston2015-03-041-8/+10
* | | | | | SYN-67: Finish up implementing new database schema managementErik Johnston2015-03-0429-568/+165
* | | | | | SYN-67: Begin changing the way we handle schema versioningErik Johnston2015-03-021-38/+106
| |/ / / / |/| | | |
* | | | | Add missing commaErik Johnston2015-03-021-1/+1
* | | | | We purposefully don't have a version 14 delta script.Erik Johnston2015-03-021-1/+1
* | | | | Fix bug which prevented the HS pushing events to the AS due to FrozenEventsKegan Dougal2015-03-021-1/+1
* | | | | Bump webclient versionErik Johnston2015-03-021-3/+3
* | | | | Merge pull request #93 from matrix-org/application-services-exclusiveKegsay2015-03-026-50/+77
|\ \ \ \ \
| * | | | | Run deltas and bump user_version in upgrade scriptKegan Dougal2015-03-021-1/+1
| * | | | | Implement exclusive namespace checks.Kegan Dougal2015-02-272-7/+18
| * | | | | Add functions to return whether an AS has exclusively claimed a matching name...Kegan Dougal2015-02-271-3/+20
| * | | | | Convert expected format for AS regex to include exclusivity.Kegan Dougal2015-02-273-39/+38
| |/ / / /
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-03-0220-146/+667
|\ \ \ \ \
| * \ \ \ \ Merge pull request #83 from matrix-org/nofile_limit_configErik Johnston2015-03-022-8/+33
| |\ \ \ \ \
| | * | | | | By default set soft limit to hard limitErik Johnston2015-02-202-7/+11
| | * | | | | Rename resource variable so as to not shadow module importErik Johnston2015-02-191-5/+5
| | * | | | | Add config option to set the soft fd limit on startErik Johnston2015-02-192-3/+24
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into federation_rate_...Erik Johnston2015-03-028-59/+279
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #95 from matrix-org/serialize_transaction_processingErik Johnston2015-03-021-20/+12
| | |\ \ \ \ \ \
| | | * | | | | | If we're yielding don't add errbackErik Johnston2015-03-021-7/+3
| | | * | | | | | Process transactions serially.Erik Johnston2015-03-021-14/+10
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge pull request #92 from matrix-org/application-services-event-streamKegsay2015-03-027-39/+267
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | PEP8Kegan Dougal2015-03-021-1/+1
| | | * | | | | Wrap all of get_app_service_rooms in a txn.Kegan Dougal2015-03-026-88/+67
| | | * | | | | JOIN state_events rather than parsing unrecognized_keys to pull out member st...Kegan Dougal2015-03-022-11/+5
| | | * | | | | Modify _simple_select_list to allow an empty WHERE clause. Use it for get_all...Kegan Dougal2015-03-024-17/+21
| | | * | | | | PR tweaks: set earlier on and use 'as json' for compatKegan Dougal2015-03-023-16/+12
| | | * | | | | PEP8Kegan Dougal2015-02-271-1/+0
| | | * | | | | Notify appservices of invites mid-poll.Kegan Dougal2015-02-271-1/+29
| | | * | | | | Check for membership invite events correctly.Kegan Dougal2015-02-261-2/+21
| | | * | | | | Finish impl to get new events for AS. ASes should now be able to poll /eventsKegan Dougal2015-02-262-8/+58
| | | * | | | | Finish impl to extract all room IDs an AS may be interested in when polling t...Kegan Dougal2015-02-262-6/+36
| | | * | | | | PEP8 and pyflakesKegan Dougal2015-02-252-6/+3
| | | * | | | | Comment unused variables.Kegan Dougal2015-02-251-2/+2
| | | * | | | | Fix alias query.Kegan Dougal2015-02-251-6/+5
| | | * | | | | Add support for extracting matching room_ids and room_aliases for a given AS.Kegan Dougal2015-02-253-2/+82
| | | * | | | | Add stub functions and work out execution flow to implement AS event stream p...Kegan Dougal2015-02-254-12/+65
| * | | | | | | Use contextlib.contextmanager instead of a custom classErik Johnston2015-03-021-22/+12
| * | | | | | | Make the federation server ratelimiting configurable.Erik Johnston2015-03-022-5/+41
| * | | | | | | Move federation rate limiting out of transport layerErik Johnston2015-02-273-204/+230
| * | | | | | | Document FederationRateLimiterErik Johnston2015-02-271-8/+51
| * | | | | | | Initial implementation of federation server rate limitingErik Johnston2015-02-262-5/+182
| |/ / / / / /
| * / / / / / SYWEB-278 Don't allow rules with no rule_id.David Baker2015-02-251-1/+1
| |/ / / / /
| * | | | | turns uris config options should append since it's a listDavid Baker2015-02-241-1/+1
| * | | | | %s for strings otherwise you end up sending 'u"foo"'David Baker2015-02-241-1/+1
| * | | | | Merge pull request #89 from matrix-org/registration-fallbackErik Johnston2015-02-243-1/+9
| |\ \ \ \ \
| | * | | | | Trailing commaKegan Dougal2015-02-231-1/+1
| | * | | | | Actually treat this as static content, not random Resources.Kegan Dougal2015-02-234-31/+7
| | * | | | | Add RegisterFallbackResource to /_matrix/static/client/registerKegan Dougal2015-02-234-0/+32
| * | | | | | Use OrderedDict for @cached backing store, so we can evict the oldest key unb...Paul "LeoNerd" Evans2015-02-231-7/+4
| * | | | | | Use cache.pop() instead of a separate membership test + del []Paul "LeoNerd" Evans2015-02-231-2/+1
| * | | | | | Fix code style warningMark Haines2015-02-231-1/+1
| * | | | | | Remove unused importMark Haines2015-02-231-2/+0
| * | | | | | Merge remote-tracking branch 'origin/develop' into performance-cache-improvem...Paul "LeoNerd" Evans2015-02-235-3/+43
| |\| | | | |
| * | | | | | Pull the _get_event_cache.setdefault() call out of the try block, as it doesn...Paul "LeoNerd" Evans2015-02-231-1/+2
| * | | | | | Use the @cached decorator to implement the destination_retry_timings cachePaul "LeoNerd" Evans2015-02-231-9/+5
| * | | | | | RoomMemberStore no longer needs a _user_rooms_cache memberPaul "LeoNerd" Evans2015-02-231-5/+0
| * | | | | | Allow @cached-wrapped functions to have a prefill method for setting entriesPaul "LeoNerd" Evans2015-02-231-8/+15
| * | | | | | Squash out the now-redundant ApplicationServicesCache object classPaul "LeoNerd" Evans2015-02-231-20/+8
| * | | | | | Remove a TODO notePaul "LeoNerd" Evans2015-02-191-1/+0
| * | | | | | Take named arguments to @cached() decorator, add a 'max_entries' limitPaul "LeoNerd" Evans2015-02-192-16/+25
| * | | | | | Move @cached decorator out into synapse.storage._base; add minimal docsPaul "LeoNerd" Evans2015-02-192-27/+36
| * | | | | | Pull out the 'get_rooms_for_user' cache logic into a reüsable @cached decoratorPaul "LeoNerd" Evans2015-02-191-24/+29
| | |/ / / / | |/| | | |
* | | | | | Must update pending_transactions map before yield'ingErik Johnston2015-02-261-2/+2
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-02-235-3/+43
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-202-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Change version schemeErik Johnston2015-02-201-1/+1
| | * | | | Bump versionErik Johnston2015-02-201-1/+1
| | * | | | Add missing comma so that it generates a dict and not a setErik Johnston2015-02-201-1/+1
| | |/ / /
| * | | | Always allow AS to registerErik Johnston2015-02-201-3/+5
| * | | | Disable registration if config option was set.Erik Johnston2015-02-191-0/+4
| * | | | Add config option to disable registration.Erik Johnston2015-02-192-1/+35
| |/ / /
* | | | Revert get_auth_chain changesErik Johnston2015-02-231-7/+5
* | | | Implement and use new batched get missing pduErik Johnston2015-02-236-100/+144
* | | | Initial stab at implementing a batched get_missing_pdus requestErik Johnston2015-02-193-9/+135
|/ / /
* | | Send room ID in http notifications so clients know which room to go to if the...David Baker2015-02-191-0/+1
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-187-39/+98
|\ \ \
| * \ \ Merge pull request #82 from matrix-org/git_tag_versionErik Johnston2015-02-186-36/+95
| |\ \ \
| | * | | Conform to header spec take twoErik Johnston2015-02-181-1/+1
| | * | | Make /keys/ return correct Server versionErik Johnston2015-02-181-1/+5
| | * | | Make version_string conform to User-Agent and Server specErik Johnston2015-02-181-1/+1
| | * | | pyflakesErik Johnston2015-02-181-1/+0
| | * | | Use git aware version string in User-Agent and Server headersErik Johnston2015-02-184-34/+25
| | * | | When computing git version run git commands in same dir as source filesErik Johnston2015-02-181-0/+5
| | * | | Generate a version string that includes git details if run from git checkoutErik Johnston2015-02-181-1/+61
| * | | | Bump matrix-angular-sdk versionErik Johnston2015-02-181-3/+3
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1Erik Johnston2015-02-183-9/+33
|\| | |
| * | | Merge pull request #80 from matrix-org/restrict-destinationsErik Johnston2015-02-181-3/+27
| |\ \ \
| | * | | Restrict the destinations that synapse can talk toMark Haines2015-02-181-3/+27
| * | | | SYN-282: Don't log tracebacks for client errorsMark Haines2015-02-181-1/+1
| |/ / /
| * | | Fix syntaxMark Haines2015-02-181-1/+1
| * | | Move pynacl to the top of the depedency link list so that it isMark Haines2015-02-181-5/+5
* | | | Add errback to all deferreds in transaction_queueErik Johnston2015-02-181-14/+23
* | | | Remove unused importErik Johnston2015-02-181-2/+0
* | | | Discard destination 'localhost'Erik Johnston2015-02-181-2/+2
* | | | Don't send failure to selfErik Johnston2015-02-181-0/+3
* | | | Remove spurious comma. Remove temp run_on_reactorErik Johnston2015-02-181-2/+1
* | | | Temporarily add a run_on_reactor() callErik Johnston2015-02-181-0/+3
* | | | Don't convert DNSLookupError to a 4xx SynapseErrorErik Johnston2015-02-181-1/+1
* | | | Bump versionErik Johnston2015-02-181-1/+1
|/ / /
* | | Add .__name__ after type(e)Erik Johnston2015-02-181-2/+2
* | | Fix up ResponseNeverReceived to strErik Johnston2015-02-181-9/+11
* | | Fix pyflakesErik Johnston2015-02-181-1/+0
* | | strings.join() expects iterable of stringsErik Johnston2015-02-181-1/+1
* | | s/self._clock/self.clock/Erik Johnston2015-02-181-1/+1
* | | Merge branch 'keyclient_retry_scheme' of github.com:matrix-org/synapse into d...Erik Johnston2015-02-184-107/+252
|\ \ \
| * | | More docsErik Johnston2015-02-181-1/+5
| * | | Docs.Erik Johnston2015-02-181-1/+33
| * | | Try to only back off if we think we failed to connect to the remoteErik Johnston2015-02-173-89/+95
| * | | Only update destination_retry_timings if we have succeeded when retryingErik Johnston2015-02-171-0/+3
| * | | Remove spurious selfErik Johnston2015-02-171-1/+1
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into keyclient_retry_...Erik Johnston2015-02-171-1/+2
| |\ \ \
| * | | | Add per server retry limiting.Erik Johnston2015-02-174-122/+205
| * | | | Rate limit retries when fetching server keys.Erik Johnston2015-02-171-55/+71
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-02-188-57/+214
|\ \ \ \ \
| * \ \ \ \ Merge pull request #77 from matrix-org/failuresErik Johnston2015-02-184-17/+50
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-172-2/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Remove debug raiseErik Johnston2015-02-171-7/+0
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-171-2/+4
| | |\ \ \ \ \
| | * | | | | | Remove unused importErik Johnston2015-02-171-1/+0
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into failuresErik Johnston2015-02-1726-90/+1375
| | |\ \ \ \ \ \
| | * | | | | | | Consume errors in time_bound_deferredErik Johnston2015-02-171-2/+0
| | * | | | | | | Make matrixfederationclient log more nicelyErik Johnston2015-02-171-11/+12
| | * | | | | | | Format the response of transaction request in a nicer wayErik Johnston2015-02-172-6/+35
| | * | | | | | | Actually respond with JSON to incoming transactionErik Johnston2015-02-171-0/+2
| | * | | | | | | Handle recieving failures in transactionsErik Johnston2015-02-171-1/+12
| * | | | | | | | Merge pull request #79 from matrix-org/get_pdu_limitingErik Johnston2015-02-184-40/+164
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Rename _fail_fetch_pdu_cache to _get_pdu_cacheErik Johnston2015-02-182-9/+9
| | * | | | | | | Fix typo in function nameErik Johnston2015-02-171-1/+1
| | * | | | | | | ExpiringCache: purge every 1/2 intervalErik Johnston2015-02-171-1/+1
| | * | | | | | | Start the get_pdu cacheErik Johnston2015-02-171-0/+1
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into get_pdu_limitingErik Johnston2015-02-171-5/+8
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Cache results of get_pdu.Erik Johnston2015-02-161-3/+39
| | * | | | | | | Factor out ExpiringCache from StateHandlerErik Johnston2015-02-162-37/+124
* | | | | | | | | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into developErik Johnston2015-02-172-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge pull request #75 from matrix-org/dont_write_bytecodeErik Johnston2015-02-172-2/+4
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Don't write bytecodeErik Johnston2015-02-172-2/+4
* | | | | | | | | Use absolute path when loading delta sql filesErik Johnston2015-02-171-1/+2
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Bump schema versionErik Johnston2015-02-172-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'consumeErrors' of github.com:matrix-org/synapse into developErik Johnston2015-02-176-10/+12
|\| | | | | |
| * | | | | | We do want to consumeErrorErik Johnston2015-02-171-1/+1
| * | | | | | Use consumeErrors=True on all DeferredLists.Erik Johnston2015-02-175-9/+11
| |/ / / / /
* | | / / / Change some debug logging to infoErik Johnston2015-02-171-2/+4
| |_|/ / / |/| | | |
* | | | | Mark old events as outliers.Erik Johnston2015-02-161-1/+7
* | | | | Don't return anything from _handle_new_pdu, since we ignore the return value ...Erik Johnston2015-02-161-4/+1
| |/ / / |/| | |
* | | | Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into developErik Johnston2015-02-162-2/+2
|\| | |
| * | | Bump versionErik Johnston2015-02-151-1/+1
| * | | resolve_events expect lists, not dictsErik Johnston2015-02-151-1/+1
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-131-1/+1
|\| | |
| * | | Bump versionErik Johnston2015-02-131-1/+1
* | | | Merge branch 'hotfixes-0.7.0e' into developDavid Baker2015-02-132-12/+12
|\| | |
| * | | Update pushers by app id and pushkey, not user id and pushkeyDavid Baker2015-02-132-12/+12
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-02-132-2/+2
|\| | |
| * | | Bump version v0.7.0dErik Johnston2015-02-131-1/+1
| * | | Fix wrong variable nameErik Johnston2015-02-131-1/+1
* | | | Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-1325-75/+1360
|\ \ \ \
| * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-118-25/+202
| |\ \ \ \
| * | | | | Minor tweaks based on PR feedback.Kegan Dougal2015-02-112-4/+5
| * | | | | Fix newline on __init__Kegan Dougal2015-02-111-1/+0
| * | | | | PEP8-ifyKegan Dougal2015-02-114-9/+1
| * | | | | Add newline to EOFKegan Dougal2015-02-111-0/+1
| * | | | | Notify ASes for events sent by other users in a room which an AS user is a pa...Kegan Dougal2015-02-113-11/+31
| * | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-1124-79/+214
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-0917-137/+238
| |\ \ \ \ \ \
| * | | | | | | Fix bugs so lazy room joining works as intended.Kegan Dougal2015-02-093-12/+23
| * | | | | | | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-092-19/+19
| * | | | | | | Register a user account for the AS when the AS registers. Add 'sender' column...Kegan Dougal2015-02-095-4/+14
| * | | | | | | Add errcodes for appservice registrations.Kegan Dougal2015-02-061-4/+7
| * | | | | | | Pyflakes: unused variable.Kegan Dougal2015-02-061-1/+1
| * | | | | | | Grant ASes the ability to delete aliases in their own namespace.Kegan Dougal2015-02-062-7/+52
| * | | | | | | Grant ASes the ability to create alias in their own namespace.Kegan Dougal2015-02-064-24/+63
| * | | | | | | Add m.login.application_service registration procedure.Kegan Dougal2015-02-053-1/+44
| * | | | | | | Dependency inject ApplicationServiceApi when creating ApplicationServicesHand...Kegan Dougal2015-02-052-4/+6
| * | | | | | | Add delta sql file.Kegan Dougal2015-02-051-0/+33
| * | | | | | | Prevent user IDs in AS namespaces being created/deleted by humans.Kegan Dougal2015-02-051-0/+16
| * | | | | | | Prevent aliases in AS namespaces being created/deleted by users. Check with A...Kegan Dougal2015-02-051-9/+33
| * | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-4/+0
| |\ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-17 08:53:27 +0000