Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -1/+0 |
|\ | |||||
| * | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 1 | -1/+0 |
| | | |||||
* | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 1 | -0/+1 |
| | | | | | | | | Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails | ||||
* | | Flesh out email templating | David Baker | 2016-04-21 | 1 | -1/+1 |
| | | | | | | | | Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients. | ||||
* | | Generate mails from a template | David Baker | 2016-04-20 | 1 | -0/+3 |
|/ | |||||
* | Sanitize the optional dependencies for spider API | Erik Johnston | 2016-04-13 | 1 | -1/+0 |
| | |||||
* | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵ | Matthew Hodgson | 2016-04-08 | 1 | -2/+5 |
| | | | | | | | | | defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback | ||||
* | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 1 | -0/+1 |
|\ | |||||
| * | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 1 | -0/+1 |
| | | |||||
* | | make it build | Matthew Hodgson | 2016-03-29 | 1 | -0/+1 |
|/ | |||||
* | Pin pysaml2 version to 3.x | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| | | | | | This is due to the fact that `from saml2 import config` fails in version 4.x | ||||
* | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git+ssh://github.com/matrix-org/synapse | Matthew Hodgson | 2016-02-10 | 1 | -2/+2 |
|\ | |||||
| * | Pin pynacl to 0.3.0 | Daniel Wagner-Hall | 2016-01-28 | 1 | -1/+1 |
| | | | | | | | | | | Something has gone wrong in the packaging of 1.* which causes it not to compile. | ||||
| * | copyrights | Matthew Hodgson | 2016-01-07 | 1 | -1/+1 |
| | | |||||
* | | try to bump syweb to 0.6.8 | Matthew Hodgson | 2016-02-10 | 1 | -1/+1 |
|/ | |||||
* | Add nacl.bindings to the list of modules checked. Re-arrange import order to ↵ | Mark Haines | 2015-09-01 | 1 | -3/+3 |
| | | | | check packages after the packages they depend on | ||||
* | Print an example "pip install" line for a missing requirement | Mark Haines | 2015-09-01 | 1 | -6/+11 |
| | |||||
* | Use the version of "matrix-angular-sdk" hosted on pypi | Mark Haines | 2015-09-01 | 1 | -5/+0 |
| | |||||
* | Merge branch 'release-v0.10.0' into develop | Mark Haines | 2015-08-28 | 1 | -6/+6 |
|\ | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py | ||||
| * | Print the correct pip install line when failing due to lack of ↵ | Erik Johnston | 2015-08-25 | 1 | -5/+5 |
| | | | | | | | | matrix-angular-sdk | ||||
| * | Revert previous commit. Instead, always download matrix-angular-sdk as a ↵ | Erik Johnston | 2015-08-25 | 1 | -3/+7 |
| | | | | | | | | requirement, but don't complain (when we do check_requirements) if we don't have it when we start synapse. | ||||
| * | Remove dependency on matrix-angular-sdk | Erik Johnston | 2015-08-25 | 1 | -5/+1 |
| | | |||||
* | | Fix typo in module imports and package dependencies | Mark Haines | 2015-08-25 | 1 | -1/+1 |
| | | |||||
* | | Remove syutil dependency in favour of smaller single-purpose libraries | Mark Haines | 2015-08-24 | 1 | -6/+3 |
| | | |||||
* | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+1 |
|\ \ | |||||
| * | | Correct pynacl version to 0.3.0 | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+1 |
| |/ | | | | | | | 0.0.3 was a typo | ||||
* | | Switch to pymacaroons-pynacl | Daniel Wagner-Hall | 2015-08-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-18 | 1 | -1/+1 |
|\| | |||||
| * | Depend on Twisted>=15.1 rather than pining to a particular version | Mark Haines | 2015-08-12 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-08-12 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/http/matrixfederationclient.py | ||||
| * \ | Merge branch 'develop' into markjh/twisted-15 | Mark Haines | 2015-06-01 | 1 | -3/+4 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/python_dependencies.py | ||||
| * | | | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵ | Mark Haines | 2015-06-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | own Agent | ||||
* | | | | Issue macaroons as opaque auth tokens | Daniel Wagner-Hall | 2015-08-18 | 1 | -0/+1 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information | ||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 1 | -0/+1 |
| | |/ | |/| | |||||
* / | | Add blist to dependencies | Erik Johnston | 2015-07-08 | 1 | -0/+1 |
|/ / | |||||
* | | Bump syutil version | Erik Johnston | 2015-05-29 | 1 | -3/+3 |
| | | |||||
* | | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 1 | -0/+1 |
|/ | | | | ujson.loads | ||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-07 | 1 | -3/+3 |
|\ | |||||
| * | Bump syweb version | Erik Johnston | 2015-05-07 | 1 | -3/+3 |
| | | |||||
* | | pynacl-0.3.0 was released so we can finally start using it directly from pypi | Mark Haines | 2015-05-07 | 1 | -6/+1 |
|/ | |||||
* | bump syutil to 0.0.6 | Mark Haines | 2015-04-29 | 1 | -3/+3 |
| | |||||
* | Copyright notices | Mark Haines | 2015-04-24 | 1 | -0/+14 |
| | |||||
* | Bump syutil version to 0.0.5 | Mark Haines | 2015-04-21 | 1 | -3/+3 |
| | |||||
* | Update syutil version to 0.0.4 | Mark Haines | 2015-04-14 | 1 | -3/+3 |
| | |||||
* | pep8 | David Baker | 2015-03-17 | 1 | -2/+3 |
| | |||||
* | Wire up the webclient option | David Baker | 2015-03-17 | 1 | -4/+16 |
| | | | | | | It existed but was hardcoded to True. Give it an underscore for consistency. Also don't pull in syweb unless we're actually using the web client. | ||||
* | Also bump dependency link version | Erik Johnston | 2015-03-13 | 1 | -2/+2 |
| | |||||
* | bump dep on syweb 0.6.5 | Matthew Hodgson | 2015-03-12 | 1 | -1/+1 |
| | |||||
* | Bump webclient version | Erik Johnston | 2015-03-02 | 1 | -3/+3 |
| | |||||
* | Bump matrix-angular-sdk version | Erik Johnston | 2015-02-18 | 1 | -3/+3 |
| | |||||
* | Fix syntax | Mark Haines | 2015-02-18 | 1 | -1/+1 |
| | |||||
* | Move pynacl to the top of the depedency link list so that it is | Mark Haines | 2015-02-18 | 1 | -5/+5 |
| | | | | installed before syutil | ||||
* | Bump webclient version | Erik Johnston | 2015-02-12 | 1 | -3/+3 |
| | |||||
* | Update dependency links | Erik Johnston | 2015-02-11 | 1 | -2/+2 |
| | |||||
* | Bump syutil version | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
| | |||||
* | Allow newer versions of syutil | Mark Haines | 2015-02-11 | 1 | -1/+1 |
| | |||||
* | Single source version and python dependencies, prevent people accidentally ↵ | Mark Haines | 2015-02-10 | 1 | -3/+3 |
| | | | | installing with easy_install, use scripts rather than entry_points to install synctl | ||||
* | Code-style fixes | Mark Haines | 2015-02-10 | 1 | -2/+4 |
| | |||||
* | oops | Matthew Hodgson | 2015-02-09 | 1 | -1/+1 |
| | |||||
* | oops | Matthew Hodgson | 2015-02-09 | 1 | -1/+1 |
| | |||||
* | only do word-boundary patches on bodies for now | Matthew Hodgson | 2015-02-09 | 1 | -1/+1 |
| | |||||
* | Merge pull request #46 from matrix-org/identicons | Mark Haines | 2015-02-02 | 1 | -0/+1 |
|\ | | | | | Add a media/v1/identicon resource for generating identicons | ||||
| * | Add pydenticon to python_dependencies | Mark Haines | 2015-02-02 | 1 | -0/+1 |
| | | |||||
* | | Generate a list of dependencies from synapse/python_dependencies.py | Mark Haines | 2015-02-02 | 1 | -0/+41 |
|/ | |||||
* | We do need Twisted 14, not 15: we use internal Twisted things that have been ↵ | David Baker | 2015-01-30 | 1 | -1/+1 |
| | | | | removed in 15. | ||||
* | Stop complaining about Synapse Angular SDK 0.6.1 | Paul "LeoNerd" Evans | 2015-01-23 | 1 | -1/+1 |
| | |||||
* | Check the existance and versions of necessary modules when starting synapse, ↵ | Mark Haines | 2015-01-08 | 1 | -0/+80 |
log which modules are used |