summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #276 from ↵Mark Haines2015-09-219-122/+267
|\ | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left.
| * Clarify that room_initial_sync returns a python dictMark Haines2015-09-211-1/+1
| |
| * Fix doc string to point at the right classMark Haines2015-09-211-2/+3
| |
| * Add explicit "elif event.membership == Membership.LEAVE" for clarityMark Haines2015-09-211-1/+2
| |
| * Clamp the "to" token for /rooms/{roomId}/messages to when the user leftMark Haines2015-09-211-0/+4
| | | | | | | | | | | | | | | | the room. There isn't a way for the client to learn a valid "to" token for a room that they have left in the C-S API but that doesn't stop a client making one up.
| * Clarify which event is returned by check_user_was_in_roomMark Haines2015-09-211-2/+3
| |
| * Allow users to GET individual state events for rooms that they have leftMark Haines2015-09-102-12/+18
| |
| * Allow users that have left a room to get the messages that happend in the ↵Mark Haines2015-09-092-5/+45
| | | | | | | | room before they left
| * Remove undocumented and unimplemented 'feedback' parameter from the ↵Mark Haines2015-09-096-42/+5
| | | | | | | | Client-Server API
| * Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-093-43/+15
| | | | | | | | they left
| * Allow rooms/{roomId}/state for a room that has been leftMark Haines2015-09-092-6/+15
| |
| * Allow room initialSync for users that have left the room, returning a ↵Mark Haines2015-09-093-9/+140
| | | | | | | | snapshot of how the room was when they left it
| * Include rooms that a user has left in an initialSync. Include the state and ↵Mark Haines2015-09-081-6/+21
| | | | | | | | messages at the point they left the room
| * Include the event_id and stream_ordering of membership events when looking ↵Mark Haines2015-09-081-2/+4
| | | | | | | | up which rooms a user is in
* | Merge pull request #267 from matrix-org/markjh/missing_requirementsMark Haines2015-09-182-11/+29
|\ \ | | | | | | Print an example "pip install" line for a missing requirement
| * | Add nacl.bindings to the list of modules checked. Re-arrange import order to ↵Mark Haines2015-09-011-3/+3
| | | | | | | | | | | | check packages after the packages they depend on
| * | Print an example "pip install" line for a missing requirementMark Haines2015-09-012-8/+26
| | |
* | | Remove run_on_reactorErik Johnston2015-09-171-3/+0
| | |
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-09-162-1/+10
|\ \ \
| * \ \ Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse v0.10.0-r2Erik Johnston2015-09-166-11/+39
| |\ \ \
| | * | | Update changelogErik Johnston2015-09-161-1/+3
| | | | |
| | * | | Merge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2Erik Johnston2015-09-162-0/+11
| | |\ \ \
| | * | | | Bump change logErik Johnston2015-09-101-0/+1
| | | | | |
| | * | | | Fix adding threepids to an existing accountDavid Baker2015-09-101-0/+1
| | | | | |
| | * | | | Bump version and change logErik Johnston2015-09-102-1/+7
| | | | | |
| | * | | | Various bug fixes to crypto.keyringErik Johnston2015-09-101-10/+17
| |/ / / /
* | | | | Merge pull request #281 from matrix-org/erikj/update_extremetiesErik Johnston2015-09-152-0/+11
|\ \ \ \ \ | | |/ / / | |/| | | When updating a stored event from outlier to non-outlier, remember to update the extremeties
| * | | | "Comments"Erik Johnston2015-09-151-0/+6
| | | | |
| * | | | When updating a stored event from outlier to non-outlier, remember to update ↵Erik Johnston2015-09-152-0/+5
| |/ / / | | | | | | | | | | | | the extremeties
* | | | Merge pull request #272 from matrix-org/daniel/insecureclientDaniel Wagner-Hall2015-09-157-12/+55
|\ \ \ \ | | | | | | | | | | Allow configuration to ignore invalid SSL certs
| * | | | Use shorter config key nameDaniel Wagner-Hall2015-09-152-4/+5
| | | | |
| * | | | Rename context factoryDaniel Wagner-Hall2015-09-152-5/+5
| | | | | | | | | | | | | | | | | | | | Mjark is officially no fun.
| * | | | Merge branch 'master' into daniel/insecureclientDaniel Wagner-Hall2015-09-152-1/+6
| |\| | |
| * | | | Merge branch 'daniel/insecureclient' into developDaniel Wagner-Hall2015-09-097-12/+54
| |\ \ \ \
| | * | | | Better document the intent of the insecure SSL settingDaniel Wagner-Hall2015-09-091-2/+6
| | | | | |
| | * | | | Fix random formattingDaniel Wagner-Hall2015-09-092-2/+2
| | | | | |
| | * | | | Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-097-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name.
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-09-152-1/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Bump version/changelog v0.10.0-r1Erik Johnston2015-09-082-1/+6
| | | | | |
* | | | | | Merge pull request #280 from matrix-org/paul/sighupPaul Evans2015-09-151-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Hacky attempt at catching SIGHUP and rotating the logfile around
| * | | | | | Hacky attempt at catching SIGHUP and rotating the logfile aroundPaul "LeoNerd" Evans2015-09-141-0/+14
|/ / / / / /
* | | | | | Merge pull request #256 from matrix-org/authDaniel Wagner-Hall2015-09-147-19/+243
|\ \ \ \ \ \ | | | | | | | | | | | | | | Attempt to validate macaroons
| * | | | | | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-016-25/+25
| | | | | | |
| * | | | | | Turn TODO into thing which actually will failDaniel Wagner-Hall2015-08-261-6/+9
| | | | | | |
| * | | | | | Merge branch 'mergeeriksmadness' into authDaniel Wagner-Hall2015-08-264-12/+50
| |\ \ \ \ \ \
| * | | | | | | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-267-36/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of weird caveats: * If we can't validate your macaroon, we fall back to checking that your access token is in the DB, and ignoring the failure * Even if we can validate your macaroon, we still have to hit the DB to get the access token ID, which we pretend is a device ID all over the codebase. This mostly adds the interesting code, and points out the two pieces we need to delete (and necessary conditions) in order to fix the above caveats.
* | | | | | | | Merge pull request #265 from matrix-org/erikj/check_room_existsErik Johnston2015-09-142-8/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Check room exists when authenticating an event
| * | | | | | | | Fix testsErik Johnston2015-09-012-9/+30
| | | | | | | | |
| * | | | | | | | Check room exists when authenticating an event, by asserting they reference ↵Erik Johnston2015-09-011-0/+8
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | a creation event
* | | | | | | | Drop unused indexErik Johnston2015-09-141-0/+16
| | | | | | | |
* | | | | | | | Merge pull request #274 from matrix-org/add_threepid_fixDavid Baker2015-09-101-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix adding threepids to an existing account
| * | | | | | | | Fix adding threepids to an existing accountDavid Baker2015-09-101-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #270 from matrix-org/markjh/fix_metricsErik Johnston2015-09-101-4/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix the size reported by maxrss.
| * | | | | | | | | Check that /proc/self/fd exists before listing itMark Haines2015-09-071-0/+4
| | | | | | | | | |
| * | | | | | | | | The maxrss reported by getrusage is in kilobytes, not pagesMark Haines2015-09-071-4/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #273 from matrix-org/erikj/key_fetch_fixErik Johnston2015-09-101-10/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Various bug fixes to crypto.keyring
| * | | | | | | | Various bug fixes to crypto.keyringErik Johnston2015-09-091-10/+17
|/ / / / / / / /
* / / / / / / / Don't require pdus in check_auth scriptErik Johnston2015-09-091-2/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' into developMark Haines2015-09-071-0/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #269 from matrix-org/markjh/upgrading_setuptoolsMark Haines2015-09-071-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add instructions for upgrading setuptools for when people encounter a…
| | * | | | | | Add instructions for upgrading setuptools for when people encounter a ↵Mark Haines2015-09-071-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | message "mock requires setuptools>=17.1"
* | | | | | / Merge branch 'master' into developMark Haines2015-09-077-10/+25
|\| | | | | | | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Conflicts: setup.py
| * | | | | DEPENDENCY_LINKS was turned to a listErik Johnston2015-09-041-1/+1
| | | | | |
| * | | | | Merge branch 'release-v0.10.0' v0.10.0Erik Johnston2015-09-03110-1914/+5472
| |\| | | |
| | * | | | Change log level to infoErik Johnston2015-09-031-1/+1
| | | | | |
| | * | | | Bump version and changelogErik Johnston2015-09-032-1/+6
| | | | | |
| | * | | | Lists use 'append'Erik Johnston2015-09-021-1/+1
| | | | | |
| | * | | | Bump version and changelog v0.10.0-rc6Erik Johnston2015-09-022-1/+7
| | | | | |
| | * | | | Update README to include RAM requirementsErik Johnston2015-09-021-0/+1
| | | | | |
| | * | | | Make port script handle empty sent_transactions tableErik Johnston2015-09-021-6/+9
| | | | | |
* | | | | | update logger to match new ambiguous script name...Matthew Hodgson2015-09-031-1/+1
| | | | | |
* | | | | | Merge pull request #262 from matrix-org/redactyoselfDaniel Wagner-Hall2015-09-022-9/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow users to redact their own events
| * | | | | | Check domain of events properlyDaniel Wagner-Hall2015-09-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Federated servers still need to delegate authority to owning servers
| * | | | | | Merge branch 'develop' into redactyoselfDaniel Wagner-Hall2015-08-2817-73/+262
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/_base.py
| * | | | | | | Allow users to redact their own eventsDaniel Wagner-Hall2015-08-282-10/+42
| | | | | | | |
* | | | | | | | Merge pull request #266 from pztrn/developErik Johnston2015-09-021-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Ignore development virtualenv and generated logger configuration as well.
| * | | | | | | Ignore development virtualenv and generated logger configuration as well.pztrn2015-09-011-0/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stanislav Nikitin <pztrn@pztrn.name>
* | | | | | | Merge pull request #264 from matrix-org/markjh/syweb_on_pypiMark Haines2015-09-012-7/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use the version of "matrix-angular-sdk" hosted on pypi
| * | | | | | | Use the version of "matrix-angular-sdk" hosted on pypiMark Haines2015-09-012-7/+0
|/ / / / / / /
* | | | | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-09-017-376/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #261 from matrix-org/erikj/scripts_cleanErik Johnston2015-09-016-380/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Clean up scripts/
| | * | | | | | Remove spurious .py from docsErik Johnston2015-09-011-1/+1
| | | | | | | |
| | * | | | | | Actually add config pathErik Johnston2015-08-281-0/+2
| | | | | | | |
| | * | | | | | Clean up scripts/Erik Johnston2015-08-275-380/+4
| | | | | | | |
| * | | | | | | Lower size of 'stateGroupCache' now that we have data from matrix.org to ↵Erik Johnston2015-09-011-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | support doing so
* | | | | | | don't log the whole DB config (including postgres password...)Matthew Hodgson2015-08-291-2/+2
| | | | | | |
* | | | | | | Merge pull request #258 from matrix-org/slowtestsmakemesadDaniel Wagner-Hall2015-08-283-4/+39
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Swap out bcrypt for md5 in tests
| * | | | | | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| | | | | | |
| * | | | | | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-263-3/+39
| | |/ / / / | |/| | | | | | | | | | | | | | | | This reduces our ~8 second sequential test time down to ~7 seconds
* | | | | | Merge branch 'release-v0.10.0' into developMark Haines2015-08-2817-73/+262
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py
| * | | | Bump version and changelog v0.10.0-rc5Erik Johnston2015-08-272-1/+6
| | | | |
| * | | | Merge pull request #260 from matrix-org/erikj/filename_orderErik Johnston2015-08-271-8/+14
| |\ \ \ \ | | | | | | | | | | | | Check for an internationalised filename first
| | * | | | ConsistencyErik Johnston2015-08-271-3/+3
| | | | | |
| | * | | | Check for an internationalised filename firstErik Johnston2015-08-271-8/+14
| |/ / / /
| * | | | None check the correct variableErik Johnston2015-08-271-2/+3
| | | | |
| * | | | Check for NoneErik Johnston2015-08-271-1/+1
| | | | |
| * | | | Bump changelog and version v0.10.0-rc4Erik Johnston2015-08-272-4/+11
| | | | |
| * | | | Merge pull request #259 from matrix-org/markjh/unicode_content_dispositionErik Johnston2015-08-273-12/+43
| |\ \ \ \ | | | | | | | | | | | | Support unicode attachment filenames
| | * | | | Give a sensible error message if the filename is invalid UTF-8Mark Haines2015-08-262-2/+8
| | | | | |
| | * | | | Handle unicode filenames given when downloading or received over federationMark Haines2015-08-261-5/+21
| | | | | |
| | * | | | Allow non-ascii filenames for attachmentsMark Haines2015-08-263-8/+17
| |/ / / /
| * | | | Merge pull request #252 from matrix-org/erikj/typing_loopErik Johnston2015-08-261-9/+5
| |\ \ \ \ | | | | | | | | | | | | Don't loop over all rooms ever in typing.get_new_events_for_user
| | * | | | Remove needless existence checksErik Johnston2015-08-261-7/+3
| | | | | |
| | * | | | Don't loop over all rooms ever in typing.get_new_events_for_userErik Johnston2015-08-261-2/+2
| |/ / / /
| * | | | Bump changelog and version v0.10.0-rc3Erik Johnston2015-08-252-1/+18
| | | | |
| * | | | Merge pull request #250 from matrix-org/erikj/generated_directoryErik Johnston2015-08-251-2/+15
| |\ \ \ \ | | | | | | | | | | | | Add config option to specify where generated files should be dumped
| | * | | | Update config docErik Johnston2015-08-251-1/+2
| | | | | |
| | * | | | s/--generated-directory/--keys-directory/Erik Johnston2015-08-251-7/+7
| | | | | |
| | * | | | Add config option to specify where generated files should be dumpedErik Johnston2015-08-251-2/+14
| | | | | |
| * | | | | Merge pull request #249 from matrix-org/erikj/allow_config_path_dirsErik Johnston2015-08-251-6/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | Allow specifying directories as config paths
| | * | | | | Warn if we encounter unexpected files in config directoriesErik Johnston2015-08-251-7/+17
| | |/ / / /
| | * / / / Allow specifying directories as config filesErik Johnston2015-08-251-6/+24
| |/ / / /
| * | | | Merge pull request #245 from matrix-org/erikj/configurable_client_locationErik Johnston2015-08-253-14/+30
| |\ \ \ \ | | | | | | | | | | | | Allow specifying a directory to host a web client from
| | * | | | Print the correct pip install line when failing due to lack of ↵Erik Johnston2015-08-252-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | matrix-angular-sdk
| | * | | | Update the log messageErik Johnston2015-08-251-5/+10
| | | | | |
| | * | | | Revert previous commit. Instead, always download matrix-angular-sdk as a ↵Erik Johnston2015-08-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse.
| | * | | | Remove dependency on matrix-angular-sdkErik Johnston2015-08-252-6/+9
| | | | | |
| | * | | | Allow specifying a directory to host a web client fromErik Johnston2015-08-252-3/+6
| | | | | |
| * | | | | Merge pull request #246 from matrix-org/erikj/config_helper_functionErik Johnston2015-08-251-0/+30
| |\ \ \ \ \ | | |/ / / / | |/| | | | Add utility to parse config and print out a key
| | * | | | Fix typo when using sys.stderr.writeErik Johnston2015-08-251-1/+1
| | | | | |
| | * | | | Add utility to parse config and print out a keyErik Johnston2015-08-251-0/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: ``` $ python -m synapse.config read server_name -c homeserver.yaml localhost ```
| * | | | Bump version and changelog v0.10.0-rc2Erik Johnston2015-08-242-1/+11
| | | | |
| * | | | Do auth checks *before* persisting the eventErik Johnston2015-08-241-16/+16
| | | | |
| * | | | Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_eventsErik Johnston2015-08-243-6/+19
| |\ \ \ \ | | | | | | | | | | | | Don't make pushers handle presence/typing events
| | * | | | Don't make pushers handle presence/typing eventsErik Johnston2015-08-243-6/+19
| |/ / / /
| * | | | Don't insert events into 'event_*_extremeties' tables if they're outliersErik Johnston2015-08-231-2/+8
| | | | |
| * | | | Actually check if event_id isn't returned by _get_state_groupsErik Johnston2015-08-211-2/+9
| | | | |
| * | | | Upate changelog v0.10.0-rc1Erik Johnston2015-08-211-1/+1
| | | | |
| * | | | Upate changelogErik Johnston2015-08-211-0/+3
| | | | |
| * | | | Merge branch 'erikj/user_dedup' into release-v0.10.0Erik Johnston2015-08-214-12/+48
| |\ \ \ \
| | * | | | Doc stringErik Johnston2015-08-211-0/+6
| | | | | |
| | * | | | When logging in fetch user by user_id case insensitively, *unless* there are ↵Erik Johnston2015-08-213-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | multiple case insensitive matches, in which case require the exact user_id
| | * | | | Don't allow people to register user ids which only differ by case to an ↵Erik Johnston2015-08-212-2/+13
| |/ / / / | | | | | | | | | | | | | | | existing one
* | | | | Merge pull request #254 from matrix-org/markjh/tox_setuptoolsMark Haines2015-08-263-5/+37
|\ \ \ \ \ | | | | | | | | | | | | Make 'setup.py test' run tox
| * | | | | Pass an empty list of arguments to tox if no arguments are givenMark Haines2015-08-261-0/+2
| | | | | |
| * | | | | Install tox locally if it wasn't already installed when running setup.py testMark Haines2015-08-261-2/+10
| | | | | |
| * | | | | Make 'setup.py test' run toxMark Haines2015-08-263-5/+27
| | | | | |
* | | | | | Merge pull request #255 from matrix-org/mergeeriksmadnessDaniel Wagner-Hall2015-08-264-12/+50
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | Merge erikj/user_dedup to develop
| * | | | Merge erikj/user_dedup to developDaniel Wagner-Hall2015-08-264-12/+50
| | |_|/ | |/| |
* | | | Merge pull request #253 from matrix-org/toxDaniel Wagner-Hall2015-08-261-1/+1
|\ \ \ \ | |/ / / |/| | | Allow tests to be filter when using tox
| * | | Allow tests to be filter when using toxDaniel Wagner-Hall2015-08-261-1/+1
|/ / / | | | | | | | | | | | | `tox` will run all tests `tox tests.api.test_auth.AuthTestCase` will run just the tests in AuthTestCase
* | | Merge pull request #251 from matrix-org/removeadminDaniel Wagner-Hall2015-08-259-24/+5
|\ \ \ | | | | | | | | Stop looking up "admin", which we never read
| * \ \ Merge branch 'deviceid' into removeadminDaniel Wagner-Hall2015-08-252-4/+2
| |\ \ \
| * | | | Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-259-24/+5
| | | | |
* | | | | Merge pull request #248 from matrix-org/deviceidDaniel Wagner-Hall2015-08-2530-95/+64
|\ \ \ \ \ | | |/ / / | |/| | | Remove completely unused concepts from codebase
| * | | | Fix up one more referenceDaniel Wagner-Hall2015-08-252-4/+2
| |/ / /
| * | | Re-wrap lineDaniel Wagner-Hall2015-08-251-3/+1
| | | |
| * | | Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-2529-90/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
* | | | Merge pull request #247 from matrix-org/markjh/toxMark Haines2015-08-254-8/+38
|\ \ \ \ | | | | | | | | | | Add a tox.ini config for synapse.
| * | | | Add .tox to .gitignoreMark Haines2015-08-251-0/+1
| | | | |
| * | | | Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew ↵Mark Haines2015-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | .pyc files everywhere
| * | | | Prod jenkinsMark Haines2015-08-250-0/+0
| | | | |
| * | | | Prod jenkinsMark Haines2015-08-250-0/+0
| | | | |
| * | | | Prod jenkinsMark Haines2015-08-250-0/+0
| | | | |
| * | | | Only include demo/demo.tls.dh. Don't include any other dh fileMark Haines2015-08-251-3/+5
| | | | |
| * | | | Add tox.ini file for synapseMark Haines2015-08-253-5/+30
|/ / / /
* | | | Merge pull request #243 from matrix-org/markjh/remove_syutilMark Haines2015-08-2522-93/+84
|\ \ \ \ | |/ / / |/| | | Replace syutil dependency with smaller, single-purpose libraries
| * | | Fix typo in module imports and package dependenciesMark Haines2015-08-252-2/+2
| | | |
| * | | Fix indentMark Haines2015-08-241-1/+1
| | | |
| * | | Replace syutil references in scriptsMark Haines2015-08-245-22/+15
| | | |
| * | | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-2417-71/+69
| | | |
* | | | Merge pull request #244 from matrix-org/markjh/refresh_tokensMark Haines2015-08-251-1/+1
|\ \ \ \ | |/ / / |/| | | Remove autoincrement since we incrementing the ID in the storage layer
| * | | Remove autoincrement since we incrementing the ID in the storage layerMark Haines2015-08-241-1/+1
|/ / /
* | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-213-2/+7
|\| |
| * | Fix bug where we didn't correctly serialize the redacted_because key over ↵Erik Johnston2015-08-212-1/+6
| | | | | | | | | | | | federation
| * | Add missing param in store.get_state_groups invocationErik Johnston2015-08-211-1/+1
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0Erik Johnston2015-08-204-4/+6
| |\ \
* | | | Return fully qualified user_id as per specDavid Baker2015-08-201-1/+1
| | | |
* | | | Merge pull request #240 from matrix-org/refreshDaniel Wagner-Hall2015-08-2019-76/+303
|\ \ \ \ | | | | | | | | | | /tokenrefresh POST endpoint
| * | | | Fix bad mergeDaniel Wagner-Hall2015-08-201-8/+1
| | | | |
| * | | | Fix indentationDaniel Wagner-Hall2015-08-201-1/+2
| | | | |
| * | | | Fix flake8 warningsDaniel Wagner-Hall2015-08-201-4/+6
| | | | |
| * | | | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-202-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/register.py
| * \ \ \ \ Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-2019-80/+498
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-209-8/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them.
| * | | | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-2010-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | We're about to have two kinds of token, access and refresh
| * | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-203-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two.
| * | | | | Merge branch 'auth' into refreshDaniel Wagner-Hall2015-08-207-24/+115
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #229 from matrix-org/authDaniel Wagner-Hall2015-08-205-6/+90
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Issue macaroons as opaque auth tokens
| * | | | | | Remove incorrect whitespaceDaniel Wagner-Hall2015-08-201-3/+3
| | | | | | |
| * | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-201-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into authDaniel Wagner-Hall2015-08-2021-93/+531
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-199-25/+128
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into authDaniel Wagner-Hall2015-08-192-18/+25
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-192-8/+8
| | | | | | | |
| * | | | | | | Switch to pymacaroons-pynaclDaniel Wagner-Hall2015-08-191-1/+1
| | | | | | | |
| * | | | | | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-182-8/+8
| | | | | | | |
| * | | | | | | Fix units in testDaniel Wagner-Hall2015-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made the non-test seconds instead of ms, but not the test
| * | | | | | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-182-5/+5
| | | | | | | |
| * | | | | | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-1838-455/+1346
| |\ \ \ \ \ \ \
| * | | | | | | | Remove accidentally added fileDaniel Wagner-Hall2015-08-181-0/+0
| | | | | | | | |
| * | | | | | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-186-6/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information
* | | | | | | | | Merge remote-tracking branch 'origin/master' into developMark Haines2015-08-202-18/+25
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | hacky support for video for FS CC DDMatthew Hodgson2015-08-061-3/+0
| | | | | | | |
| * | | | | | | hacky support for video for FS CC DDMatthew Hodgson2015-08-061-15/+25
| | | | | | | |
* | | | | | | | Merge pull request #239 from matrix-org/pynaclDaniel Wagner-Hall2015-08-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Correct pynacl version to 0.3.0
| * | | | | | | Correct pynacl version to 0.3.0Daniel Wagner-Hall2015-08-201-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | 0.0.3 was a typo
* | | | | | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-08-204-45/+151
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #237 from matrix-org/markjh/readme-rst-formattingMark Haines2015-08-201-37/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Clean up some of restructured text formatting in the README.rst
| | * | | | | | Further formatting clean upsMark Haines2015-08-201-7/+7
| | | | | | | |
| | * | | | | | Clean up some of restructured text formatting in the README.rstMark Haines2015-08-201-30/+32
| | | | | | | |
| * | | | | | | Merge pull request #236 from matrix-org/markjh/upgrade-instructionsMark Haines2015-08-202-7/+37
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add generic update instructions to UPGRADE.rst
| | * | | | | | | Tweak the wording a bitMark Haines2015-08-201-4/+4
| | | | | | | | |
| | * | | | | | | Add generic update instructions to UPGRADE.rst and add link to them from the ↵Mark Haines2015-08-202-7/+37
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | README.rst
| * / / / / / / Update changelogErik Johnston2015-08-201-0/+1
| |/ / / / / /
| * | | | | | Bump version and changelogErik Johnston2015-08-202-1/+74
| | | | | | |
* | | | | | | Merge pull request #235 from matrix-org/erikj/room_avatarsErik Johnston2015-08-202-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add m.room.avatar to default power levels.
| * | | | | | | Add m.room.avatar to default power levels. Change default required power ↵Erik Johnston2015-08-202-2/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | levels of such events to 50
* | | | | | | Merge pull request #238 from matrix-org/fix_set_passwordErik Johnston2015-08-202-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix set password
| * | | | | | Remove spurious extra arg to set_passwordDavid Baker2015-08-201-1/+1
| | | | | | |
| * | | | | | Another use of check_password that got missed in the yield fixDavid Baker2015-08-201-1/+1
|/ / / / / /
* | | | | | Merge pull request #231 from matrix-org/erikj/pushers_store_last_tokenErik Johnston2015-08-201-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Push: store the 'last_token' in the db, even if we processed no events
| * | | | | | Store the 'last_token' in the db, even if we processed no eventsErik Johnston2015-08-191-0/+6
| | | | | | |
| * | | | | | Block on storing the current last_tokensErik Johnston2015-08-191-5/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnailsMark Haines2015-08-203-21/+226
|\ \ \ \ \ \ | | | | | | | | | | | | | | Always return a thumbnail of the requested size.
| * | | | | | Fix flake8 warningMark Haines2015-08-131-0/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into ↵Mark Haines2015-08-1334-368/+613
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/generate_presice_thumbnails
| * | | | | | | Doc-string for config ultility functionMark Haines2015-08-121-0/+11
| | | | | | | |
| * | | | | | | Add config option for setting the list of thumbnail sizes to precalculateMark Haines2015-08-122-16/+41
| | | | | | | |
| * | | | | | | Make a config option for whether to generate new thumbnail sizes dynamicallyMark Haines2015-08-123-7/+27
| | | | | | | |
| * | | | | | | Factor out thumbnail()Erik Johnston2015-07-231-56/+40
| | | | | | | |
| * | | | | | | Fix remote thumbnailingErik Johnston2015-07-232-7/+11
| | | | | | | |
| * | | | | | | Always return a thumbnail of the requested size.Erik Johnston2015-07-232-2/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size.
* | | | | | | | Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-203-1/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add server side support for canonical aliases
| * | | | | | | | Check that the canonical room alias actually points to the roomErik Johnston2015-08-201-1/+17
| | | | | | | | |
| * | | | | | | | Add canonical alias to the default power levelsErik Johnston2015-08-192-0/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #234 from matrix-org/email_loginDavid Baker2015-08-201-5/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Support logging in with email addresses (or other threepids)
| * | | | | | | | Comma comma comma comma comma chameleonDavid Baker2015-08-201-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into email_loginDavid Baker2015-08-2060-707/+1752
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-205-1/+75
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Changes for unique emails
| * | | | | | | | Check absent before trying to access keysDavid Baker2015-08-121-3/+3
| | | | | | | | |
| * | | | | | | | Just leaving off the $ is fine. r* == registerrrrrrrrrDavid Baker2015-08-121-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #232 from matrix-org/erikj/appservice_joined_roomsErik Johnston2015-08-193-12/+32
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
| * | | | | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_usersErik Johnston2015-08-193-12/+32
|/ / / / / / / /
* | | | | | | | Remove an access token log lineErik Johnston2015-08-191-1/+1
| | | | | | | |
* | | | | | | | Fix regression where we incorrectly responded with a 200 to /loginErik Johnston2015-08-191-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #228 from matrix-org/erikj/_get_state_for_groupsErik Johnston2015-08-181-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ensure we never return a None event from _get_state_for_groups
| * | | | | | | | Remove newline because vertical whitespace makes mjark sadErik Johnston2015-08-181-2/+1
| | | | | | | | |
| * | | | | | | | Rejig the code to make it nicerErik Johnston2015-08-181-3/+2
| | | | | | | | |
| * | | | | | | | Ensure we never return a None event from _get_state_for_groupsErik Johnston2015-08-181-3/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #230 from matrix-org/erikj/appservice_auth_entityErik Johnston2015-08-181-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Set request.authenticated_entity for application services
| * | | | | | | | Set request.authenticated_entity for application servicesErik Johnston2015-08-181-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #227 from matrix-org/erikj/receipts_take2Erik Johnston2015-08-184-17/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Re-enable receipts API.
| * | | | | | | | Rename unhelpful variable nameErik Johnston2015-08-181-7/+2
| | | | | | | | |
| * | | | | | | | CommentsErik Johnston2015-08-181-4/+14
| | | | | | | | |
| * | | | | | | | Add index receipts_linearized_room_streamErik Johnston2015-08-172-1/+19
| | | | | | | | |
| * | | | | | | | Remove unused importErik Johnston2015-08-171-2/+0
| | | | | | | | |
| * | | | | | | | Remove added unused methodsErik Johnston2015-08-171-7/+0
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2015-08-1710-147/+105
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/receipts_take2
| * | | | | | | | | Batch _get_linearized_receipts_for_roomsErik Johnston2015-08-141-15/+64
| | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-11 18:52:13 +0000