Merge branch 'buildFix' of https://github.com/jokajak/password-manager

Conflicts:
	frontend/gamma/properties/gamma.properties.json

2 files changed, 5 insertions, 2 deletions

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
@@ -154,34 +154,37 @@
                 "Clipperz/PM/BookmarkletProcessor.js",
                 "Clipperz/PM/DataModel/User.js",
                 "Clipperz/PM/DataModel/UserPreferences.js",
                 "Clipperz/PM/DataModel/Header.js",
                 "Clipperz/PM/DataModel/Statistics.js",
                 "Clipperz/PM/DataModel/Record.js",
                 "Clipperz/PM/DataModel/RecordField.js",
                 "Clipperz/PM/DataModel/RecordVersion.js",
                 "Clipperz/PM/DataModel/DirectLogin.js",
                 "Clipperz/PM/DataModel/DirectLoginReference.js",
                 "Clipperz/PM/DataModel/DirectLoginInput.js",
                 "Clipperz/PM/DataModel/DirectLoginBinding.js",
                 "Clipperz/PM/DataModel/OneTimePasswordManager.js",
                 "Clipperz/PM/DataModel/OneTimePassword.js",
                 "Clipperz/YUI/IBLayoutManager.js",
                 "Clipperz/YUI/IBLayoutRegion.js",
                 "Clipperz/YUI/Drawer.js",
                 "Clipperz/YUI/Collapser.js",
                 "Clipperz/YUI/MessageBox.js",
                 "Clipperz/YUI/DomHelper.js",
 
                 "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
@@ -159,33 +159,33 @@
                 "Clipperz/PM/UI/Web/Components/AccountPanel.js",
                 "Clipperz/PM/UI/Web/Components/DataPanel.js",
                 "Clipperz/PM/UI/Web/Components/ToolsPanel.js",
                 "Clipperz/PM/UI/Web/Components/RulerComponent.js",
                 "Clipperz/PM/UI/Web/Components/CardDialogComponent.js",
                 "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js",
                 "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js",
                 "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js",
                 "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js",
                 "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js",
                 "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js",
                 "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js",
                 "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js",
                 "Clipperz/PM/UI/Web/Components/PasswordTooltip.js",
 
                 "Clipperz/PM/UI/Web/Controllers/MainController.js",
                 "Clipperz/PM/UI/Web/Controllers/LoginController.js",
                 "Clipperz/PM/UI/Web/Controllers/AppController.js",
                 "Clipperz/PM/UI/Web/Controllers/FilterController.js",
                 "Clipperz/PM/UI/Web/Controllers/GridController.js",
                 "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
+}