summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Format the presence events correctly for v2Mark Haines2015-10-091-3/+9
* Update the v2 room sync format to match the current v2 specMark Haines2015-10-082-21/+18
* Update the sync response to match the latest specMark Haines2015-10-071-24/+22
* Move the rooms out into a room_map mapping from room_id to room.Mark Haines2015-10-053-32/+47
* Start updating the sync API to match the specificationMark Haines2015-10-013-90/+54
* Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-2818-588/+162
|\
| * Fix scripts-dev/definitions.py argparse optionsMark Haines2015-09-231-1/+1
| * Remove unused _execute_and_decode from scripts/synapse_port_dbMark Haines2015-09-231-2/+0
| * synapse/storage/state.py: _make_group_id was unusedMark Haines2015-09-231-6/+0
| * Remove unused functions from synapse/storage/signatures.pyMark Haines2015-09-231-112/+0
| * synapse/storage/roommember.py:_get_members_query was unusedMark Haines2015-09-231-6/+0
| * Remove unused functions from synapse/storage/events.pyMark Haines2015-09-231-11/+0
| * Remove unused functions from synapse/storage/event_federation.pyMark Haines2015-09-231-71/+0
| * synapse/storage/_base.py:_simple_max_id was unusedMark Haines2015-09-231-18/+0
| * synapse/storage/_base.py:_simple_delete was unusedMark Haines2015-09-231-10/+0
| * synapse/storage/_base.py:_simple_selectupdate_one was unusedMark Haines2015-09-232-51/+0
| * synapse/state.py:_get_state_key_from_event was unusedMark Haines2015-09-231-4/+0
| * synapse/handlers/room.py:_should_invite_join was unusedMark Haines2015-09-231-26/+0
| * synapse/handlers/federation.py:_handle_auth_events was unusedMark Haines2015-09-231-49/+0
| * Use argparse for definition finderMark Haines2015-09-231-26/+38
| * synapse/storage/event_federation.py:_get_auth_events is unusedMark Haines2015-09-221-21/+0
| * synapse/storage/_base.py:_execute_and_decode was unusedMark Haines2015-09-221-3/+0
| * Move NullSource out of synapse and into tests since it is only used by the testsMark Haines2015-09-222-17/+17
| * Note that GzipFile was removed in comment that referenced itMark Haines2015-09-221-0/+1
| * synapse/app/homeserver.py:GzipFile was unusedMark Haines2015-09-221-6/+0
| * synapse/streams/events.py:StreamSource was unusedMark Haines2015-09-221-12/+0
| * synapse/api/errors.py:RoomError was unusedMark Haines2015-09-221-5/+0
| * synapse/util/__init__.py:unwrap_deferred was unusedMark Haines2015-09-221-28/+0
| * synapse/storage/_base.py:Table was unusedMark Haines2015-09-222-130/+2
| * Add dev script for finding where functions are called from, and finding funct...Mark Haines2015-09-221-0/+130
* | Merge pull request #290 from matrix-org/daniel/synctlDaniel Wagner-Hall2015-09-281-26/+28
|\ \
| * | Fix restartDaniel Wagner-Hall2015-09-241-2/+2
| * | Allow config file path to be configurable in in synctlDaniel Wagner-Hall2015-09-241-24/+26
|/ /
* | Merge pull request #289 from matrix-org/markjh/fix_sqlErik Johnston2015-09-241-6/+6
|\ \
| * | Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txnMark Haines2015-09-241-6/+6
| |/
* | Fix demo/start.sh to work with --report-statsErik Johnston2015-09-231-0/+1
* | Merge pull request #282 from matrix-org/erikj/missing_keysErik Johnston2015-09-231-4/+3
|\ \
| * | Fix bug where we sometimes didn't fetch all the keys requested for aErik Johnston2015-09-171-4/+3
* | | Merge pull request #271 from matrix-org/erikj/default_historyErik Johnston2015-09-231-1/+1
|\ \ \ | |_|/ |/| |
| * | Change default history visibility for private roomsErik Johnston2015-09-091-1/+1
* | | Merge pull request #286 from matrix-org/markjh/stream_config_reprMark Haines2015-09-221-3/+8
|\ \ \
| * | | Define __repr__ methods for StreamConfig and PaginationConfigMark Haines2015-09-221-3/+8
* | | | Merge pull request #285 from matrix-org/daniel/metrics-2Daniel Wagner-Hall2015-09-2224-78/+438
|\ \ \ \ | |/ / / |/| | |
| * | | Add some docstringsDaniel Wagner-Hall2015-09-222-0/+4
| * | | Catch stats-reporting errorsDaniel Wagner-Hall2015-09-221-4/+7
| * | | Add docstringDaniel Wagner-Hall2015-09-221-0/+6
| * | | Front-load spacesDaniel Wagner-Hall2015-09-221-7/+7
| * | | Implement configurable stats reportingDaniel Wagner-Hall2015-09-2224-78/+425
|/ / /
* | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-219-122/+267
|\ \ \
| * | | 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
| * | | 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 roo...Mark Haines2015-09-092-5/+45
| * | | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se...Mark Haines2015-09-096-42/+5
| * | | Allow users that have left the room to view the member list from the point th...Mark Haines2015-09-093-43/+15
| * | | 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 snapsho...Mark Haines2015-09-093-9/+140
| * | | Include rooms that a user has left in an initialSync. Include the state and m...Mark Haines2015-09-081-6/+21
| * | | Include the event_id and stream_ordering of membership events when looking up...Mark Haines2015-09-081-2/+4
| |/ /
* | | Merge pull request #267 from matrix-org/markjh/missing_requirementsMark Haines2015-09-182-11/+29
|\ \ \
| * | | Add nacl.bindings to the list of modules checked. Re-arrange import order to ...Mark Haines2015-09-011-3/+3
| * | | 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | "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
| |/ / /
* | | | Merge pull request #272 from matrix-org/daniel/insecureclientDaniel Wagner-Hall2015-09-157-12/+55
|\ \ \ \
| * | | | Use shorter config key nameDaniel Wagner-Hall2015-09-152-4/+5
| * | | | Rename context factoryDaniel Wagner-Hall2015-09-152-5/+5
| * | | | 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
* | | | | | 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 aroundPaul "LeoNerd" Evans2015-09-141-0/+14
|/ / / / / /
* | | | | | Merge pull request #256 from matrix-org/authDaniel Wagner-Hall2015-09-147-19/+243
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | | Merge pull request #265 from matrix-org/erikj/check_room_existsErik Johnston2015-09-142-8/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix testsErik Johnston2015-09-012-9/+30
| * | | | | | | | Check room exists when authenticating an event, by asserting they reference a...Erik Johnston2015-09-011-0/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | 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 accountDavid Baker2015-09-101-0/+1
* | | | | | | | | Merge pull request #270 from matrix-org/markjh/fix_metricsErik Johnston2015-09-101-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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.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 message...Mark Haines2015-09-071-0/+6
| |/ / / / / /
* | | | | | / Merge branch 'master' into developMark Haines2015-09-077-10/+25
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | Check domain of events properlyDaniel Wagner-Hall2015-09-011-1/+3
| * | | | | | Merge branch 'develop' into redactyoselfDaniel Wagner-Hall2015-08-2817-73/+262
| |\ \ \ \ \ \
| * | | | | | | 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.pztrn2015-09-011-0/+3
|/ / / / / / /
* | | | | | | 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 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
| |\ \ \ \ \ \
| | * | | | | | 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 supp...Erik Johnston2015-09-011-1/+1
| |/ / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unused importDaniel Wagner-Hall2015-08-261-1/+0
| * | | | | | Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-263-3/+39
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'release-v0.10.0' into developMark Haines2015-08-2817-73/+262
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ \
| | * | | | | 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
| |\ \ \ \
| | * | | | Print the correct pip install line when failing due to lack of matrix-angular...Erik Johnston2015-08-252-8/+9
| | * | | | Update the log messageErik Johnston2015-08-251-5/+10
| | * | | | Revert previous commit. Instead, always download matrix-angular-sdk as a requ...Erik Johnston2015-08-251-3/+7
| | * | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| |/ / / /
| * | | | 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 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
| | * | | | Don't allow people to register user ids which only differ by case to an exist...Erik Johnston2015-08-212-2/+13
| |/ / / /
* | | | | Merge pull request #254 from matrix-org/markjh/tox_setuptoolsMark Haines2015-08-263-5/+37
|\ \ \ \ \
| * | | | | 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 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 toxDaniel Wagner-Hall2015-08-261-1/+1
|/ / /
* | | Merge pull request #251 from matrix-org/removeadminDaniel Wagner-Hall2015-08-259-24/+5
|\ \ \
| * \ \ 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | Merge pull request #247 from matrix-org/markjh/toxMark Haines2015-08-254-8/+38
|\ \ \ \
| * | | | Add .tox to .gitignoreMark Haines2015-08-251-0/+1
| * | | | Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew .pyc...Mark Haines2015-08-251-0/+2
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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 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 fed...Erik Johnston2015-08-212-1/+6
| * | 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
|\ \ \ \
| * | | | 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
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-2019-80/+498
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-209-8/+232
| * | | | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-2010-40/+40
| * | | | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-203-31/+38
| * | | | | 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
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 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
| * | | | | | | 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
* | | | | | | | | 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.0Daniel Wagner-Hall2015-08-201-1/+1
|/ / / / / / /
* | | | | | | 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
| |\ \ \ \ \ \
| | * | | | | | 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
| |\ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-18 13:57:12 +0000