author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 21:28:40 (UTC) |
commit | 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (patch) (unidiff) | |
tree | 42fe98603849248c0d3943fd1d79135a734811c9 /frontend | |
parent | 25029b943781850c76fbf43827af0204f35a98bf (diff) | |
parent | d791e1df1f701c1fe523f05a8521c4ad1cf032b5 (diff) | |
download | clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.zip clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.gz clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.bz2 |
Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts:
frontend/gamma/properties/gamma.properties.json
-rw-r--r-- | frontend/beta/properties/beta.properties.json | 5 | ||||
-rw-r--r-- | frontend/gamma/properties/gamma.properties.json | 2 |
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 | |||
@@ -138,50 +138,53 @@ | |||
138 | "Clipperz/PM/Components/Import/RoboFormImportComponent.js", | 138 | "Clipperz/PM/Components/Import/RoboFormImportComponent.js", |
139 | "Clipperz/PM/Components/Import/KeePassImportComponent.js", | 139 | "Clipperz/PM/Components/Import/KeePassImportComponent.js", |
140 | "Clipperz/PM/Components/Printing/Header.js", | 140 | "Clipperz/PM/Components/Printing/Header.js", |
141 | "Clipperz/PM/Components/Printing/Record.js", | 141 | "Clipperz/PM/Components/Printing/Record.js", |
142 | "Clipperz/PM/Components/Printing/Footer.js", | 142 | "Clipperz/PM/Components/Printing/Footer.js", |
143 | "Clipperz/PM/Components/OTP/MainComponent.js", | 143 | "Clipperz/PM/Components/OTP/MainComponent.js", |
144 | "Clipperz/PM/Components/Compact/CompactHeader.js", | 144 | "Clipperz/PM/Components/Compact/CompactHeader.js", |
145 | "Clipperz/PM/Components/Compact/LoginForm.js", | 145 | "Clipperz/PM/Components/Compact/LoginForm.js", |
146 | "Clipperz/PM/Components/Compact/CompactInterface.js", | 146 | "Clipperz/PM/Components/Compact/CompactInterface.js", |
147 | "Clipperz/PM/Toll.js", | 147 | "Clipperz/PM/Toll.js", |
148 | "Clipperz/PM/Proxy.js", | 148 | "Clipperz/PM/Proxy.js", |
149 | "Clipperz/PM/Proxy/Proxy.JSON.js", | 149 | "Clipperz/PM/Proxy/Proxy.JSON.js", |
150 | "Clipperz/PM/Proxy/Proxy.Offline.js", | 150 | "Clipperz/PM/Proxy/Proxy.Offline.js", |
151 | "Clipperz/PM/Proxy/Proxy.Offline.DataStore.js", | 151 | "Clipperz/PM/Proxy/Proxy.Offline.DataStore.js", |
152 | "Clipperz/PM/Connection.js", | 152 | "Clipperz/PM/Connection.js", |
153 | "Clipperz/PM/Crypto.js", | 153 | "Clipperz/PM/Crypto.js", |
154 | "Clipperz/PM/BookmarkletProcessor.js", | 154 | "Clipperz/PM/BookmarkletProcessor.js", |
155 | "Clipperz/PM/DataModel/User.js", | 155 | "Clipperz/PM/DataModel/User.js", |
156 | "Clipperz/PM/DataModel/UserPreferences.js", | 156 | "Clipperz/PM/DataModel/UserPreferences.js", |
157 | "Clipperz/PM/DataModel/Header.js", | 157 | "Clipperz/PM/DataModel/Header.js", |
158 | "Clipperz/PM/DataModel/Statistics.js", | 158 | "Clipperz/PM/DataModel/Statistics.js", |
159 | "Clipperz/PM/DataModel/Record.js", | 159 | "Clipperz/PM/DataModel/Record.js", |
160 | "Clipperz/PM/DataModel/RecordField.js", | 160 | "Clipperz/PM/DataModel/RecordField.js", |
161 | "Clipperz/PM/DataModel/RecordVersion.js", | 161 | "Clipperz/PM/DataModel/RecordVersion.js", |
162 | "Clipperz/PM/DataModel/DirectLogin.js", | 162 | "Clipperz/PM/DataModel/DirectLogin.js", |
163 | "Clipperz/PM/DataModel/DirectLoginReference.js", | 163 | "Clipperz/PM/DataModel/DirectLoginReference.js", |
164 | "Clipperz/PM/DataModel/DirectLoginInput.js", | 164 | "Clipperz/PM/DataModel/DirectLoginInput.js", |
165 | "Clipperz/PM/DataModel/DirectLoginBinding.js", | 165 | "Clipperz/PM/DataModel/DirectLoginBinding.js", |
166 | "Clipperz/PM/DataModel/OneTimePasswordManager.js", | 166 | "Clipperz/PM/DataModel/OneTimePasswordManager.js", |
167 | "Clipperz/PM/DataModel/OneTimePassword.js", | 167 | "Clipperz/PM/DataModel/OneTimePassword.js", |
168 | "Clipperz/YUI/IBLayoutManager.js", | 168 | "Clipperz/YUI/IBLayoutManager.js", |
169 | "Clipperz/YUI/IBLayoutRegion.js", | 169 | "Clipperz/YUI/IBLayoutRegion.js", |
170 | "Clipperz/YUI/Drawer.js", | 170 | "Clipperz/YUI/Drawer.js", |
171 | "Clipperz/YUI/Collapser.js", | 171 | "Clipperz/YUI/Collapser.js", |
172 | "Clipperz/YUI/MessageBox.js", | 172 | "Clipperz/YUI/MessageBox.js", |
173 | "Clipperz/YUI/DomHelper.js", | 173 | "Clipperz/YUI/DomHelper.js", |
174 | 174 | ||
175 | "Clipperz/PM/Main.js" | 175 | "Clipperz/PM/Main.js" |
176 | ], | 176 | ], |
177 | 177 | ||
178 | "css": [ | 178 | "css": [ |
179 | "yui-extensions/reset-min.css", | 179 | "yui-extensions/reset-min.css", |
180 | "yui-extensions/core.css", | 180 | "yui-extensions/core.css", |
181 | "yui-extensions/basic-dialog.css", | 181 | "yui-extensions/basic-dialog.css", |
182 | "yui-extensions/button.css", | 182 | "yui-extensions/button.css", |
183 | "clipperz/clipperz.css", | 183 | "clipperz/clipperz.css", |
184 | "clipperz/compact.css", | 184 | "clipperz/compact.css", |
185 | "clipperz/ytheme-clipperz.css" | 185 | "clipperz/ytheme-clipperz.css" |
186 | ] | 186 | ], |
187 | |||
188 | "html.template": "index_template.html" | ||
189 | |||
187 | } | 190 | } |
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 | |||
@@ -143,49 +143,49 @@ | |||
143 | "Clipperz/PM/UI/Web/Components/AppPage.js", | 143 | "Clipperz/PM/UI/Web/Components/AppPage.js", |
144 | "Clipperz/PM/UI/Web/Components/UserInfoBox.js", | 144 | "Clipperz/PM/UI/Web/Components/UserInfoBox.js", |
145 | "Clipperz/PM/UI/Web/Components/TabSidePanel.js", | 145 | "Clipperz/PM/UI/Web/Components/TabSidePanel.js", |
146 | "Clipperz/PM/UI/Web/Components/GridComponent.js", | 146 | "Clipperz/PM/UI/Web/Components/GridComponent.js", |
147 | 147 | ||
148 | "Clipperz/PM/UI/Web/Components/ColumnManager.js", | 148 | "Clipperz/PM/UI/Web/Components/ColumnManager.js", |
149 | "Clipperz/PM/UI/Web/Components/TextColumnManager.js", | 149 | "Clipperz/PM/UI/Web/Components/TextColumnManager.js", |
150 | "Clipperz/PM/UI/Web/Components/FaviconColumnManager.js", | 150 | "Clipperz/PM/UI/Web/Components/FaviconColumnManager.js", |
151 | "Clipperz/PM/UI/Web/Components/ImageColumnManager.js", | 151 | "Clipperz/PM/UI/Web/Components/ImageColumnManager.js", |
152 | "Clipperz/PM/UI/Web/Components/DateColumnManager.js", | 152 | "Clipperz/PM/UI/Web/Components/DateColumnManager.js", |
153 | "Clipperz/PM/UI/Web/Components/LinkColumnManager.js", | 153 | "Clipperz/PM/UI/Web/Components/LinkColumnManager.js", |
154 | "Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js", | 154 | "Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js", |
155 | "Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js", | 155 | "Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js", |
156 | "Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js", | 156 | "Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js", |
157 | "Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js", | 157 | "Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js", |
158 | 158 | ||
159 | "Clipperz/PM/UI/Web/Components/AccountPanel.js", | 159 | "Clipperz/PM/UI/Web/Components/AccountPanel.js", |
160 | "Clipperz/PM/UI/Web/Components/DataPanel.js", | 160 | "Clipperz/PM/UI/Web/Components/DataPanel.js", |
161 | "Clipperz/PM/UI/Web/Components/ToolsPanel.js", | 161 | "Clipperz/PM/UI/Web/Components/ToolsPanel.js", |
162 | "Clipperz/PM/UI/Web/Components/RulerComponent.js", | 162 | "Clipperz/PM/UI/Web/Components/RulerComponent.js", |
163 | "Clipperz/PM/UI/Web/Components/CardDialogComponent.js", | 163 | "Clipperz/PM/UI/Web/Components/CardDialogComponent.js", |
164 | "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js", | 164 | "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js", |
165 | "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js", | 165 | "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js", |
166 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js", | 166 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js", |
167 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js", | 167 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js", |
168 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js", | 168 | "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js", |
169 | "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js", | 169 | "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js", |
170 | "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js", | 170 | "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js", |
171 | "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js", | 171 | "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js", |
172 | "Clipperz/PM/UI/Web/Components/PasswordTooltip.js", | 172 | "Clipperz/PM/UI/Web/Components/PasswordTooltip.js", |
173 | 173 | ||
174 | "Clipperz/PM/UI/Web/Controllers/MainController.js", | 174 | "Clipperz/PM/UI/Web/Controllers/MainController.js", |
175 | "Clipperz/PM/UI/Web/Controllers/LoginController.js", | 175 | "Clipperz/PM/UI/Web/Controllers/LoginController.js", |
176 | "Clipperz/PM/UI/Web/Controllers/AppController.js", | 176 | "Clipperz/PM/UI/Web/Controllers/AppController.js", |
177 | "Clipperz/PM/UI/Web/Controllers/FilterController.js", | 177 | "Clipperz/PM/UI/Web/Controllers/FilterController.js", |
178 | "Clipperz/PM/UI/Web/Controllers/GridController.js", | 178 | "Clipperz/PM/UI/Web/Controllers/GridController.js", |
179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", | 179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", |
180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", | 180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", |
181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", | 181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", |
182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", | 182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", |
183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", | 183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", |
184 | 184 | ||
185 | "main.js" | 185 | "main.js" |
186 | ], | 186 | ], |
187 | 187 | ||
188 | "css": [ | 188 | "css": [ |
189 | "web.css" | 189 | "web.css" |
190 | ] | 190 | ] |
191 | } \ No newline at end of file | 191 | } |