1
0

Commit Graph

  • a7122692d9 Merge branch 'release-v0.10.0' into develop Mark Haines 2015-08-28 11:15:27 +01:00
  • b442217d91 Actually add config path Erik Johnston 2015-08-28 10:37:17 +01:00
  • c961cd7736 Clean up scripts/ Erik Johnston 2015-08-27 13:01:38 +01:00
  • 5371c2a1f7 Bump version and changelog v0.10.0-rc5 Erik Johnston 2015-08-27 11:20:36 +01:00
  • 4a6d894850 Merge pull request #260 from matrix-org/erikj/filename_order Erik Johnston 2015-08-27 11:18:01 +01:00
  • ddf4d2bd98 Consistency Erik Johnston 2015-08-27 10:50:49 +01:00
  • 66ec6cf9b8 Check for an internationalised filename first Erik Johnston 2015-08-27 10:48:58 +01:00
  • 53c2eed862 None check the correct variable Erik Johnston 2015-08-27 10:38:22 +01:00
  • f02532baad Check for None Erik Johnston 2015-08-27 10:37:02 +01:00
  • 25b32b63ae Bump changelog and version v0.10.0-rc4 Erik Johnston 2015-08-27 10:09:32 +01:00
  • e330c802e4 Merge pull request #259 from matrix-org/markjh/unicode_content_disposition Erik Johnston 2015-08-27 10:03:58 +01:00
  • c9cb354b58 Give a sensible error message if the filename is invalid UTF-8 Mark Haines 2015-08-26 17:27:23 +01:00
  • 5a9e0c3682 Handle unicode filenames given when downloading or received over federation Mark Haines 2015-08-26 17:08:47 +01:00
  • e85c7873dc Allow non-ascii filenames for attachments Mark Haines 2015-08-26 16:26:37 +01:00
  • 86fac9c95e Remove unused import Daniel Wagner-Hall 2015-08-26 16:03:17 +01:00
  • 3063383547 Swap out bcrypt for md5 in tests Daniel Wagner-Hall 2015-08-26 15:59:32 +01:00
  • 81450fded8 Turn TODO into thing which actually will fail Daniel Wagner-Hall 2015-08-26 13:56:01 +01:00
  • 4c56928263 Merge pull request #254 from matrix-org/markjh/tox_setuptools Mark Haines 2015-08-26 13:50:59 +01:00
  • 6f0c344ca7 Merge pull request #255 from matrix-org/mergeeriksmadness Daniel Wagner-Hall 2015-08-26 13:49:38 +01:00
  • 37f0ddca5f Merge branch 'mergeeriksmadness' into auth Daniel Wagner-Hall 2015-08-26 13:45:06 +01:00
  • d3c0e48859 Merge erikj/user_dedup to develop Daniel Wagner-Hall 2015-08-26 13:42:45 +01:00
  • 6a4b650d8a Attempt to validate macaroons Daniel Wagner-Hall 2015-08-26 13:22:23 +01:00
  • 06094591c5 Pass an empty list of arguments to tox if no arguments are given Mark Haines 2015-08-26 13:13:01 +01:00
  • fd246fde89 Install tox locally if it wasn't already installed when running setup.py test Mark Haines 2015-08-26 12:59:02 +01:00
  • 4f6fa981ec Make 'setup.py test' run tox Mark Haines 2015-08-26 12:45:29 +01:00
  • 3cab86a122 Merge pull request #253 from matrix-org/tox Daniel Wagner-Hall 2015-08-26 11:48:41 +01:00
  • e768d7b3a6 Allow tests to be filter when using tox Daniel Wagner-Hall 2015-08-26 11:41:42 +01:00
  • efdaa5dd55 Merge pull request #252 from matrix-org/erikj/typing_loop Erik Johnston 2015-08-26 11:12:25 +01:00
  • da51acf0e7 Remove needless existence checks Erik Johnston 2015-08-26 11:08:23 +01:00
  • f4d552589e Don't loop over all rooms ever in typing.get_new_events_for_user Erik Johnston 2015-08-26 10:51:08 +01:00
  • 90fde4b8d7 Bump changelog and version v0.10.0-rc3 Erik Johnston 2015-08-25 17:49:58 +01:00
  • 0de2aad061 Merge pull request #250 from matrix-org/erikj/generated_directory Erik Johnston 2015-08-25 17:40:19 +01:00
  • 3f6f74686a Update config doc Erik Johnston 2015-08-25 17:37:21 +01:00
  • 82145912c3 s/--generated-directory/--keys-directory/ Erik Johnston 2015-08-25 17:31:22 +01:00
  • a2355fae7e Merge pull request #251 from matrix-org/removeadmin Daniel Wagner-Hall 2015-08-25 17:23:05 +01:00
  • ee3fa1a99c Merge pull request #248 from matrix-org/deviceid Daniel Wagner-Hall 2015-08-25 17:19:06 +01:00
  • 59891a294f Merge pull request #249 from matrix-org/erikj/allow_config_path_dirs Erik Johnston 2015-08-25 17:17:57 +01:00
  • 3e1029fe80 Warn if we encounter unexpected files in config directories Erik Johnston 2015-08-25 17:08:23 +01:00
  • af7c1397d1 Add config option to specify where generated files should be dumped Erik Johnston 2015-08-25 16:58:01 +01:00
  • 460cad7c11 Merge branch 'deviceid' into removeadmin Daniel Wagner-Hall 2015-08-25 16:37:59 +01:00
  • 825f0875bc Fix up one more reference Daniel Wagner-Hall 2015-08-25 16:37:37 +01:00
  • a9d8bd95e7 Stop looking up "admin", which we never read Daniel Wagner-Hall 2015-08-25 16:29:39 +01:00
  • bfb66773a4 Allow specifying directories as config files Erik Johnston 2015-08-25 16:25:54 +01:00
  • 57619d6058 Re-wrap line Daniel Wagner-Hall 2015-08-25 16:25:46 +01:00
  • a0b181bd17 Remove completely unused concepts from codebase Daniel Wagner-Hall 2015-08-25 16:23:06 +01:00
  • 1925a38f95 Merge pull request #247 from matrix-org/markjh/tox Mark Haines 2015-08-25 16:03:55 +01:00
  • 747535f20f Merge pull request #245 from matrix-org/erikj/configurable_client_location Erik Johnston 2015-08-25 15:50:25 +01:00
  • 133d90abfb Merge pull request #246 from matrix-org/erikj/config_helper_function Erik Johnston 2015-08-25 15:49:21 +01:00
  • 3a20cdcd27 Add .tox to .gitignore Mark Haines 2015-08-25 15:45:03 +01:00
  • d046adf4ec Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew .pyc files everywhere Mark Haines 2015-08-25 15:44:05 +01:00
  • 1d1c303b9b Fix typo when using sys.stderr.write Erik Johnston 2015-08-25 15:39:16 +01:00
  • d33f31d741 Print the correct pip install line when failing due to lack of matrix-angular-sdk Erik Johnston 2015-08-25 15:33:23 +01:00
  • c63df2d4e0 Prod jenkins Mark Haines 2015-08-25 15:22:39 +01:00
  • f63208a1c0 Add utility to parse config and print out a key Erik Johnston 2015-08-25 15:13:35 +01:00
  • 43f2e42bfd Prod jenkins Mark Haines 2015-08-25 15:12:38 +01:00
  • 4bd05573e9 Prod jenkins Mark Haines 2015-08-25 15:03:32 +01:00
  • 12b1a47ba4 Only include demo/demo.tls.dh. Don't include any other dh file Mark Haines 2015-08-25 14:22:33 +01:00
  • 37403ab06c Update the log message Erik Johnston 2015-08-25 14:19:09 +01:00
  • 2e31dd2ad3 Add tox.ini file for synapse Mark Haines 2015-08-24 17:17:31 +01:00
  • 8b52fe48b5 Revert previous commit. Instead, always download matrix-angular-sdk as a requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse. Erik Johnston 2015-08-25 14:10:31 +01:00
  • d9088c923f Remove dependency on matrix-angular-sdk Erik Johnston 2015-08-25 13:34:50 +01:00
  • 86cef6a91b Allow specifying a directory to host a web client from Erik Johnston 2015-08-25 12:01:23 +01:00
  • 1c847af28a Merge pull request #243 from matrix-org/markjh/remove_syutil Mark Haines 2015-08-25 10:52:16 +01:00
  • cf8c04948f Fix typo in module imports and package dependencies Mark Haines 2015-08-25 10:42:59 +01:00
  • aa361f51dc Merge pull request #244 from matrix-org/markjh/refresh_tokens Mark Haines 2015-08-25 09:40:35 +01:00
  • 037481a033 Remove autoincrement since we incrementing the ID in the storage layer Mark Haines 2015-08-24 17:48:57 +01:00
  • 01fc3943f1 Fix indent Mark Haines 2015-08-24 17:18:58 +01:00
  • 571ac105e6 Bump version and changelog v0.10.0-rc2 Erik Johnston 2015-08-24 17:10:45 +01:00
  • 51c53369a3 Do auth checks *before* persisting the event Erik Johnston 2015-08-24 16:38:20 +01:00
  • f093873d69 Replace syutil references in scripts Mark Haines 2015-08-24 16:30:35 +01:00
  • 61f36d9939 Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_events Erik Johnston 2015-08-24 16:23:55 +01:00
  • f8f3d72e2b Don't make pushers handle presence/typing events Erik Johnston 2015-08-24 16:19:43 +01:00
  • 78323ccdb3 Remove syutil dependency in favour of smaller single-purpose libraries Mark Haines 2015-08-24 16:17:38 +01:00
  • 55ce9f9261 Update the extremeties tables in a seperate txn erikj/extremeties_txn Erik Johnston 2015-08-24 16:04:58 +01:00
  • 457970c724 Don't insert events into 'event_*_extremeties' tables if they're outliers Erik Johnston 2015-08-23 13:44:23 +01:00
  • 1bd1a43073 Actually check if event_id isn't returned by _get_state_groups Erik Johnston 2015-08-21 14:30:34 +01:00
  • 0f6a25f670 Upate changelog v0.10.0-rc1 Erik Johnston 2015-08-21 13:07:56 +01:00
  • b9490e8cbb Upate changelog Erik Johnston 2015-08-21 13:07:37 +01:00
  • 5dbd102470 Merge branch 'erikj/user_dedup' into release-v0.10.0 Erik Johnston 2015-08-21 12:51:14 +01:00
  • fd5ad0f00e Doc string Erik Johnston 2015-08-21 11:45:43 +01:00
  • 745b72660a Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop Erik Johnston 2015-08-21 11:39:38 +01:00
  • 42f12ad92f When logging in fetch user by user_id case insensitively, *unless* there are multiple case insensitive matches, in which case require the exact user_id Erik Johnston 2015-08-21 11:34:43 +01:00
  • aa3c9c7bd0 Don't allow people to register user ids which only differ by case to an existing one Erik Johnston 2015-08-21 10:57:47 +01:00
  • 1f7642efa9 Fix bug where we didn't correctly serialize the redacted_because key over federation Erik Johnston 2015-08-21 09:36:07 +01:00
  • 3e9ee62db0 Add missing param in store.get_state_groups invocation Erik Johnston 2015-08-21 09:15:13 +01:00
  • 21b71b6d7c Return fully qualified user_id as per spec David Baker 2015-08-20 21:54:53 +01:00
  • b1e35eabf2 Merge pull request #240 from matrix-org/refresh Daniel Wagner-Hall 2015-08-20 17:44:46 +01:00
  • c7788685b0 Fix bad merge Daniel Wagner-Hall 2015-08-20 17:43:12 +01:00
  • 8c74bd8960 Fix indentation Daniel Wagner-Hall 2015-08-20 17:26:52 +01:00
  • f483340b3e Merge pull request #229 from matrix-org/auth Daniel Wagner-Hall 2015-08-20 17:25:42 +01:00
  • ea570ffaeb Fix flake8 warnings Daniel Wagner-Hall 2015-08-20 17:22:41 +01:00
  • 7049e1564f Merge remote-tracking branch 'origin/master' into develop Mark Haines 2015-08-20 17:21:51 +01:00
  • d5a825edee Merge branch 'auth' into refresh Daniel Wagner-Hall 2015-08-20 17:13:33 +01:00
  • 225c244aba Remove incorrect whitespace Daniel Wagner-Hall 2015-08-20 17:10:10 +01:00
  • 4e706ec82c Merge branch 'develop' into auth Daniel Wagner-Hall 2015-08-20 16:59:41 +01:00
  • 31621c2e06 Merge pull request #239 from matrix-org/pynacl Daniel Wagner-Hall 2015-08-20 16:51:21 +01:00
  • f90ea3dc73 Correct pynacl version to 0.3.0 Daniel Wagner-Hall 2015-08-20 16:42:17 +01:00
  • ce2a7ed6e4 Merge branch 'develop' into auth Daniel Wagner-Hall 2015-08-20 16:28:36 +01:00
  • e8cf77fa49 Merge branch 'develop' into refresh Daniel Wagner-Hall 2015-08-20 16:25:40 +01:00
  • cecbd636e9 /tokenrefresh POST endpoint Daniel Wagner-Hall 2015-08-20 16:21:35 +01:00