diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-26 17:35:37 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-26 17:35:37 +0000 |
| commit | f7e14bb535ca9e2c9a3f86ad12de5004a50bd6fb (patch) | |
| tree | 7dd381962c5af08819b07c3764c2d68e34385d1e | |
| parent | Fix receipts for room initial sync (diff) | |
| parent | Move static folder into synapse (diff) | |
| download | synapse-f7e14bb535ca9e2c9a3f86ad12de5004a50bd6fb.tar.xz | |
Merge pull request #329 from matrix-org/erikj/static
Move static folder into synapse
| -rwxr-xr-x | synapse/app/homeserver.py | 4 | ||||
| -rw-r--r-- | synapse/static/client/register/index.html (renamed from static/client/register/index.html) | 0 | ||||
| -rw-r--r-- | synapse/static/client/register/js/jquery-2.1.3.min.js (renamed from static/client/register/js/jquery-2.1.3.min.js) | 0 | ||||
| -rw-r--r-- | synapse/static/client/register/js/recaptcha_ajax.js (renamed from static/client/register/js/recaptcha_ajax.js) | 0 | ||||
| -rw-r--r-- | synapse/static/client/register/js/register.js (renamed from static/client/register/js/register.js) | 0 | ||||
| -rw-r--r-- | synapse/static/client/register/register_config.sample.js (renamed from static/client/register/register_config.sample.js) | 0 | ||||
| -rw-r--r-- | synapse/static/client/register/style.css (renamed from static/client/register/style.css) | 0 |
7 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index cf2fa221dc..a77535a4ee 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -132,7 +132,9 @@ class SynapseHomeServer(HomeServer): def build_resource_for_static_content(self): # This is old and should go away: not going to bother adding gzip - return File("static") + return File( + os.path.join(os.path.dirname(synapse.__file__), "static") + ) def build_resource_for_content_repo(self): return ContentRepoResource( diff --git a/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee41e..600b3ee41e 100644 --- a/static/client/register/index.html +++ b/synapse/static/client/register/index.html diff --git a/static/client/register/js/jquery-2.1.3.min.js b/synapse/static/client/register/js/jquery-2.1.3.min.js index 25714ed29a..25714ed29a 100644 --- a/static/client/register/js/jquery-2.1.3.min.js +++ b/synapse/static/client/register/js/jquery-2.1.3.min.js diff --git a/static/client/register/js/recaptcha_ajax.js b/synapse/static/client/register/js/recaptcha_ajax.js index d0e71e5b88..d0e71e5b88 100644 --- a/static/client/register/js/recaptcha_ajax.js +++ b/synapse/static/client/register/js/recaptcha_ajax.js diff --git a/static/client/register/js/register.js b/synapse/static/client/register/js/register.js index b62763a293..b62763a293 100644 --- a/static/client/register/js/register.js +++ b/synapse/static/client/register/js/register.js diff --git a/static/client/register/register_config.sample.js b/synapse/static/client/register/register_config.sample.js index c7ea180dee..c7ea180dee 100644 --- a/static/client/register/register_config.sample.js +++ b/synapse/static/client/register/register_config.sample.js diff --git a/static/client/register/style.css b/synapse/static/client/register/style.css index 5a7b6eebf2..5a7b6eebf2 100644 --- a/static/client/register/style.css +++ b/synapse/static/client/register/style.css |