summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make one-to-one rule an underride otherwise bings don't work in one-to-one wr...David Baker2015-04-241-21/+21
* Fix spellingMark Haines2015-04-241-1/+1
* Call the super classes when generating configMark Haines2015-04-241-0/+1
* Copyright noticesMark Haines2015-04-246-0/+84
* No commas here, otherwise our error string constants become tuples.David Baker2015-04-241-2/+2
* Remove users from the remote_offline_serials list (and clean up empty element...Paul "LeoNerd" Evans2015-04-231-1/+11
* Don't let the remote offline serial list grow arbitrarily largePaul "LeoNerd" Evans2015-04-231-0/+5
* Store a list of the presence serial number at which remote users went offline...Paul "LeoNerd" Evans2015-04-231-0/+21
* Generate presence event-stream JSON structures directlyPaul "LeoNerd" Evans2015-04-231-8/+9
* Neater fetching of user's auth level in a room - squash to int() at access ti...Paul "LeoNerd" Evans2015-04-221-35/+12
* Appease pep8Paul "LeoNerd" Evans2015-04-221-1/+0
* Much neater fetching of defined powerlevels from m.room.power_levels state eventPaul "LeoNerd" Evans2015-04-211-31/+21
* Remove debugging print statement accidentally committedPaul "LeoNerd" Evans2015-04-211-1/+0
* Sanitise a user's powerlevel to an int() before numerical comparison, because...Paul "LeoNerd" Evans2015-04-211-0/+7
* Bump syutil version to 0.0.5Mark Haines2015-04-211-3/+3
* Merge pull request #128 from matrix-org/unify_http_wrappersMark Haines2015-04-217-289/+251
|\
| * Set a version_string in BaseMediaResource so that the request_handler wrapper...Mark Haines2015-04-211-0/+1
| * Combine the request wrappers in rest/media/v1 and http/server into a single w...Mark Haines2015-04-217-198/+140
| * Split out the JsonResource request logging and error handling into a separate...Mark Haines2015-04-211-94/+113
* | SYN-350: Don't ratelimit the individual events generated during room creationMark Haines2015-04-211-4/+4
|/
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-171-1/+1
|\
| * Bump versionErik Johnston2015-04-171-1/+1
* | Filter typing nofication events to only those rooms the requesting user is a ...Paul "LeoNerd" Evans2015-04-151-2/+14
* | Have TypingNotificationEventSource.get_new_events_for_user() return a deferre...Paul "LeoNerd" Evans2015-04-151-1/+1
* | Neater implementation of membership change auth checks, ensuring we can't for...Paul "LeoNerd" Evans2015-04-151-18/+10
* | Ensure that non-room-members cannot ban others, even if they do have enough p...Paul "LeoNerd" Evans2015-04-151-0/+5
* | Update syutil version to 0.0.4Mark Haines2015-04-142-4/+4
* | Move server key api into rest/key/v1Mark Haines2015-04-144-1/+29
* | Add commentMark Haines2015-04-091-0/+1
* | Unset the timer in the timeout callback so that we don't try to cancel it if ...Mark Haines2015-04-091-0/+1
* | SYN-339: Cancel the notifier timeout when the notifier firesMark Haines2015-04-091-4/+26
* | Merge pull request #114 from matrix-org/improve_get_event_cacheMark Haines2015-04-083-23/+34
|\ \
| * | Appease pep8Paul "LeoNerd" Evans2015-03-261-1/+2
| * | Implement the main getEvent cache using Cache() instead of a custom applicati...Paul "LeoNerd" Evans2015-03-251-12/+7
| * | Use FrozenEvent's reject_reason to decide whether to return it; don't include...Paul "LeoNerd" Evans2015-03-251-10/+14
| * | Store the rejected reason in (Frozen)Event structsPaul "LeoNerd" Evans2015-03-252-4/+12
| * | Indirect invalidations of _get_event_cache via a helper method to keep all us...Paul "LeoNerd" Evans2015-03-252-2/+5
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-082-2/+2
|\ \ \ | | |/ | |/|
| * | Bump versionErik Johnston2015-04-081-1/+1
| * | SYN-338: Fix typo that caused the cache to throw an exception in some instancesErik Johnston2015-04-081-1/+1
* | | typoErik Johnston2015-04-081-1/+1
* | | Don't yield on notifying all listenersErik Johnston2015-04-081-4/+36
* | | Merge pull request #117 from matrix-org/notifier-leakMark Haines2015-04-081-7/+46
|\ \ \
| * | | Move comment into docstringErik Johnston2015-04-081-5/+2
| * | | Factor out loops into '_discard_if_notified'Erik Johnston2015-04-081-15/+14
| * | | Also perform paranoia checks in 'on_new_user_event'Erik Johnston2015-04-081-2/+16
| * | | Add paranoia checks to make sure that we evict stale NotificationListeners wh...Erik Johnston2015-04-081-5/+31
| * | | Fix bug where we didn't inform the NotificataionListeners about new rooms the...Erik Johnston2015-04-081-0/+3
* | | | Move database timer logging to seperate loggerErik Johnston2015-04-081-1/+2
|/ / /
* | | Fix --enable-registration flag to work if you don't give a valueErik Johnston2015-04-071-1/+1
* | | Fix a bug which causes a send event level of 0 to not be honoured.Kegan Dougal2015-04-071-1/+1
* | | Appease pep8Paul "LeoNerd" Evans2015-04-011-0/+1
* | | Report process open filehandles in metricsPaul "LeoNerd" Evans2015-04-011-0/+34
* | | Fix more AS sender ID thinkos.Kegan Dougal2015-04-012-2/+12
* | | Merge branch 'develop' into application-services-registration-scriptKegan Dougal2015-04-011-1/+4
|\ \ \
| * | | Fix thinko whereby events *for the AS specifically* were not passed on.Kegan Dougal2015-03-311-1/+4
* | | | Add same user_id char checks as registration.Kegan Dougal2015-03-311-1/+7
* | | | Use a sender localpart instead of a user ID.Kegan Dougal2015-03-311-2/+9
* | | | PyflakesKegan Dougal2015-03-311-2/+1
* | | | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests.Kegan Dougal2015-03-312-13/+17
* | | | Fix tests and missing returns on deferreds.Kegan Dougal2015-03-312-8/+12
* | | | Remove more reg/unreg methods. Read config not database for cache.Kegan Dougal2015-03-312-197/+59
* | | | Remove appservice REST servletsKegan Dougal2015-03-316-196/+0
* | | | Add AppServiceConfigKegan Dougal2015-03-312-1/+33
|/ / /
* | | turn --disable-registration into --enable-registration, given the default is ...Matthew Hodgson2015-03-301-11/+11
* | | Revert "Add another @cached wrapper, this time on get_presence_state()"Paul "LeoNerd" Evans2015-03-271-8/+2
* | | Add another @cached wrapper, this time on get_presence_state()Paul "LeoNerd" Evans2015-03-271-2/+8
* | | Fixes from PR commentsKegan Dougal2015-03-262-3/+4
* | | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-2638-722/+1001
|\ \ \ | | |/ | |/|
| * | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()Paul "LeoNerd" Evans2015-03-251-8/+12
| * | Implement the 'key in dict' test for LruCache()Paul "LeoNerd" Evans2015-03-251-0/+7
| * | Reduce activity timer granularity to avoid too many quick updates (SYN-247)Paul "LeoNerd" Evans2015-03-231-0/+8
| * | Put a cache on get_aliases_for_roomPaul "LeoNerd" Evans2015-03-201-2/+8
| * | Remember the 'last seen' time for a given user/IP/device combination and only...Paul "LeoNerd" Evans2015-03-201-2/+30
| * | Pull out the cache logic from the @cached wrapper into its own class we can r...Paul "LeoNerd" Evans2015-03-201-35/+54
| * | func(*EXPR) is valid Python syntax, really...Paul "LeoNerd" Evans2015-03-201-2/+1
| * | PEP8Erik Johnston2015-03-201-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapse into store_rearrangementErik Johnston2015-03-203-14/+30
| |\ \
| | * | Add the tiniest of tiny one-element caches to get_room_events_max_id() as it'...Paul "LeoNerd" Evans2015-03-202-1/+3
| | * | Allow @cached-wrapped functions to have more or fewer than 1 argument; assert...Paul "LeoNerd" Evans2015-03-201-13/+27
| | |/
| * | Give sensible names for '_simple_...' transactionsErik Johnston2015-03-2013-38/+93
| * | Start removing TablesErik Johnston2015-03-202-26/+29
| * | Tidy up _simple_... methodsErik Johnston2015-03-202-40/+60
| * | Rearrange storage modulesErik Johnston2015-03-207-515/+493
| |/
| * Bump versionErik Johnston2015-03-191-1/+1
| * Add missing servlet to listErik Johnston2015-03-191-0/+1
| * Bump versionErik Johnston2015-03-191-1/+1
| * Bump versionErik Johnston2015-03-181-1/+1
| * Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-186-16/+111
| |\
| | * Factor out user id validation checksErik Johnston2015-03-182-9/+13
| | * Do more validation of incoming requestErik Johnston2015-03-181-3/+3
| | * Comment.Erik Johnston2015-03-161-0/+3
| | * Use 403 instead of 400Erik Johnston2015-03-161-1/+1
| | * Allow enabling of registration with --disable-registration falseErik Johnston2015-03-131-2/+8
| | * PEP8Erik Johnston2015-03-131-1/+1
| | * Add missing commasErik Johnston2015-03-131-2/+2
| | * Implement registering with shared secret.Erik Johnston2015-03-134-5/+83
| | * Disable registration by defaultErik Johnston2015-03-131-0/+4
| * | Clean out event_forward_extremities table when the server rejoins the roomErik Johnston2015-03-182-0/+14
| * | @cached() annotate get_user_by_token() - achieves a minor DB performance impr...Paul "LeoNerd" Evans2015-03-172-2/+7
| * | Be polite and ensure we use @functools.wraps() when creating a function decor...Paul "LeoNerd" Evans2015-03-171-0/+2
| * | pep8David Baker2015-03-171-2/+3
| * | Wire up the webclient optionDavid Baker2015-03-173-8/+24
| * | Add a DistributionMetric to HTTP request/response processing time in the serverPaul "LeoNerd" Evans2015-03-161-0/+9
| * | Add a metric for the scheduling latency of SQL queriesPaul "LeoNerd" Evans2015-03-161-0/+5
| * | Merge pull request #110 from matrix-org/fix_banErik Johnston2015-03-166-52/+32
| |\ \
| | * | Copy dict of context.current_state before changing it.Erik Johnston2015-03-161-1/+1
| | * | Revert incorrect changes to where we send eventsErik Johnston2015-03-161-3/+4
| | * | Remove concept of context.auth_events, instead use context.current_stateErik Johnston2015-03-165-33/+7
| | * | Send all membership events to the remote homeserverErik Johnston2015-03-161-4/+3
| | * | Make context.auth_events grap auth events from current state. Otherwise auth ...Erik Johnston2015-03-162-18/+12
| | * | Respect ban membershipErik Johnston2015-03-161-5/+17
| * | | Don't block waiting on waking up all the listeners when sending an event.Erik Johnston2015-03-161-1/+10
* | | | Set the service ID as soon as it is known.Kegan Dougal2015-03-162-4/+5
* | | | Implement ServiceQueuer with tests.Kegan Dougal2015-03-161-16/+30
* | | | Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ...Kegan Dougal2015-03-161-28/+33
* | | | Wrap polling/retry blocks in try/excepts to avoid sending to other ASes break...Kegan Dougal2015-03-161-29/+39
* | | | Minor PR comment tweaks.Kegan Dougal2015-03-164-8/+14
* | | | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-1636-349/+1003
|\| | |
| * | | actually uphold the bind_host parameter. in theory should make ipv6 binds wor...Matthew Hodgson2015-03-142-3/+13
| * | | Merge pull request #108 from matrix-org/metricsPaul Evans2015-03-1318-44/+629
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'origin/develop' into metricsPaul "LeoNerd" Evans2015-03-121-2/+8
| | |\ \
| | * | | Appease pyflakesPaul "LeoNerd" Evans2015-03-121-1/+1
| | * | | Delete unused import of NOT_READY_YETPaul "LeoNerd" Evans2015-03-121-1/+0
| | * | | Appease pep8Paul "LeoNerd" Evans2015-03-129-27/+46
| | * | | Option to serve metrics from their own localhost-only TCP port instead of mux...Paul "LeoNerd" Evans2015-03-122-2/+15
| | * | | Fold the slightly-odd bind_port/secure_port/etc.. logic into SynapseHomeServe...Paul "LeoNerd" Evans2015-03-121-12/+11
| | * | | Build MetricsResource as a specific HomeServer dependencyPaul "LeoNerd" Evans2015-03-122-6/+11
| | * | | Bugfix to sql_txn_timer increment - add only the per-TXN duration, not the to...Paul "LeoNerd" Evans2015-03-121-7/+5
| | * | | Neater metrics from TransactionQueuePaul "LeoNerd" Evans2015-03-121-9/+11
| | * | | Add a counter to track total number of events served by the notifierPaul "LeoNerd" Evans2015-03-121-0/+3
| | * | | Replace the @metrics.counted annotations in federation with specifically-writ...Paul "LeoNerd" Evans2015-03-123-41/+29
| | * | | Add an .inc_by() method to CounterMetric; implement DistributionMetric a neat...Paul "LeoNerd" Evans2015-03-121-23/+14
| | * | | Rename the timer metrics exported by synapse.storage to append _time, so the ...Paul "LeoNerd" Evans2015-03-121-3/+3
| | * | | Don't forbid '_' in metric basenames any more, to allow things like foo_timePaul "LeoNerd" Evans2015-03-121-5/+0
| | * | | Rename TimerMetric to DistributionMetric; as it could count more than just timePaul "LeoNerd" Evans2015-03-123-21/+25
| | * | | Pretend the 'getEvent' cache is just another cache in the set of all the othe...Paul "LeoNerd" Evans2015-03-121-6/+5
| | * | | Export CacheMetric as hits+total, rather than hits+misses, as it's easier to ...Paul "LeoNerd" Evans2015-03-121-5/+6
| | * | | Count incoming HTTP requests per servlet that respondsPaul "LeoNerd" Evans2015-03-122-7/+15
| | * | | Remember to emit final linefeed from /metrics page, or Prometheus gets upsetPaul "LeoNerd" Evans2015-03-121-0/+2
| | * | | Prometheus needs "escaped" label valuesPaul "LeoNerd" Evans2015-03-121-2/+6
| | * | | Kill unused CounterMetric.fetch() methodPaul "LeoNerd" Evans2015-03-121-3/+0
| | * | | Use _ instead of . as a metric namespacing separator, for PrometheusPaul "LeoNerd" Evans2015-03-128-18/+34
| | * | | Have all @metrics.counted use a single metric name vectored on the method nam...Paul "LeoNerd" Evans2015-03-121-2/+9
| | * | | Bugfix to rendering output of vectored TimerMetricsPaul "LeoNerd" Evans2015-03-121-3/+2
| | * | | Rename Metrics' "keys" to "labels"Paul "LeoNerd" Evans2015-03-126-23/+23
| | * | | Provide some process resource usage metricsPaul "LeoNerd" Evans2015-03-121-0/+27
| | * | | Add TimerMetrics to shadow the PerformanceCounters in synapse.storage; with t...Paul "LeoNerd" Evans2015-03-121-3/+20
| | * | | Put some gauge metrics on the number of notifier listeners, and notified-on o...Paul "LeoNerd" Evans2015-03-121-0/+39
| | * | | Collect per-SQL-verb timer stats on query execution timePaul "LeoNerd" Evans2015-03-121-5/+11
| | * | | Neater register_* methods on overall Metrics containerPaul "LeoNerd" Evans2015-03-121-22/+12
| | * | | Neater implementation of metric render methods by pulling out 'render' as a b...Paul "LeoNerd" Evans2015-03-121-18/+15
| | * | | Initial hack at a TimerMetric; for storing counts + duration accumulatorsPaul "LeoNerd" Evans2015-03-121-0/+48
| | * | | Delete a couple of TODO markers of monitoring stats now donePaul "LeoNerd" Evans2015-03-122-2/+0
| | * | | Put vector gauges on transaction queue pending PDU and EDU dictsPaul "LeoNerd" Evans2015-03-121-2/+14
| | * | | Ensure that /_synapse/metrics response is UTF-8 encodedPaul "LeoNerd" Evans2015-03-121-1/+2
| | * | | Implement vector CallbackMetricsPaul "LeoNerd" Evans2015-03-121-2/+6
| | * | | Neater introspection methods on BaseMetric so that subclasses don't need to t...Paul "LeoNerd" Evans2015-03-121-4/+11
| | * | | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric component...Paul "LeoNerd" Evans2015-03-123-10/+15
| | * | | Ensure that exceptions while rendering individual metrics don't stop others f...Paul "LeoNerd" Evans2015-03-121-1/+10
| | * | | Add a scalar gauge metric on the size of the presence user cachemapPaul "LeoNerd" Evans2015-03-121-0/+7
| | * | | Initial attempt at a scalar callback-based metric to give instantaneous snaps...Paul "LeoNerd" Evans2015-03-122-1/+24
| | * | | Sprinkle some CacheCounterMetrics around the synapse.storage layerPaul "LeoNerd" Evans2015-03-121-1/+15
| | * | | Create the concept of a cachecounter metric; generating two counters specific...Paul "LeoNerd" Evans2015-03-122-7/+47
| | * | | Add vector counters to HTTP clients and servers; count the requests by method...Paul "LeoNerd" Evans2015-03-123-4/+61
| | * | | Pull out all uses of the underlying HTTP user agent .request() method into a ...Paul "LeoNerd" Evans2015-03-121-5/+10
| | * | | Initial attempt at sprinkling some @metrics.counted decorations around the fe...Paul "LeoNerd" Evans2015-03-122-0/+28
| | * | | Have the MetricsResource actually render metric countersPaul "LeoNerd" Evans2015-03-121-1/+3
| | * | | An initial implementation of a 'metrics' instance, similar to a 'logger' for ...Paul "LeoNerd" Evans2015-03-121-0/+69
| | * | | Delete pointless (and unreachable) __init__ method from FederationClientPaul "LeoNerd" Evans2015-03-121-2/+0
| | * | | Initial tiny attempt at (vectorable) counter metricsPaul "LeoNerd" Evans2015-03-121-0/+54
| | * | | A trivial 'hello world'-style resource on /_synapse/metrics, with optional co...Paul "LeoNerd" Evans2015-03-122-0/+44
| | * | | Commandline option to enable metrics systemPaul "LeoNerd" Evans2015-03-122-1/+34
| | * | | No need to explicitly pass 'web_client' in to create_resource_tree as it can ...Paul "LeoNerd" Evans2015-03-121-2/+3
| | * | | Expose 'config' as a real HomeServer dependency keyPaul "LeoNerd" Evans2015-03-121-0/+1
| * | | | Also bump dependency link versionErik Johnston2015-03-131-2/+2
| * | | | bump dep on syweb 0.6.5Matthew Hodgson2015-03-122-3/+4
| | |/ / | |/| |
| * | | More sacrifices to the pep8 gods.David Baker2015-03-121-2/+8
| |/ /
| * | Log the matching push rule.David Baker2015-03-111-2/+4
| * | Appease pep8Paul "LeoNerd" Evans2015-03-111-2/+2
| * | Also give _execute() a descriptionPaul "LeoNerd" Evans2015-03-116-12/+10
| * | Add a description to storage layer's _execute_and_decode()Paul "LeoNerd" Evans2015-03-115-6/+9
| * | Again, underscore, not hyphenDavid Baker2015-03-111-1/+1
| * | 'false' is not FalseDavid Baker2015-03-111-5/+5
| * | PEP8 blank linesDavid Baker2015-03-111-0/+1
| * | Add the master push rule for the break-my-push button. Allow server default r...David Baker2015-03-104-33/+63
| * | These aren't defined for redacted events so don't crashDavid Baker2015-03-101-2/+4
| * | 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
| |\ \ \ \
| * | | | | 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
* | | | | | Fix remaining scheduler bugs. Add more informative logging.Kegan Dougal2015-03-103-37/+28
* | | | | | Remove unused importKegan Dougal2015-03-091-1/+0
* | | | | | Bug fixes whilst putting it all togetherKegan Dougal2015-03-093-6/+8
* | | | | | Use event IDs instead of dumping event content in the txns table.Kegan Dougal2015-03-092-7/+9
* | | | | | Use seconds; start gluing in the AS scheduler into the AS handler.Kegan Dougal2015-03-094-8/+28
* | | | | | Finish appservice txn storage impl and tests.Kegan Dougal2015-03-092-16/+71
* | | | | | Implement create_appservice_txn with tests.Kegan Dougal2015-03-091-4/+42
* | | | | | Partially implement txn store methods with tests.Kegan Dougal2015-03-091-17/+44
* | | | | | Start implementing ApplicationServiceTransactionStoreKegan Dougal2015-03-061-1/+5
* | | | | | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-0617-123/+470
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | When setting display name more graciously handle failures to update room state.Erik Johnston2015-03-061-7/+13
| |/ / / /
| * | | | 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-01 16:28:33 +0000