summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add methods for storing and retrieving the raw key jsonMark Haines2015-04-152-3/+59
* Return a sha256 fingerprint rather than the entire tls certificateMark Haines2015-04-142-1/+25
* Merge pull request #114 from matrix-org/improve_get_event_cacheMark Haines2015-04-082-21/+30
|\
| * 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-251-2/+8
| * Indirect invalidations of _get_event_cache via a helper method to keep all us...Paul "LeoNerd" Evans2015-03-252-2/+5
* | Move database timer logging to seperate loggerErik Johnston2015-04-081-1/+2
* | 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
* | 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-311-7/+11
* | Remove more reg/unreg methods. Read config not database for cache.Kegan Dougal2015-03-311-160/+59
* | 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-261-2/+2
* | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-2619-644/+795
|\|
| * Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()Paul "LeoNerd" Evans2015-03-251-8/+12
| * 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
| |/
| * Clean out event_forward_extremities table when the server rejoins the roomErik Johnston2015-03-181-0/+12
| * @cached() annotate get_user_by_token() - achieves a minor DB performance impr...Paul "LeoNerd" Evans2015-03-171-1/+6
| * Be polite and ensure we use @functools.wraps() when creating a function decor...Paul "LeoNerd" Evans2015-03-171-0/+2
| * 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-161-1/+1
| |\
| | * Copy dict of context.current_state before changing it.Erik Johnston2015-03-161-1/+1
* | | Set the service ID as soon as it is known.Kegan Dougal2015-03-161-3/+4
* | | Minor PR comment tweaks.Kegan Dougal2015-03-162-4/+4
* | | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-169-54/+83
|\| |
| * | Bugfix to sql_txn_timer increment - add only the per-TXN duration, not the to...Paul "LeoNerd" Evans2015-03-121-7/+5
| * | Rename the timer metrics exported by synapse.storage to append _time, so the ...Paul "LeoNerd" Evans2015-03-121-3/+3
| * | Rename TimerMetric to DistributionMetric; as it could count more than just timePaul "LeoNerd" Evans2015-03-121-7/+7
| * | Pretend the 'getEvent' cache is just another cache in the set of all the othe...Paul "LeoNerd" Evans2015-03-121-6/+5
| * | Use _ instead of . as a metric namespacing separator, for PrometheusPaul "LeoNerd" Evans2015-03-121-5/+13
| * | Rename Metrics' "keys" to "labels"Paul "LeoNerd" Evans2015-03-121-3/+3
| * | Add TimerMetrics to shadow the PerformanceCounters in synapse.storage; with t...Paul "LeoNerd" Evans2015-03-121-3/+20
| * | Collect per-SQL-verb timer stats on query execution timePaul "LeoNerd" Evans2015-03-121-5/+11
| * | Delete a couple of TODO markers of monitoring stats now donePaul "LeoNerd" Evans2015-03-121-1/+0
| * | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric component...Paul "LeoNerd" Evans2015-03-121-3/+3
| * | Sprinkle some CacheCounterMetrics around the synapse.storage layerPaul "LeoNerd" Evans2015-03-121-1/+15
| * | 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
| * | Add the master push rule for the break-my-push button. Allow server default r...David Baker2015-03-101-22/+5
| * | These aren't defined for redacted events so don't crashDavid Baker2015-03-101-2/+4
| |/
* | Fix remaining scheduler bugs. Add more informative logging.Kegan Dougal2015-03-101-2/+3
* | Remove unused importKegan Dougal2015-03-091-1/+0
* | Bug fixes whilst putting it all togetherKegan Dougal2015-03-091-5/+4
* | 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-091-2/+5
* | 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-062-1/+56
|\|
| * Schema change as delta in v14David Baker2015-03-061-0/+0
| * Merge branch 'develop' into pushrules2David Baker2015-03-0429-606/+325
| |\
| * \ Merge branch 'develop' into pushrules2David Baker2015-03-046-33/+279
| |\ \
| * | | 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-021-3/+3
| * | | Blank linesDavid Baker2015-03-021-0/+1
| * | | Add API for getting/setting enabled-ness of push rules.David Baker2015-02-261-0/+24
| * | | whitespaceDavid Baker2015-02-261-1/+2
| * | | Add enable/disable overlay for push rules (REST API not yet hooked up)David Baker2015-02-253-0/+39
* | | | Assign the AS ID from the database; replace old placeholder txn id.Kegan Dougal2015-03-061-2/+3
* | | | Add appservice txns sql schemaKegan Dougal2015-03-063-1/+38
* | | | Apply clarity and docstringsKegan Dougal2015-03-061-1/+13
* | | | Finish synapse.appservice.scheduler implementation.Kegan Dougal2015-03-061-0/+22
* | | | Flesh out more stub functions.Kegan Dougal2015-03-061-2/+15
* | | | Add stub ApplicationServiceTransactionStore. Bootstrap Recoverers. Fill in st...Kegan Dougal2015-03-061-0/+28
| |_|/ |/| |
* | | 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-0428-567/+161
* | | 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
* | Merge pull request #93 from matrix-org/application-services-exclusiveKegsay2015-03-022-4/+14
|\ \
| * | Run deltas and bump user_version in upgrade scriptKegan Dougal2015-03-021-1/+1
| * | Convert expected format for AS regex to include exclusivity.Kegan Dougal2015-02-271-3/+13
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-03-025-91/+279
|\ \
| * | 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
| * | 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-261-7/+55
| * | 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-252-0/+40
| |/
| * 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
| * 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
* | Revert get_auth_chain changesErik Johnston2015-02-231-7/+5
* | Initial stab at implementing a batched get_missing_pdus requestErik Johnston2015-02-191-5/+58
|/
* 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-171-1/+1
|\
| * Use consumeErrors=True on all DeferredLists.Erik Johnston2015-02-171-1/+1
* | Merge branch 'hotfixes-0.7.0e' into developDavid Baker2015-02-131-6/+6
|\|
| * Update pushers by app id and pushkey, not user id and pushkeyDavid Baker2015-02-131-6/+6
* | Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-134-0/+315
|\ \
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-113-22/+75
| |\ \
| * | | PEP8-ifyKegan Dougal2015-02-111-3/+0
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-112-3/+70
| |\ \ \
| * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-093-24/+36
| |\ \ \ \
| * | | | | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-091-1/+3
| * | | | | Register a user account for the AS when the AS registers. Add 'sender' column...Kegan Dougal2015-02-093-2/+5
| * | | | | Add delta sql file.Kegan Dougal2015-02-051-0/+33
| * | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-054-84/+145
| |\ \ \ \ \ \
| * | | | | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-052-5/+13
| * | | | | | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-041-4/+14
| * | | | | | | Add stub ApplicationServiceApi and glue it with the handler.Kegan Dougal2015-02-041-0/+1
| * | | | | | | Add appservice package and move ApplicationService into it.Kegan Dougal2015-02-031-104/+1
| * | | | | | | Implement restricted namespace checks. Begin fleshing out the main hook for n...Kegan Dougal2015-02-031-5/+16
| * | | | | | | Add namespace constants. Add restrict_to option to limit namespace checks.Kegan Dougal2015-02-031-17/+24
| * | | | | | | Everyone loves SQL typosKegan Dougal2015-02-031-1/+1
| * | | | | | | Implement regex checks for app services.Kegan Dougal2015-02-031-27/+44
| * | | | | | | Add defers in the right places.Kegan Dougal2015-02-021-0/+2
| * | | | | | | Implement txns for AS (un)registration.Kegan Dougal2015-02-022-22/+100
| * | | | | | | Actually merge into develop.Kegan Dougal2015-02-021-8/+1
| * | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-0213-29/+867
| |\ \ \ \ \ \ \
| * | | | | | | | Add basic application_services SQL, and hook up parts of the appservice store...Kegan Dougal2015-01-283-11/+111
| * | | | | | | | Remove unused importKegan Dougal2015-01-281-2/+0
| * | | | | | | | Log when ASes are registered/unregistered.Kegan Dougal2015-01-271-1/+3
| * | | | | | | | Use ApplicationService when registering.Kegan Dougal2015-01-271-10/+6
| * | | | | | | | Add stub methods, TODOs and docstrings for application services.Kegan Dougal2015-01-271-2/+50
| * | | | | | | | Add AS specific classes with docstrings.Kegan Dougal2015-01-271-1/+59
| * | | | | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-272-2/+48
* | | | | | | | | Prepare the database whenever a connection is opened from the db_pool so that...Mark Haines2015-02-131-0/+3
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0aErik Johnston2015-02-121-7/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Get an auth query one at a timeErik Johnston2015-02-121-7/+6
* | | | | | | | | Set database schema version in deltaErik Johnston2015-02-121-0/+2
|/ / / / / / / /
* | | | | | | | Convert get_rooms to use runInteraction so the transacion has a more helpful ...Erik Johnston2015-02-111-30/+37
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejsonErik Johnston2015-02-113-22/+75
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'bugs/SYN-264' into developPaul "LeoNerd" Evans2015-02-111-18/+50
| |\ \ \ \ \ \ \
| | * | | | | | | Added another TODO notePaul "LeoNerd" Evans2015-02-111-0/+3
| | * | | | | | | Cache the result of a get_rooms_for_user query, to make user_rooms_intersect(...Paul "LeoNerd" Evans2015-02-111-7/+34
| | * | | | | | | First step of making user_rooms_intersect() faster - implement in intersectio...Paul "LeoNerd" Evans2015-02-111-18/+20
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Invalidate the cache for an event if it is redactedMark Haines2015-02-111-0/+2
| * | | | | | | Fix formattingMark Haines2015-02-111-2/+0
| * | | | | | | Add a cache for get_eventMark Haines2015-02-112-3/+24
| |/ / / / / /
* | | | | | | pyflakesErik Johnston2015-02-111-1/+0
* | | | | | | Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder...Erik Johnston2015-02-111-2/+9
* | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-114-4/+4
|/ / / / / /
* | | | | | Code-style fixesMark Haines2015-02-102-4/+6
* | | | | | Fix pyflakesMark Haines2015-02-101-3/+3
* | | | | | Add performance counters for different stages of loading eventsMark Haines2015-02-101-24/+60
* | | | | | Use the transaction 'desc' rather than 'name', increment the txn_ids inMark Haines2015-02-091-3/+3
* | | | | | FormattingMark Haines2015-02-091-1/+0
* | | | | | Performance counters for database transaction namesMark Haines2015-02-091-1/+31
| |_|_|_|/ |/| | | |
* | | | | Fix typoErik Johnston2015-02-091-1/+1
* | | | | Log database time every 10s and log as percentageErik Johnston2015-02-091-2/+2
* | | | | Time how long we're spending on the database threadErik Johnston2015-02-091-0/+25
* | | | | Move delta/v13.sql to delta/v12.sqlErik Johnston2015-02-062-24/+11
| |_|_|/ |/| | |
* | | | Give server default rules the 'default' attribute and fix various brokenness.David Baker2015-02-051-2/+5
| |_|/ |/| |
* | | Merge pull request #47 from matrix-org/signature_failuresErik Johnston2015-02-051-75/+136
|\ \ \
| * | | Brief comment on why we do some things on every call to persist_event and not...Erik Johnston2015-02-041-0/+6
| * | | Rearrange persist_event so that do all the queries that need to be done befor...Erik Johnston2015-02-041-71/+74
| * | | Add doc to get_eventErik Johnston2015-02-031-0/+15
| * | | Try to ensure we don't persist an event we have already persisted. In persist...Erik Johnston2015-02-031-4/+36
| * | | Don't fail an entire request if one of the returned events fails a signature ...Erik Johnston2015-02-021-8/+13
| | |/ | |/|
* / | s/instance_handle/profile_tag/David Baker2015-02-033-9/+9
|/ /
* | Merge pull request #43 from matrix-org/rejectionsErik Johnston2015-01-301-1/+11
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-308-11/+141
| |\ \
| * \ \ Merge branch 'replication_split' of github.com:matrix-org/synapse into reject...Erik Johnston2015-01-301-5/+0
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-308-6/+562
| |\ \ \ \
| * | | | | Initial implementation of auth conflict resolutionErik Johnston2015-01-291-2/+2
| * | | | | Start implementing auth conflict resErik Johnston2015-01-282-0/+11
* | | | | | Merge pull request #41 from matrix-org/client_v2_syncMark Haines2015-01-301-11/+49
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-301-4/+0
| |\ \ \ \ \
| * | | | | | Fix token formattingMark Haines2015-01-301-2/+2
| * | | | | | Filter the recent events before applying the limit when doing an incremental ...Mark Haines2015-01-301-6/+15
| * | | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-292-5/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-296-12/+132
| |\ \ \ \ \ \ \
| * | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of chang...Mark Haines2015-01-291-0/+7
| * | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-287-4/+563
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix FormattingMark Haines2015-01-271-1/+0
| * | | | | | | | | Start implementing incremental initial syncMark Haines2015-01-271-9/+32
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #42 from matrix-org/replication_splitMark Haines2015-01-301-0/+29
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli...Erik Johnston2015-01-308-6/+556
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Split up replication_layer module into client, server and transaction queueErik Johnston2015-01-261-1/+1
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-231-2/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Add storage method have_eventsErik Johnston2015-01-231-0/+29
* | | | | | | | | 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-304-1/+121
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-304-1/+114
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_userMark Haines2015-01-301-4/+0
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge branch 'develop' into client_v2_filterMark Haines2015-01-292-5/+6
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge changes from developMark Haines2015-01-298-6/+568
| | |\ \ \ \ \ \
| | * | | | | | | Move bump schema deltaMark Haines2015-01-291-0/+0
| | * | | | | | | 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-281-2/+2
| | * | | | | | | Created schema deltaPaul "LeoNerd" Evans2015-01-272-1/+25
| | * | | | | | | Initial stab at real SQL storage implementation of user filter definitionsPaul "LeoNerd" Evans2015-01-273-14/+60
| | * | | | | | | Move storage of user filters into real datastore layer; now have to mock it o...Paul "LeoNerd" Evans2015-01-272-1/+48
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Add room member count condition and default rule to make a noise on rooms of ...David Baker2015-01-301-1/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | 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 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-309-8/+559
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Code style fixes.Mark Haines2015-01-292-5/+6
| | |/ / | |/| |
| * | | 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
| | |/ | |/|
| * | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-281-1/+2
| |\ \
| | * | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-281-1/+2
| | |/
| * | Move pushers delta to v12 and bump schema versionDavid Baker2015-01-282-1/+1
| * | 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
| * | Merge branch 'develop' into pushersDavid Baker2015-01-281-2/+3
| |\|