Commit Graph

4601 Commits (474274583f664cf3184958bff829d7b50224c9a6)
 

Author SHA1 Message Date
Mark Haines a7122692d9 Merge branch 'release-v0.10.0' into develop 9 years ago
Erik Johnston b442217d91 Actually add config path 9 years ago
Erik Johnston c961cd7736 Clean up scripts/ 9 years ago
Erik Johnston 5371c2a1f7 Bump version and changelog 9 years ago
Erik Johnston 4a6d894850 Merge pull request #260 from matrix-org/erikj/filename_order 9 years ago
Erik Johnston ddf4d2bd98 Consistency 9 years ago
Erik Johnston 66ec6cf9b8 Check for an internationalised filename first 9 years ago
Erik Johnston 53c2eed862 None check the correct variable 9 years ago
Erik Johnston f02532baad Check for None 9 years ago
Erik Johnston 25b32b63ae Bump changelog and version 9 years ago
Erik Johnston e330c802e4 Merge pull request #259 from matrix-org/markjh/unicode_content_disposition 9 years ago
Mark Haines c9cb354b58 Give a sensible error message if the filename is invalid UTF-8 9 years ago
Mark Haines 5a9e0c3682 Handle unicode filenames given when downloading or received over federation 9 years ago
Mark Haines e85c7873dc Allow non-ascii filenames for attachments 9 years ago
Daniel Wagner-Hall 86fac9c95e Remove unused import 9 years ago
Daniel Wagner-Hall 3063383547 Swap out bcrypt for md5 in tests 9 years ago
Daniel Wagner-Hall 81450fded8 Turn TODO into thing which actually will fail 9 years ago
Mark Haines 4c56928263 Merge pull request #254 from matrix-org/markjh/tox_setuptools 9 years ago
Daniel Wagner-Hall 6f0c344ca7 Merge pull request #255 from matrix-org/mergeeriksmadness 9 years ago
Daniel Wagner-Hall 37f0ddca5f Merge branch 'mergeeriksmadness' into auth 9 years ago
Daniel Wagner-Hall d3c0e48859 Merge erikj/user_dedup to develop 9 years ago
Daniel Wagner-Hall 6a4b650d8a Attempt to validate macaroons 9 years ago
Mark Haines 06094591c5 Pass an empty list of arguments to tox if no arguments are given 9 years ago
Mark Haines fd246fde89 Install tox locally if it wasn't already installed when running setup.py test 9 years ago
Mark Haines 4f6fa981ec Make 'setup.py test' run tox 9 years ago
Daniel Wagner-Hall 3cab86a122 Merge pull request #253 from matrix-org/tox 9 years ago
Daniel Wagner-Hall e768d7b3a6 Allow tests to be filter when using tox 9 years ago
Erik Johnston efdaa5dd55 Merge pull request #252 from matrix-org/erikj/typing_loop 9 years ago
Erik Johnston da51acf0e7 Remove needless existence checks 9 years ago
Erik Johnston f4d552589e Don't loop over all rooms ever in typing.get_new_events_for_user 9 years ago
Erik Johnston 90fde4b8d7 Bump changelog and version 9 years ago
Erik Johnston 0de2aad061 Merge pull request #250 from matrix-org/erikj/generated_directory 9 years ago
Erik Johnston 3f6f74686a Update config doc 9 years ago
Erik Johnston 82145912c3 s/--generated-directory/--keys-directory/ 9 years ago
Daniel Wagner-Hall a2355fae7e Merge pull request #251 from matrix-org/removeadmin 9 years ago
Daniel Wagner-Hall ee3fa1a99c Merge pull request #248 from matrix-org/deviceid 9 years ago
Erik Johnston 59891a294f Merge pull request #249 from matrix-org/erikj/allow_config_path_dirs 9 years ago
Erik Johnston 3e1029fe80 Warn if we encounter unexpected files in config directories 9 years ago
Erik Johnston af7c1397d1 Add config option to specify where generated files should be dumped 9 years ago
Daniel Wagner-Hall 460cad7c11 Merge branch 'deviceid' into removeadmin 9 years ago
Daniel Wagner-Hall 825f0875bc Fix up one more reference 9 years ago
Daniel Wagner-Hall a9d8bd95e7 Stop looking up "admin", which we never read 9 years ago
Erik Johnston bfb66773a4 Allow specifying directories as config files 9 years ago
Daniel Wagner-Hall 57619d6058 Re-wrap line 9 years ago
Daniel Wagner-Hall a0b181bd17 Remove completely unused concepts from codebase 9 years ago
Mark Haines 1925a38f95 Merge pull request #247 from matrix-org/markjh/tox 9 years ago
Erik Johnston 747535f20f Merge pull request #245 from matrix-org/erikj/configurable_client_location 9 years ago
Erik Johnston 133d90abfb Merge pull request #246 from matrix-org/erikj/config_helper_function 9 years ago
Mark Haines 3a20cdcd27 Add .tox to .gitignore 9 years ago
Mark Haines d046adf4ec Set PYTHONDONTWRITEBYTECODE in the tox environment so that we don't spew .pyc files everywhere 9 years ago