summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Ensure check_same_thread is enabled for sqlite3Erik Johnston2015-04-271-0/+1
* Make get_max_token into inlineCallbacks so that the lock works.Erik Johnston2015-04-271-3/+4
* Add docs on how to use synapse with psycopg2Erik Johnston2015-04-271-0/+34
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-2724-391/+642
|\
| * Merge pull request #132 from matrix-org/observer_and_locksErik Johnston2015-04-273-1/+42
| |\
| | * Fix newlinesErik Johnston2015-04-271-2/+1
| | * Pull inner function out.Erik Johnston2015-04-271-76/+77
| | * Implement locks using create_observer for fetching media and server keysErik Johnston2015-04-272-60/+82
| | * Implement create_observer.Erik Johnston2015-04-271-0/+19
| |/
| * Add note about updating your signing keys (ie. "the auto thing")David Baker2015-04-241-0/+9
| * Matrix ID server is now HTTPSDavid Baker2015-04-241-1/+1
| * Remove ancient historyDavid Baker2015-04-241-4/+0
| * Pedant: OS X has a spaceDavid Baker2015-04-241-1/+1
| * 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-232-1/+38
| * 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-232-0/+59
| * Generate presence event-stream JSON structures directlyPaul "LeoNerd" Evans2015-04-231-8/+9
| * Mumble ReST mumble ``fixed-width`` mumblePaul "LeoNerd" Evans2015-04-231-5/+5
| * Formatting / wording fixes to metrics docPaul "LeoNerd" Evans2015-04-231-12/+13
| * prometheus/metrics howto from LeoMatthew Hodgson2015-04-231-0/+49
| * 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
| * Add info on breaking AS API changesKegsay2015-04-221-0/+34
| * 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
| * | Merge pull request #127 from matrix-org/bugs/SYN-350Mark Haines2015-04-211-4/+4
| |\ \ | | |/ | |/|
| | * SYN-350: Don't ratelimit the individual events generated during room creationMark Haines2015-04-211-4/+4
| |/
* | Shuffle operations so that locking upsert happens last in the txn. This ensur...Erik Johnston2015-04-275-56/+56
* | Handle the fact that postgres databases can be restarted from under usErik Johnston2015-04-273-1/+33
* | Revert needless change to rest.profileErik Johnston2015-04-171-6/+1
* | Revert needless change to storage.profileErik Johnston2015-04-171-6/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-172-2/+7
|\|
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-172-2/+7
| |\
| | * Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 v0.8.1-r4Erik Johnston2015-04-172-2/+7
| | |\
| | | * The new parameter to urlopen is "context" not "ctx"Mark Haines2015-04-171-1/+1
| | | * Bump versionErik Johnston2015-04-171-1/+1
| | | * As of version 2.7.9, urllib2 now checks SSL certsErik Johnston2015-04-171-1/+6
| | |/
* | | Update --database-path metavar to SQLITE_DATABASE_PATHErik Johnston2015-04-171-1/+1
* | | PEP8Erik Johnston2015-04-171-2/+1
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-175-23/+141
|\| |
| * | Add kick users scriptKegan Dougal2015-04-171-0/+93
| * | Filter typing nofication events to only those rooms the requesting user is a ...Paul "LeoNerd" Evans2015-04-151-2/+14
| * | Various minor fixes to unit-test structure around typing notificationsPaul "LeoNerd" Evans2015-04-152-2/+11
| * | Have TypingNotificationEventSource.get_new_events_for_user() return a deferre...Paul "LeoNerd" Evans2015-04-153-8/+15
| * | 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
* | | Fix port script after storage changes. Add very simple (off by default) curse...Erik Johnston2015-04-171-171/+409
* | | Add unique index to room_aliases, remove duplicates on upgrade. Convert some ...Erik Johnston2015-04-177-4/+19
* | | PEP8Erik Johnston2015-04-163-6/+0
* | | Go back to storing JSON in TEXTErik Johnston2015-04-1611-41/+20
* | | Move encoding and decoding of JSON into storage layerErik Johnston2015-04-162-27/+7
* | | Remove mysql/maria supportErik Johnston2015-04-155-95/+26
* | | Change full_schemas/11 to work with postgresErik Johnston2015-04-1513-84/+90
* | | Remove debug loggingErik Johnston2015-04-151-2/+0
* | | Add missing yieldErik Johnston2015-04-151-1/+1
* | | pushers table requires a unique id.Erik Johnston2015-04-152-3/+11
* | | Make LruCache thread safe, as its used for event cacheErik Johnston2015-04-151-0/+20
* | | Don't pass in removed flagErik Johnston2015-04-151-1/+0
* | | Change from exception to warnErik Johnston2015-04-151-1/+1
* | | Don't wait on federation_handler.handle_new_eventErik Johnston2015-04-151-3/+7
* | | Remove run_on_reactor()sErik Johnston2015-04-151-4/+0
* | | Postgres does not allow you to continue using a cursor after a DB exception h...Erik Johnston2015-04-151-11/+14
* | | Do more parellelization for initialSyncErik Johnston2015-04-151-7/+11
* | | Parellelize initial syncErik Johnston2015-04-151-2/+8
* | | Turn off persistance of sent_transactions.response_jsonErik Johnston2015-04-151-1/+1
* | | Add index on events (topological_ordering, stream_ordering) to help with ORDE...Erik Johnston2015-04-152-0/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-156-5/+33
|\| |
| * | Merge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4Mark Haines2015-04-142-4/+4
| |\ \
| | * | Update syutil version to 0.0.4Mark Haines2015-04-142-4/+4
| |/ /
| * | Merge pull request #121 from matrix-org/key-api-restructureMark Haines2015-04-144-1/+29
| |\ \
| | * | Move server key api into rest/key/v1Mark Haines2015-04-144-1/+29
| |/ /
* | | Use try..finally in contextlib.contextmanagerErik Johnston2015-04-151-3/+5
* | | Use True for True rather than 1Erik Johnston2015-04-151-5/+7
* | | Add missing yield in storage funcErik Johnston2015-04-151-1/+1
* | | Correctly identify deadlocksErik Johnston2015-04-151-1/+1
* | | Change port script to work with postgresErik Johnston2015-04-151-47/+67
* | | Add postgres database engineErik Johnston2015-04-141-0/+44
* | | Rename user_ips.user -> user_idErik Johnston2015-04-143-8/+8
* | | Add support for postgres instead of mysql. Change sql accourdingly. blob + va...Erik Johnston2015-04-1421-140/+153
* | | Correctly increment the _next_id initiallyErik Johnston2015-04-141-2/+4
* | | For backwards compat, make state_groups.id have a type of int, not varcharErik Johnston2015-04-132-2/+2
* | | Support running porting script multiple timesErik Johnston2015-04-131-8/+100
* | | Add beginnings of migration sqlite->maria db scriptErik Johnston2015-04-101-0/+271
* | | Remove duplicate rowsErik Johnston2015-04-101-0/+9
* | | Use case sensitive collationsErik Johnston2015-04-102-3/+2
* | | DROP indexes before recreating themErik Johnston2015-04-102-1/+9
* | | Use LONGBLOB and TEXT for arbitary length rowsErik Johnston2015-04-1012-34/+34
* | | Handle the fact that in sqlite binary data might be stored as unicode or bytesErik Johnston2015-04-105-5/+20
* | | Bump schema versionErik Johnston2015-04-101-1/+1
* | | Use unsigned bigintErik Johnston2015-04-1019-50/+50
* | | SQLite wants INTEGER and not BIGINT for primary keysErik Johnston2015-04-106-9/+9
* | | Update full_schemas/16 to match delta files. Add delta/16 scriptsErik Johnston2015-04-106-0/+245
* | | Revert non-trivial changes to upgrade scriptsErik Johnston2015-04-103-5/+5
* | | Fix schema againErik Johnston2015-04-102-3/+3
* | | Revert non-trivial schema changes and move them to a new schema version.Erik Johnston2015-04-1019-27/+636
* | | Remove unused importErik Johnston2015-04-091-1/+1
* | | Remove spurious spacesErik Johnston2015-04-0915-50/+50
* | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-094-27/+62
|\| |
| * | Merge pull request #120 from matrix-org/bugs/SYN-339Mark Haines2015-04-091-4/+28
| |\ \
| | * | 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
* | | | Stream ordering and out of order insertions.Erik Johnston2015-04-095-65/+153
* | | | Fix tests after commit 9a0579Erik Johnston2015-04-081-0/+6
* | | | Use generic db exceptions rather than sqlite3 specific onesErik Johnston2015-04-082-6/+2
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-083-6/+38
|\| | |
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-04-082-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #119 from matrix-org/hotfixes-v0.8.1-r3 v0.8.1-r3Erik 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
| | |/ /
| * | | Merge pull request #118 from matrix-org/dont-wait-for-notifyErik Johnston2015-04-081-4/+36
| |\ \ \
| | * | | typoErik Johnston2015-04-081-1/+1
| | * | | Don't yield on notifying all listenersErik Johnston2015-04-081-4/+36
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-083-9/+49
|\| | |
| * | | 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
| * | | | typoMatthew Hodgson2015-04-081-1/+1
| |/ / /
* | | | Retry transaction, not SQL queryErik Johnston2015-04-081-21/+25
* | | | Fix maria engine to correctly recognize deadlocksErik Johnston2015-04-081-2/+2
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-072-3/+3
|\| | |
| * | | Fix --enable-registration flag to work if you don't give a valueErik Johnston2015-04-072-3/+3
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-072-2/+2
|\| | |
| * | | Make demo script use --enable-registrationErik 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
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-0732-512/+1722
|\| | |
| * | | update leo's contribs a bitMatthew Hodgson2015-04-031-1/+1
| * | | potential contributing guide & author list for synapseMatthew Hodgson2015-04-033-0/+158
| * | | 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 pull request #116 from matrix-org/application-services-registration-scriptKegsay2015-04-0112-456/+160
| |\ \ \
| | * \ \ Merge branch 'develop' into application-services-registration-scriptKegan Dougal2015-04-013-1/+24
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Fix thinko whereby events *for the AS specifically* were not passed on.Kegan Dougal2015-03-312-1/+17
| * | | | Add note in changelog about change in config option namesErik Johnston2015-03-301-0/+7
| | * | | 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-312-4/+11
| | * | | PyflakesKegan Dougal2015-03-311-2/+1
| | * | | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests.Kegan Dougal2015-03-313-28/+40
| | * | | Fix tests and missing returns on deferreds.Kegan Dougal2015-03-313-20/+41
| | * | | Remove more reg/unreg methods. Read config not database for cache.Kegan Dougal2015-03-313-236/+59
| | * | | Remove appservice REST servletsKegan Dougal2015-03-316-196/+0
| | * | | Add AppServiceConfigKegan Dougal2015-03-312-1/+33
| |/ / /
| * | | actually tell users /how/ to turn on registrationMatthew Hodgson2015-03-301-1/+2
| * | | 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
| * | | Merge pull request #115 from matrix-org/allow_registration_for_federation_demoErik Johnston2015-03-271-0/+1
| |\ \ \
| | * | | Allow registration in the HSes federation demomanuroe2015-03-271-0/+1
| |/ / /
| * | | Merge pull request #106 from matrix-org/application-services-txn-reliabilityKegsay2015-03-2611-42/+1171
| |\ \ \ | | |_|/ | |/| |
| | * | Fixes from PR commentsKegan Dougal2015-03-262-3/+4
| | * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-2645-727/+1247
| | |\ \ | | |/ / | |/| |
| * | | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()Paul "LeoNerd" Evans2015-03-252-8/+34
| * | | Implement the 'key in dict' test for LruCache()Paul "LeoNerd" Evans2015-03-251-0/+7
| * | | Unit-test that Cache() key eviction is orderedPaul "LeoNerd" Evans2015-03-251-0/+18
| * | | 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-202-36/+87
| * | | func(*EXPR) is valid Python syntax, really...Paul "LeoNerd" Evans2015-03-201-2/+1
| | * | Set the service ID as soon as it is known.Kegan Dougal2015-03-162-4/+5
| | * | Implement ServiceQueuer with tests.Kegan Dougal2015-03-162-23/+77
| | * | Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ...Kegan Dougal2015-03-162-101/+60
| | * | 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-165-13/+19
| | * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-1645-373/+1193
| | |\ \
| | * | | 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-093-20/+26
| | * | | Use seconds; start gluing in the AS scheduler into the AS handler.Kegan Dougal2015-03-096-15/+38
| | * | | Finish appservice txn storage impl and tests.Kegan Dougal2015-03-093-16/+139
| | * | | Implement create_appservice_txn with tests.Kegan Dougal2015-03-092-4/+109
| | * | | Partially implement txn store methods with tests.Kegan Dougal2015-03-092-19/+213
| | * | | Start implementing ApplicationServiceTransactionStoreKegan Dougal2015-03-061-1/+5
| | * | | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-0620-130/+505
| | |\ \ \
| | * | | | Assign the AS ID from the database; replace old placeholder txn id.Kegan Dougal2015-03-062-4/+5
| | * | | | Add appservice txns sql schemaKegan Dougal2015-03-063-1/+38
| | * | | | Upper bound the backoff.Kegan Dougal2015-03-061-1/+3
| | * | | | Update UTsKegan Dougal2015-03-061-5/+5
| | * | | | Apply clarity and docstringsKegan Dougal2015-03-063-3/+15
| | * | | | Finish synapse.appservice.scheduler implementation.Kegan Dougal2015-03-064-53/+186
| | * | | | Add some loggersKegan Dougal2015-03-061-0/+10
| | * | | | Flesh out more stub functions.Kegan Dougal2015-03-064-12/+52
| | * | | | Add stub ApplicationServiceTransactionStore. Bootstrap Recoverers. Fill in st...Kegan Dougal2015-03-062-7/+71
| | * | | | Add more tests; fix bugs.Kegan Dougal2015-03-062-9/+49
| | * | | | Start adding some testsKegan Dougal2015-03-062-10/+119
| | * | | | Rejig structure given the appservice_handler already filters the correct ASes...Kegan Dougal2015-03-061-59/+85
| | * | | | Minor tweaksKegan Dougal2015-03-051-7/+9
| | * | | | Add stub architecture for txn reliability.Kegan Dougal2015-03-051-10/+111
| | * | | | Add stub scheduler module for txn reliabilityKegan Dougal2015-03-051-0/+68
| | * | | | Add txn_id kwarg to push methodsKegan Dougal2015-03-051-4/+9
* | | | | | Retry on deadlockErik Johnston2015-04-073-3/+21
* | | | | | 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
| |\ \ \ \ \
| | * | | | | 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-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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \