Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 | |
|\ | | | | | Deduplicate membership changes | |||||
| * | Deduplicate joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 | |
| | | ||||||
* | | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 | |
|/ | ||||||
* | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 1 | -4/+14 | |
|\ | | | | | Fix stuck invites | |||||
| * | Fix stuck invites | Erik Johnston | 2016-04-05 | 1 | -4/+14 | |
| | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject. | |||||
* | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 1 | -1/+4 | |
|\| | | | | | Store invites in a separate table. | |||||
| * | Docs and indents | Erik Johnston | 2016-04-04 | 1 | -1/+4 | |
| | | ||||||
| * | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 1 | -93/+147 | |
|\| | | | | | Do checks for memberships before creating events | |||||
| * | Use computed prev event ids | Erik Johnston | 2016-04-01 | 1 | -0/+3 | |
| | | ||||||
| * | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 1 | -93/+144 | |
| | | ||||||
* | | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -24/+24 | |
|/ | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | |||||
* | Split out RoomMemberHandler | Erik Johnston | 2016-03-31 | 1 | -0/+646 | |