Commit Graph

4322 Commits (aa361f51dc9a5e0d3efcf885e1f4c9d9f03fc54d)
 

Author SHA1 Message Date
Mark Haines aa361f51dc Merge pull request #244 from matrix-org/markjh/refresh_tokens 9 years ago
Mark Haines 037481a033 Remove autoincrement since we incrementing the ID in the storage layer 9 years ago
Erik Johnston 745b72660a Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop 9 years ago
Erik Johnston 1f7642efa9 Fix bug where we didn't correctly serialize the redacted_because key over federation 9 years ago
Erik Johnston 3e9ee62db0 Add missing param in store.get_state_groups invocation 9 years ago
David Baker 21b71b6d7c Return fully qualified user_id as per spec 9 years ago
Daniel Wagner-Hall b1e35eabf2 Merge pull request #240 from matrix-org/refresh 9 years ago
Daniel Wagner-Hall c7788685b0 Fix bad merge 9 years ago
Daniel Wagner-Hall 8c74bd8960 Fix indentation 9 years ago
Daniel Wagner-Hall f483340b3e Merge pull request #229 from matrix-org/auth 9 years ago
Daniel Wagner-Hall ea570ffaeb Fix flake8 warnings 9 years ago
Mark Haines 7049e1564f Merge remote-tracking branch 'origin/master' into develop 9 years ago
Daniel Wagner-Hall d5a825edee Merge branch 'auth' into refresh 9 years ago
Daniel Wagner-Hall 225c244aba Remove incorrect whitespace 9 years ago
Daniel Wagner-Hall 4e706ec82c Merge branch 'develop' into auth 9 years ago
Daniel Wagner-Hall 31621c2e06 Merge pull request #239 from matrix-org/pynacl 9 years ago
Daniel Wagner-Hall f90ea3dc73 Correct pynacl version to 0.3.0 9 years ago
Daniel Wagner-Hall ce2a7ed6e4 Merge branch 'develop' into auth 9 years ago
Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh 9 years ago
Daniel Wagner-Hall cecbd636e9 /tokenrefresh POST endpoint 9 years ago
Erik Johnston b578c822e3 Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0 9 years ago
Erik Johnston 3befc9ccc3 Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop 9 years ago
Mark Haines d5c31e01f2 Merge pull request #237 from matrix-org/markjh/readme-rst-formatting 9 years ago
Mark Haines cb8201ba12 Merge pull request #236 from matrix-org/markjh/upgrade-instructions 9 years ago
Erik Johnston c141d47a28 Merge pull request #235 from matrix-org/erikj/room_avatars 9 years ago
Daniel Wagner-Hall 13a6517d89 s/by_token/by_access_token/g 9 years ago
Erik Johnston 61cd03466f Merge pull request #238 from matrix-org/fix_set_password 9 years ago
David Baker f764f92647 Remove spurious extra arg to set_password 9 years ago
David Baker ca0d28ef34 Another use of check_password that got missed in the yield fix 9 years ago
Mark Haines 8a951540f6 Further formatting clean ups 9 years ago
Mark Haines 482648123f Clean up some of restructured text formatting in the README.rst 9 years ago
Mark Haines fd88ea19c0 Tweak the wording a bit 9 years ago
Mark Haines bb9611bd46 Add generic update instructions to UPGRADE.rst and add link to them from the README.rst 9 years ago
Erik Johnston 9b63def388 Add m.room.avatar to default power levels. Change default required power levels of such events to 50 9 years ago
Erik Johnston 23b21e5215 Update changelog 9 years ago
Erik Johnston 9d720223f2 Bump version and changelog 9 years ago
Daniel Wagner-Hall 617501dd2a Move token generation to auth handler 9 years ago
Erik Johnston 099ce4bc38 Merge pull request #231 from matrix-org/erikj/pushers_store_last_token 9 years ago
Mark Haines 22346a0ee7 Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails 9 years ago
Erik Johnston cbd053bb8f Merge pull request #233 from matrix-org/erikj/canonical_alias 9 years ago
David Baker be27d81808 Merge pull request #234 from matrix-org/email_login 9 years ago
Daniel Wagner-Hall ade5342752 Merge branch 'auth' into refresh 9 years ago
David Baker 4cf302de5b Comma comma comma comma comma chameleon 9 years ago
David Baker c50ad14bae Merge branch 'develop' into email_login 9 years ago
Mark Haines a0b8e5f2fe Merge pull request #211 from matrix-org/email_in_use 9 years ago
Erik Johnston aadb2238c9 Check that the canonical room alias actually points to the room 9 years ago
Daniel Wagner-Hall f9e7493ac2 Merge branch 'develop' into auth 9 years ago
Daniel Wagner-Hall ecc59ae66e Merge branch 'master' into auth 9 years ago
Daniel Wagner-Hall 70e265e695 Re-add whitespace around caveat operators 9 years ago
Erik Johnston 09d23b6209 Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms 9 years ago