| author | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 21:30:29 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 21:30:29 (UTC) |
| commit | 758bd68eee9c0ae1d3ad8dc50481c78557bd6228 (patch) (side-by-side diff) | |
| tree | 42fe98603849248c0d3943fd1d79135a734811c9 | |
| parent | 288b8df03a499a2e68ebaad48e687d1eac9df0ff (diff) | |
| parent | 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (diff) | |
| download | clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.zip clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.gz clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.bz2 | |
Merge pull request #35 from gcsolaroli/master
Merged pull request #33
| -rw-r--r-- | backend/python/properties/python.properties.json | 4 | ||||
| -rw-r--r-- | frontend/beta/properties/beta.properties.json | 5 | ||||
| -rw-r--r-- | frontend/gamma/properties/gamma.properties.json | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/backend/python/properties/python.properties.json b/backend/python/properties/python.properties.json index 128c98e..8dd872f 100644 --- a/backend/python/properties/python.properties.json +++ b/backend/python/properties/python.properties.json @@ -1,8 +1,8 @@ { "request.path": "clipperz.py", - "should.pay.toll": "false" + "should.pay.toll": "false", "development.settings": { "url": "http://localhost/python/clipperz" } -}
\ No newline at end of file +} diff --git a/frontend/beta/properties/beta.properties.json b/frontend/beta/properties/beta.properties.json index 476becd..810215b 100644 --- a/frontend/beta/properties/beta.properties.json +++ b/frontend/beta/properties/beta.properties.json @@ -174,14 +174,17 @@ "Clipperz/PM/Main.js" ], "css": [ "yui-extensions/reset-min.css", "yui-extensions/core.css", "yui-extensions/basic-dialog.css", "yui-extensions/button.css", "clipperz/clipperz.css", "clipperz/compact.css", "clipperz/ytheme-clipperz.css" - ] + ], + + "html.template": "index_template.html" + } diff --git a/frontend/gamma/properties/gamma.properties.json b/frontend/gamma/properties/gamma.properties.json index 0a513e8..c847812 100644 --- a/frontend/gamma/properties/gamma.properties.json +++ b/frontend/gamma/properties/gamma.properties.json @@ -179,13 +179,13 @@ "Clipperz/PM/UI/Web/Controllers/CardsController.js", "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", "main.js" ], "css": [ "web.css" ] -}
\ No newline at end of file +} |