summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* PEP8Erik Johnston2015-04-076-13/+2
|
* Fix prepare_sqlite3_database's convert_param_styleErik Johnston2015-04-071-7/+2
|
* Bump database versionErik Johnston2015-04-071-1/+1
|
* Add index to presence tableErik Johnston2015-04-071-0/+2
|
* Don't use multiple UNIQUE constraints; it will cause deadlocksErik Johnston2015-04-074-15/+17
|
* Implement or_ignore flag on insertsErik Johnston2015-04-072-4/+10
|
* Don't use AUTOINCREMENT, use an in memory versionErik Johnston2015-04-075-19/+68
|
* Explicitly name the __main__ module loggerErik Johnston2015-04-071-1/+1
|
* Fix unicode supportErik Johnston2015-04-0222-168/+193
|
* Fix SQLite supportErik Johnston2015-04-011-3/+12
|
* Make work in both Maria and SQLite. Fix testsErik Johnston2015-04-0136-160/+296
|
* Fix unicode database supportErik Johnston2015-03-2515-44/+88
|
* Escape non printing ascii characterErik Johnston2015-03-241-3/+3
|
* Don't reinsert into event_edgesErik Johnston2015-03-241-8/+8
|
* Fix bugs in transactions storageErik Johnston2015-03-241-2/+3
|
* Don't use room hosts tableErik Johnston2015-03-241-25/+4
|
* Don't order by rowidErik Johnston2015-03-241-1/+1
|
* Use _simple_upsertErik Johnston2015-03-242-5/+7
|
* Remove uses of REPLACE and ON CONFLICT IGNORE to make the SQL more portable.Erik Johnston2015-03-234-16/+4
|
* Sanitize RoomMemberStoreErik Johnston2015-03-232-82/+61
|
* Use 'update or insert' rather than on 'conflict replace'Erik Johnston2015-03-231-10/+17
|
* Sanitize TransactionStoreErik Johnston2015-03-232-88/+105
|
* Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-03-2037-145/+542
|\
| * Merge pull request #113 from matrix-org/store_rearrangementErik Johnston2015-03-2020-621/+677
| |\ | | | | | | Store rearrangement
| | * 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 ↵Paul "LeoNerd" Evans2015-03-202-1/+3
| | | | | | | | | | | | it's read every time someone hits eventstream
| * | Allow @cached-wrapped functions to have more or fewer than 1 argument; ↵Paul "LeoNerd" Evans2015-03-201-13/+27
| | | | | | | | | | | | assert on the total count of them though
| | * 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-204-42/+62
| | |
| | * Rearrange storage modulesErik Johnston2015-03-207-515/+493
| |/
| * Merge pull request #112 from matrix-org/hotfixes-v0.8.1-r2 v0.8.1-r2Erik Johnston2015-03-192-1/+2
| |\ | | | | | | Hotfixes v0.8.1 r2
| | * Bump versionErik Johnston2015-03-191-1/+1
| | |
| | * Add missing servlet to listErik Johnston2015-03-191-0/+1
| |/
| * Merge branch 'hotfixes-0.8.1a' of github.com:matrix-org/synapse v0.8.1-r1Erik Johnston2015-03-192-2/+2
| |\
| | * Bump versionErik Johnston2015-03-191-1/+1
| | |
| | * D'oh - setup.py used the dict directly: make it use the wrapper function.David Baker2015-03-191-1/+1
| |/
| * Merge branch 'release-v0.8.1' of github.com:matrix-org/synapse v0.8.1Erik Johnston2015-03-1961-425/+1542
| |\
| | * Update CHANGESErik Johnston2015-03-181-0/+9
| | |
| | * Bump versionErik Johnston2015-03-181-1/+1
| | |
| | * Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-189-17/+272
| | |\ | | | | | | | | Disable registration by default. Add script to register new users.
| | | * 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
| | | |
| | | * Add note about disabling registration by defaultErik Johnston2015-03-131-0/+11
| | | |
| | | * Allow enabling of registration with --disable-registration falseErik Johnston2015-03-131-2/+8
| | | |
| | | * Rename register script to 'register_new_matrix_user'Erik Johnston2015-03-132-1/+1
| | | |
| | | * Change default server url to match default portsErik Johnston2015-03-131-2/+2
| | | |
| | | * PEP8Erik Johnston2015-03-131-1/+1
| | | |
| | | * Add 'register_new_user' scriptErik Johnston2015-03-132-1/+150
| | | |
| | | * 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 ↵Paul "LeoNerd" Evans2015-03-172-2/+7
| | | | | | | | | | | | | | | | improvement
| | * | Be polite and ensure we use @functools.wraps() when creating a function ↵Paul "LeoNerd" Evans2015-03-171-0/+2
| | | | | | | | | | | | | | | | decorator
| | * | pep8David Baker2015-03-171-2/+3
| | | |
| | * | Wire up the webclient optionDavid Baker2015-03-173-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | It existed but was hardcoded to True. Give it an underscore for consistency. Also don't pull in syweb unless we're actually using the web client.
* | | | Rearrange storage modulesErik Johnston2015-03-207-509/+486
| | | |
* | | | Generate transaction id in codeErik Johnston2015-03-201-1/+1
| | | |
* | | | decode_result takes an iterableErik Johnston2015-03-202-2/+5
| | | |
* | | | Make database selection configurableErik Johnston2015-03-202-11/+42
| | | |
* | | | Fix up schemas some moreErik Johnston2015-03-203-3/+3
| | | |
* | | | Convert storage layer to be mysql compatibleErik Johnston2015-03-1913-101/+171
| | | |
* | | | Remove redundant keyErik Johnston2015-03-191-1/+0
| | | |
* | | | Fix up schemas to work with mariadbErik Johnston2015-03-1915-84/+82
| | | |
* | | | Update schema to work with mariadbErik Johnston2015-03-1816-256/+224
| |/ / |/| |
* | | 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
|\ \ \ | | | | | | | | Fix ban
| * | | Fix testsErik Johnston2015-03-161-1/+1
| | | |
| * | | 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
| | | |
| * | | Fix testErik Johnston2015-03-161-1/+1
| | | |
| * | | 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
| | | | | | | | | | | | | | | | is wrong.
| * | | Respect ban membershipErik Johnston2015-03-161-5/+17
| |/ /
| * | Merge branch 'release-v0.8.0' of github.com:matrix-org/synapse v0.8.0Erik Johnston2015-03-0991-925/+2909
| |\ \
* | \ \ Merge pull request #111 from matrix-org/send_event_dont_wait_on_notifierErik Johnston2015-03-161-1/+10
|\ \ \ \ | | | | | | | | | | Don't block waiting on waking up all the listeners when sending an event
| * | | | Don't block waiting on waking up all the listeners when sending an event.Erik Johnston2015-03-161-1/+10
|/ / / /
* | | | add ToC and fix typoeMatthew Hodgson2015-03-141-1/+4
| | | |
* | | | actually uphold the bind_host parameter. in theory should make ipv6 binds ↵Matthew Hodgson2015-03-142-3/+13
| | | | | | | | | | | | | | | | work like bind_host: 'fe80::1%lo0'
* | | | uncommited WIP from MWCMatthew Hodgson2015-03-142-12/+15
| | | |
* | | | Merge pull request #108 from matrix-org/metricsPaul Evans2015-03-1320-44/+790
|\ \ \ \ | |_|_|/ |/| | | Metrics
| * | | 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 ↵Paul "LeoNerd" Evans2015-03-122-2/+15
| | | | | | | | | | | | | | | | | | | | muxed on the main listener
| * | | | Fold the slightly-odd bind_port/secure_port/etc.. logic into ↵Paul "LeoNerd" Evans2015-03-121-12/+11
| | | | | | | | | | | | | | | | | | | | SynapseHomeServer.start_listening()
| * | | | 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 ↵Paul "LeoNerd" Evans2015-03-121-7/+5
| | | | | | | | | | | | | | | | | | | | total time ever spent since boot
| * | | | 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 ↵Paul "LeoNerd" Evans2015-03-123-41/+29
| | | | | | | | | | | | | | | | | | | | specifically-written counters and distributions
| * | | | Add an .inc_by() method to CounterMetric; implement DistributionMetric a ↵Paul "LeoNerd" Evans2015-03-122-26/+16
| | | | | | | | | | | | | | | | | | | | neater way
| * | | | Rename the timer metrics exported by synapse.storage to append _time, so the ↵Paul "LeoNerd" Evans2015-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | meaning of ':total' is clearer
| * | | | 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-124-33/+37
| | | | |
| * | | | Pretend the 'getEvent' cache is just another cache in the set of all the ↵Paul "LeoNerd" Evans2015-03-121-6/+5
| | | | | | | | | | | | | | | | | | | | others for metric
| * | | | Export CacheMetric as hits+total, rather than hits+misses, as it's easier to ↵Paul "LeoNerd" Evans2015-03-122-8/+9
| | | | | | | | | | | | | | | | | | | | derive hit ratio from that
| * | | | 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-122-29/+33
| | | | |
| * | | | 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 ↵Paul "LeoNerd" Evans2015-03-121-2/+9
| | | | | | | | | | | | | | | | | | | | name, rather than a brand new scalar counter per counted method
| * | | | Bugfix to rendering output of vectored TimerMetricsPaul "LeoNerd" Evans2015-03-122-7/+6
| | | | |
| * | | | Rename Metrics' "keys" to "labels"Paul "LeoNerd" Evans2015-03-127-26/+26
| | | | |
| * | | | Provide some process resource usage metricsPaul "LeoNerd" Evans2015-03-121-0/+27
| | | | |
| * | | | Add TimerMetrics to shadow the PerformanceCounters in synapse.storage; with ↵Paul "LeoNerd" Evans2015-03-121-3/+20
| | | | | | | | | | | | | | | | | | | | the view to eventually replacing them entirely
| * | | | Put some gauge metrics on the number of notifier listeners, and notified-on ↵Paul "LeoNerd" Evans2015-03-121-0/+39
| | | | | | | | | | | | | | | | | | | | objects (users, rooms, appservices)
| * | | | 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 ↵Paul "LeoNerd" Evans2015-03-121-18/+15
| | | | | | | | | | | | | | | | | | | | base method that calls self.render_item
| * | | | Initial hack at a TimerMetric; for storing counts + duration accumulatorsPaul "LeoNerd" Evans2015-03-122-1/+83
| | | | |
| * | | | 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-122-3/+23
| | | | |
| * | | | Neater introspection methods on BaseMetric so that subclasses don't need to ↵Paul "LeoNerd" Evans2015-03-121-4/+11
| | | | | | | | | | | | | | | | | | | | touch self.keys directly
| * | | | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric ↵Paul "LeoNerd" Evans2015-03-124-19/+30
| | | | | | | | | | | | | | | | | | | | component to give the size of the cache
| * | | | Ensure that exceptions while rendering individual metrics don't stop others ↵Paul "LeoNerd" Evans2015-03-121-1/+10
| | | | | | | | | | | | | | | | | | | | from being rendered anyway - especially useful for CallbackMetric
| * | | | 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 ↵Paul "LeoNerd" Evans2015-03-123-2/+45
| | | | | | | | | | | | | | | | | | | | snapshot gauges
| * | | | Sprinkle some CacheCounterMetrics around the synapse.storage layerPaul "LeoNerd" Evans2015-03-121-1/+15
| | | | |
| * | | | Create the concept of a cachecounter metric; generating two counters ↵Paul "LeoNerd" Evans2015-03-123-8/+73
| | | | | | | | | | | | | | | | | | | | specific to caches
| * | | | Add vector counters to HTTP clients and servers; count the requests by ↵Paul "LeoNerd" Evans2015-03-123-4/+61
| | | | | | | | | | | | | | | | | | | | method and responses by method and response code
| * | | | Pull out all uses of the underlying HTTP user agent .request() method into a ↵Paul "LeoNerd" Evans2015-03-121-5/+10
| | | | | | | | | | | | | | | | | | | | single wrapper function, to make adding metrics easier
| * | | | Initial attempt at sprinkling some @metrics.counted decorations around the ↵Paul "LeoNerd" Evans2015-03-122-0/+28
| | | | | | | | | | | | | | | | | | | | federation code
| * | | | 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
| | | | | | | | | | | | | | | | | | | | keeping counter stats on method calls
| * | | | Delete pointless (and unreachable) __init__ method from FederationClientPaul "LeoNerd" Evans2015-03-121-2/+0
| | | | |
| * | | | Initial tiny attempt at (vectorable) counter metricsPaul "LeoNerd" Evans2015-03-123-0/+115
| | | | |
| * | | | A trivial 'hello world'-style resource on /_synapse/metrics, with optional ↵Paul "LeoNerd" Evans2015-03-122-0/+44
| | | | | | | | | | | | | | | | | | | | commandline flag
| * | | | 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
| | | | | | | | | | | | | | | | | | | | be found via config
| * | | | 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
| | |
* | | Merge pull request #107 from matrix-org/add_desc_to_storage_executePaul Evans2015-03-119-17/+18
|\ \ \ | | | | | | | | Add desc to storage execute
| * | | 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 ↵David Baker2015-03-104-33/+63
| | | | | | | | | | | | rules to be disabled by default.
* | | 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
|\ \ \ | | | | | | | | Add a Twisted Service to synapse.app.homeserver
| * | | Split out the 'run' from 'setup'Erik Johnston2015-03-101-26/+27
| | | |
| * | | Add documentation. When starting via twistd respect soft_file_limit config ↵Erik Johnston2015-03-101-2/+17
| | | | | | | | | | | | | | | | option.
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-03-09207-3564/+13910
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-01-2270-1666/+826
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py
| * | | | Add twisted Service interfaceErik Johnston2015-01-072-3/+19
| | | | |
* | | | | Merge pull request #101 from matrix-org/neaten-federation-servletsErik Johnston2015-03-091-182/+157
|\ \ \ \ \ | | | | | | | | | | | | Neaten federation servlets
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | need it
| * | | | | Slightly neater(?) arrangement of authentication wrapper for HTTP servlet ↵Paul "LeoNerd" Evans2015-03-051-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | methods
| * | | | | 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 ↵Paul "LeoNerd" Evans2015-03-051-170/+130
| | | | | | | | | | | | | | | | | | | | | | | | Servlet-style methods on instances
* | | | | | Merge pull request #104 from matrix-org/get_joined_rooms_for_userErik Johnston2015-03-098-21/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Get joined rooms for user
| * | | | | Fix testsErik Johnston2015-03-093-10/+10
| | | | | |
| * | | | | Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This ↵Erik Johnston2015-03-095-11/+12
|/ / / / / | | | | | | | | | | | | | | | uses the a storage api that is cached.
* | | | | D'oh: underscore, not hyphenDavid Baker2015-03-091-1/+1
| | | | |
* | | | | Call notifications should be override else they'll get clobbered by ↵David Baker2015-03-061-21/+21
| | | | | | | | | | | | | | | | | | | | sender/room rules.
* | | | | 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
| | | | | |
* | | | | | Update CHANGES to reflect no more fallback ruleDavid Baker2015-03-061-1/+0
| | | | | |
* | | | | | 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 ↵David Baker2015-03-061-9/+1
|/ / / / / | | | | | | | | | | | | | | | everything even if we don't know what it is.
* | | | | Update CHANGESErik Johnston2015-03-061-2/+31
| | | | |
* | | | | Update UPGRADES.rstErik Johnston2015-03-061-5/+2
| | | | |
* | | | | Add attribute so push gateways can tell if a member event is about the user ↵David Baker2015-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | in question
* | | | | Bump versionErik Johnston2015-03-061-1/+1
| | | | |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-03-063-54/+59
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #98 from matrix-org/hotfixes-v0.7.1-r4 v0.7.1-r4Erik Johnston2015-03-032-3/+3
| |\ \ \ \ | | | | | | | | | | | | Hotfixes v0.7.1 r4
| | * | | | Bump versionErik Johnston2015-03-031-1/+1
| | | | | |
| | * | | | Also bump version of downloaded sywebErik Johnston2015-03-031-2/+2
| |/ / / /
| * | | | Merge pull request #97 from matrix-org/hotfixes-v0.7.1-r3 v0.7.1-r3Erik Johnston2015-03-032-2/+2
| |\ \ \ \ | | | | | | | | | | | | Bump syweb dependency
| | * | | | Bump syweb dependencyErik Johnston2015-03-032-2/+2
| |/ / / /
| * | | | Merge pull request #87 from brabo/masterMark Haines2015-02-231-0/+2
| |\ \ \ \ | | | | | | | | | | | | added "cd ~/.synapse" before setup of the homeserver to generate our fil...
| | * | | | added "cd ~/.synapse" before setup of the homeserver to generate our files ↵brabo2015-02-221-0/+2
| |/ / / / | | | | | | | | | | | | | | | in there instead of ~
| * | | | Merge pull request #86 from matrix-org/v0.7.1-r2 v0.7.1-r2Erik Johnston2015-02-212-54/+57
| |\ \ \ \ | | | | | | | | | | | | V0.7.1 r2
| | * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Evolution of push rules
| * | | | | 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 ↵David Baker2015-03-062-6/+76
| | | | | | | | | | | | | | | | | | | | | | | | notifs for invites / random member events
| * | | | | 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 ↵David Baker2015-03-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | colour in appropriate clients.
| * | | | | Add default rule to suppress notices.David Baker2015-03-041-0/+13
| | | | | |
| * | | | | Merge branch 'develop' into pushrules2David Baker2015-03-0432-661/+818
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/schema/pusher.sql
| * \ \ \ \ \ Merge branch 'develop' into pushrules2David Baker2015-03-0433-202/+1044
| |\ \ \ \ \ \
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one to one rooms.
| * | | | | | | 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 ↵David Baker2015-02-262-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default dont-notify so you effectively have a "notify for everything else" switch you can turn on and off.
| * | | | | | | 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
| | | | | | | |
* | | | | | | | Merge pull request #103 from matrix-org/no_tls_private_keyErik Johnston2015-03-063-7/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't look for a TLS private key if we have set --no-tls
| * | | | | | | | 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
|/ / / / / / / /
* | | | | | | | Merge pull request #102 from matrix-org/randomize_stream_timeoutErik Johnston2015-03-061-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add some randomness to the user specified timeout on event streams to mi...
| * | | | | | | | Add some randomness to the user specified timeout on event streams to ↵Erik Johnston2015-03-061-0/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | mitigate against thundering herds problems
* | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Handle if get_missing_pdu returns 400 or not all events.
| * | | | | | | 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 ↵Paul "LeoNerd" Evans2015-03-051-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | response path, by 'continue'ing around a non-match or falling through
* | | | | | | | Rename rooms_to_listeners to room_to_listeners, for consistency with user_ ↵Paul "LeoNerd" Evans2015-03-051-8/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | and appservice_*
* | | / / / / Give LruCache a __len__, so that len(cache) worksPaul "LeoNerd" Evans2015-03-041-0/+7
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #99 from matrix-org/schema_versioningErik Johnston2015-03-0431-651/+329
|\ \ \ \ \ \ | | | | | | | | | | | | | | Schema versioning
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Twisted adbapi wrapped connections aren't context managers.
| * | | | | | 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-0430-622/+165
| | | | | | |
| * | | | | | SYN-67: Begin changing the way we handle schema versioningErik Johnston2015-03-021-38/+106
| | | | | | |
* | | | | | | WIP vertobridge ASMatthew Hodgson2015-03-041-0/+489
| |_|/ / / / |/| | | | |
* | | | | | Fix upgrade instructionsDavid Baker2015-03-021-2/+2
|/ / / / /
* | | | | 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-0210-69/+215
|\ \ \ \ \ | | | | | | | | | | | | Application services exclusive flag support