summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into erikj/postgres_charset_checkMark Haines2015-04-292-1/+17
|\
| * Mention that postgres databases must have the correct charset encodingErik Johnston2015-04-291-0/+17
| * Delete ugly commented out log line.Mark Haines2015-04-291-1/+0
* | Appease PEP8Erik Johnston2015-04-291-0/+2
* | Check that postgres database has correct charset setErik Johnston2015-04-296-1/+47
|/
* improve postgres blurb a bitMatthew Hodgson2015-04-291-7/+18
* comment out ugly test loglineMatthew Hodgson2015-04-291-1/+1
* mention silviof's dockerfileMatthew Hodgson2015-04-291-0/+3
* general clean up. s/alpha/beta/g. add intelfx's AUR package for Arch. s/the h...Matthew Hodgson2015-04-291-46/+88
* Fix rstErik Johnston2015-04-281-1/+2
* Update docs/postgres.rst to explain port script usageErik Johnston2015-04-281-0/+51
* Add better help to scripts/port_from_sqlite_to_postgres.pyErik Johnston2015-04-281-5/+27
* Ensure we never miss any presence updatesErik Johnston2015-04-281-1/+7
* Fix typoErik Johnston2015-04-281-1/+1
* Ensure the serial returned by presence is always an integerErik Johnston2015-04-281-3/+3
* Merge pull request #123 from matrix-org/postgresErik Johnston2015-04-2882-822/+2905
|\
| * Remove unused importsErik Johnston2015-04-281-2/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-2837-304/+1361
| |\ | |/ |/|
* | Merge pull request #126 from matrix-org/csauthMark Haines2015-04-2834-287/+1323
|\ \
| * | Add commentage.David Baker2015-04-271-0/+4
| * | pep8David Baker2015-04-271-1/+2
| * | logging argsDavid Baker2015-04-271-2/+2
| * | Change to https for ID server communicationDavid Baker2015-04-241-3/+2
| * | More underscoresDavid Baker2015-04-242-4/+4
| * | Use underscores instead of camelcase for id server stuffDavid Baker2015-04-243-14/+14
| * | pep8David Baker2015-04-241-2/+2
| * | Merge branch 'develop' into csauthDavid Baker2015-04-2418-368/+585
| |\ \
| * | | Dedicated error code for failed 3pid auth verificationDavid Baker2015-04-232-1/+4
| * | | Remove ultimately unused feature of saving params from the first call in the ...David Baker2015-04-231-2/+10
| * | | Add an error code to 'missing token' response.David Baker2015-04-232-1/+3
| * | | Remove now-redundant email configDavid Baker2015-04-232-44/+1
| * | | pep8David Baker2015-04-171-1/+1
| * | | Password reset, finally.David Baker2015-04-173-7/+38
| * | | Add endpoint to get threepids from serverDavid Baker2015-04-172-0/+23
| * | | pep8David Baker2015-04-174-9/+6
| * | | make add3pid servlet workDavid Baker2015-04-174-12/+82
| * | | just the once would probably be fineDavid Baker2015-04-171-1/+0
| * | | Merge branch 'develop' into csauthDavid Baker2015-04-1745-537/+1817
| |\ \ \
| * | | | Register the 3pid servletDavid Baker2015-04-171-1/+3
| * | | | password -> account servlet and add start of an 'add 3pid' endpointDavid Baker2015-04-172-2/+17
| * | | | Need to yield the username check, otherwise very very weird things happen.David Baker2015-04-171-1/+1
| * | | | Oops, left debugging in.David Baker2015-04-161-6/+0
| * | | | Return user ID in use error straight awayDavid Baker2015-04-164-66/+88
| * | | | Dummy login so we can do the first POST request to get login flows without it...David Baker2015-04-154-7/+24
| * | | | Regstration with email in v2David Baker2015-04-156-29/+123
| * | | | Add app service auth back in to v2 registerDavid Baker2015-04-022-5/+8
| * | | | Throw sensible errors on not-json when allowing empty bodyDavid Baker2015-04-021-1/+4
| * | | | pep8David Baker2015-04-021-0/+1
| * | | | Add shared secret auth into register v2 and switch the script over.David Baker2015-04-023-15/+63
| * | | | Explain how I justified to myself making JsonResource not always send JSON.David Baker2015-04-011-0/+7
| * | | | Completely replace fallback auth for C/S V2:David Baker2015-04-016-26/+280
| * | | | Make docs a bit more trueDavid Baker2015-03-311-1/+1
| * | | | Grammar and deduplicationDavid Baker2015-03-311-5/+4
| * | | | pep8David Baker2015-03-313-4/+5
| * | | | Update CAPTCHA_SETUP (it continues to ignore fallback, but I guess I should f...David Baker2015-03-301-21/+6
| * | | | Add original, unmodified CAPTCHA-SETUP from the webclient repo before modifyi...David Baker2015-03-301-0/+46
| * | | | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-308-16/+192
| * | | | pep8David Baker2015-03-261-2/+4
| * | | | Delete pushers when changing passwordDavid Baker2015-03-263-37/+31
| * | | | pep8 blank linesDavid Baker2015-03-251-1/+0
| * | | | Allow multiple pushers for a single app ID & pushkey, honouring the 'append' ...David Baker2015-03-255-28/+96
| * | | | Fix testsDavid Baker2015-03-245-14/+14
| * | | | Don't test exact equality of the list: as long as it has the fields we expect...David Baker2015-03-241-6/+5
| * | | | unused importDavid Baker2015-03-241-1/+1
| * | | | 1) Pushers are now associated with an access tokenDavid Baker2015-03-248-26/+48
| * | | | Make deleting other access tokens when you change your password actually workDavid Baker2015-03-242-6/+15
| * | | | pep8 / pyflakesDavid Baker2015-03-232-7/+3
| * | | | Implement password changing (finally) along with a start on making client/ser...David Baker2015-03-237-49/+236
* | | | | Merge pull request #133 from matrix-org/invite_power_levelMark Haines2015-04-282-1/+10
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into invite_power_levelPaul "LeoNerd" Evans2015-04-2717-73/+366
| |\ \ \ \ \
| * | | | | | Also remember to check 'invite' level for changesPaul "LeoNerd" Evans2015-04-211-0/+1
| * | | | | | Create an 'invite' powerlevel when making new roomsPaul "LeoNerd" Evans2015-04-211-1/+2
| * | | | | | Initial implementation of an 'invite' power_levelPaul "LeoNerd" Evans2015-04-211-0/+7
* | | | | | | Merge pull request #130 from matrix-org/server_rename_checkMark Haines2015-04-282-1/+28
|\ \ \ \ \ \ \
| * | | | | | | pep8David Baker2015-04-271-1/+1
| * | | | | | | pep8David Baker2015-04-271-1/+0
| * | | | | | | Run database check before daemonizing, at the cost of database hygiene.David Baker2015-04-273-27/+18
| * | | | | | | rename db method to be more informativeDavid Baker2015-04-272-5/+5
| * | | | | | | pep8David Baker2015-04-241-2/+2
| * | | | | | | Check users in our table aren't on a different domain to the one we're config...David Baker2015-04-242-0/+37
* | | | | | | | Output vim style mode markers into the yaml config fileMark Haines2015-04-281-3/+4
| |_|/ / / / / |/| | | | | |
| | | | | | * Quickly fix dodgy est. time remainingErik Johnston2015-04-281-7/+14
| | | | | | * Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except ...Erik Johnston2015-04-2832-289/+289
| | | | | | * Correctly handle total/remaining counts in the presence of sent_transasctions...Erik Johnston2015-04-281-1/+1
| | | | | | * Correctly handle total/remaining counts in the presence of sent_transasctions...Erik Johnston2015-04-281-123/+167
| | | | | | * Remove accidentally committed debug hardcode hackErik Johnston2015-04-281-1/+2
| | | | | | * Typo in port scriptErik Johnston2015-04-281-1/+1
| | | | | | * Split setuping up and processing of tablesErik Johnston2015-04-271-8/+23
| | | | | | * Shuffle progress stuffErik Johnston2015-04-271-201/+174
| | | | | | * Don't port over all of the sent_transactions tableErik Johnston2015-04-271-38/+120
| | | | | | * Remove unused importErik Johnston2015-04-271-1/+0
| | | | | | * Move database configuration into config moduleErik Johnston2015-04-272-33/+25
| | | | | | * 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