summaryrefslogtreecommitdiff
authorGiulio 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)
commit758bd68eee9c0ae1d3ad8dc50481c78557bd6228 (patch) (side-by-side diff)
tree42fe98603849248c0d3943fd1d79135a734811c9
parent288b8df03a499a2e68ebaad48e687d1eac9df0ff (diff)
parent12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (diff)
downloadclipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.zip
clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.gz
clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.bz2
Merge pull request #35 from gcsolaroli/master
Merged pull request #33
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/python/properties/python.properties.json4
-rw-r--r--frontend/beta/properties/beta.properties.json5
-rw-r--r--frontend/gamma/properties/gamma.properties.json2
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
@@ -1,187 +1,190 @@
{
"copyright.values": {
"mochikit.repository": "http://svn.mochikit.com/mochikit/trunk/",
"mochikit.version": "1249"
},
"html.template": "index_template.html",
"js": [
"MochiKit/Base.js",
"MochiKit/Iter.js",
"MochiKit/DOM.js",
"MochiKit/Style.js",
"MochiKit/Signal.js",
"MochiKit/Format.js",
"MochiKit/Async.js",
"MochiKit/Selector.js",
"MochiKit/Logging.js",
"MochiKit/LoggingPane.js",
"YUI/yahoo.js",
"YUI/animation.js",
"YUI/event.js",
"YUI/dom.js",
"YUI/dragdrop.js",
"YUI/logger.js",
"YUI-extensions/yutil.js",
"YUI-extensions/Bench.js",
"YUI-extensions/Date.js",
"YUI-extensions/DomHelper.js",
"YUI-extensions/Element.js",
"YUI-extensions/CompositeElement.js",
"YUI-extensions/State.js",
"YUI-extensions/EventManager.js",
"YUI-extensions/KeyMap.js",
"YUI-extensions/Layer.js",
"YUI-extensions/MixedCollection.js",
"YUI-extensions/State.js",
"YUI-extensions/UpdateManager.js",
"YUI-extensions/anim/Actor.js",
"YUI-extensions/anim/Animator.js",
"YUI-extensions/dd/Registry.js",
"YUI-extensions/dd/ScrollManager.js",
"YUI-extensions/dd/StatusProxy.js",
"YUI-extensions/layout/ContentPanels.js",
"YUI-extensions/layout/LayoutManager.js",
"YUI-extensions/layout/BorderLayout.js",
"YUI-extensions/layout/BasicLayoutRegion.js",
"YUI-extensions/layout/LayoutRegion.js",
"YUI-extensions/layout/LayoutStateManager.js",
"YUI-extensions/layout/SplitLayoutRegion.js",
"YUI-extensions/layout/BorderLayoutRegions.js",
"YUI-extensions/widgets/BasicDialog.js",
"YUI-extensions/widgets/Button.js",
"YUI-extensions/widgets/MessageBox.js",
"YUI-extensions/widgets/Resizable.js",
"YUI-extensions/widgets/SplitBar.js",
"YUI-extensions/widgets/TabPanel.js",
"YUI-extensions/widgets/TemplateView.js",
"YUI-extensions/widgets/Toolbar.js",
"YUI-extensions/widgets/InlineEditor.js",
"YUI-extensions/widgets/QuickTips.js",
"YUI-extensions/CSS.js",
"JSON/json2.js",
"Clipperz/ByteArray.js",
"Clipperz/Base.js",
"Clipperz/CSVProcessor.js",
"Clipperz/KeePassExportProcessor.js",
"Clipperz/Date.js",
"Clipperz/DOM.js",
"Clipperz/Signal.js",
"Clipperz/Style.js",
"Clipperz/Set.js",
"Clipperz/NotificationCenter.js",
"Clipperz/Crypto/SHA.js",
"Clipperz/Crypto/AES.js",
"Clipperz/Crypto/PRNG.js",
"Clipperz/Crypto/BigInt.js",
"Clipperz/Crypto/Base.js",
"Clipperz/Crypto/SRP.js",
"Clipperz/Crypto/RSA.js",
"Clipperz/PM/Strings/Strings_en-US.js",
"Clipperz/PM/Strings/Strings_it-IT.js",
"Clipperz/PM/Strings/Strings_pt-BR.js",
"Clipperz/PM/Strings/Strings_ja-JP.js",
"Clipperz/PM/Strings/Strings_zh-CN.js",
"Clipperz/PM/Strings/Strings_es-ES.js",
"Clipperz/PM/Strings/Strings_fr-FR.js",
"Clipperz/PM/Strings/Strings_ru-RU.js",
"Clipperz/PM/Strings.js",
"Clipperz/PM/Strings/MessagePanelConfigurations.js",
"Clipperz/PM/Date.js",
"Clipperz/PM/Components/BaseComponent.js",
"Clipperz/PM/Components/MessageBox.js",
"Clipperz/PM/Components/TextFormField.js",
"Clipperz/PM/Components/PasswordEntropyDisplay.js",
"Clipperz/PM/Components/PasswordGenerator.js",
"Clipperz/PM/Components/Panels/BasePanel.js",
"Clipperz/PM/Components/Panels/LoginPanel.js",
"Clipperz/PM/Components/Panels/MainPanel.js",
"Clipperz/PM/Components/Panels/AccountPanel.js",
"Clipperz/PM/Components/Panels/DataPanel.js",
"Clipperz/PM/Components/Panels/ContactsPanel.js",
"Clipperz/PM/Components/Panels/ToolsPanel.js",
"Clipperz/PM/Components/Panels/LogoutPanel.js",
"Clipperz/PM/Components/RecordDetail/MainComponent.js",
"Clipperz/PM/Components/RecordDetail/AbstractComponent.js",
"Clipperz/PM/Components/RecordDetail/HeaderComponent.js",
"Clipperz/PM/Components/RecordDetail/TitleComponent.js",
"Clipperz/PM/Components/RecordDetail/NotesComponent.js",
"Clipperz/PM/Components/RecordDetail/FieldComponent.js",
"Clipperz/PM/Components/RecordDetail/AbstractFieldSubComponent.js",
"Clipperz/PM/Components/RecordDetail/FieldButtonComponent.js",
"Clipperz/PM/Components/RecordDetail/FieldLabelComponent.js",
"Clipperz/PM/Components/RecordDetail/FieldDragHandler.js",
"Clipperz/PM/Components/RecordDetail/FieldValueComponent.js",
"Clipperz/PM/Components/RecordDetail/FieldTypeComponent.js",
"Clipperz/PM/Components/RecordDetail/DirectLoginsComponent.js",
"Clipperz/PM/Components/RecordDetail/DirectLoginComponent.js",
"Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js",
"Clipperz/PM/Components/RecordDetail/DirectLoginValueComponent.js",
"Clipperz/PM/Components/RecordDetail/CreationWizard.js",
"Clipperz/PM/Components/TabPanel/TabPanelController.js",
"Clipperz/PM/Components/Import/MainComponent.js",
"Clipperz/PM/Components/Import/GenericImportComponent.js",
"Clipperz/PM/Components/Import/CSVImportComponent.js",
"Clipperz/PM/Components/Import/CSVImport/CSVImportColumns.js",
"Clipperz/PM/Components/Import/CSVImport/CSVImportHeader.js",
"Clipperz/PM/Components/Import/CSVImport/CSVImportTitle.js",
"Clipperz/PM/Components/Import/CSVImport/CSVImportNotes.js",
"Clipperz/PM/Components/Import/CSVImport/CSVImportFields.js",
"Clipperz/PM/Components/Import/ExcelImportComponent.js",
"Clipperz/PM/Components/Import/PasswordPlusImportComponent.js",
"Clipperz/PM/Components/Import/ClipperzImportComponent.js",
"Clipperz/PM/Components/Import/RoboFormImportComponent.js",
"Clipperz/PM/Components/Import/KeePassImportComponent.js",
"Clipperz/PM/Components/Printing/Header.js",
"Clipperz/PM/Components/Printing/Record.js",
"Clipperz/PM/Components/Printing/Footer.js",
"Clipperz/PM/Components/OTP/MainComponent.js",
"Clipperz/PM/Components/Compact/CompactHeader.js",
"Clipperz/PM/Components/Compact/LoginForm.js",
"Clipperz/PM/Components/Compact/CompactInterface.js",
"Clipperz/PM/Toll.js",
"Clipperz/PM/Proxy.js",
"Clipperz/PM/Proxy/Proxy.JSON.js",
"Clipperz/PM/Proxy/Proxy.Offline.js",
"Clipperz/PM/Proxy/Proxy.Offline.DataStore.js",
"Clipperz/PM/Connection.js",
"Clipperz/PM/Crypto.js",
"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
@@ -1,191 +1,191 @@
{
"copyright.values": {
"mochikit.repository": "https://github.com/mochi/mochikit.git",
"mochikit.version": "fe8d17bb9ac0a4e5ad4a8d5c2c94a6fac1c92d75"
},
"html.template": "index_template.html",
"js": [
"MochiKit/Base.js",
"MochiKit/Iter.js",
"MochiKit/Logging.js",
"-- MochiKit/DateTime.js",
"MochiKit/Format.js",
"MochiKit/Async.js",
"MochiKit/DOM.js",
"MochiKit/Style.js",
"MochiKit/LoggingPane.js",
"MochiKit/Color.js",
"MochiKit/Signal.js",
"MochiKit/Position.js",
"MochiKit/Selector.js",
"MochiKit/Visual.js",
"JSON/json2.js",
"Clipperz/YUI/Utils.js",
"Clipperz/YUI/DomHelper.js",
"Clipperz/ByteArray.js",
"Clipperz/Base.js",
"Clipperz/Async.js",
"Clipperz/CSVProcessor.js",
"Clipperz/KeePassExportProcessor.js",
"Clipperz/Date.js",
"Clipperz/DOM.js",
"Clipperz/Logging.js",
"Clipperz/Signal.js",
"Clipperz/Style.js",
"Clipperz/Visual.js",
"Clipperz/Set.js",
"-- Clipperz/Profile.js",
"Clipperz/KeyValueObjectStore.js",
"Clipperz/Crypto/SHA.js",
"Clipperz/Crypto/AES.js",
"Clipperz/Crypto/PRNG.js",
"Clipperz/Crypto/BigInt.js",
"Clipperz/Crypto/Base.js",
"Clipperz/Crypto/SRP.js",
"Clipperz/Crypto/RSA.js",
"Clipperz/PM/Strings/Strings_defaults.js",
"Clipperz/PM/Strings/Strings_en-US.js",
"-- # Clipperz/PM/Strings/Strings_en-GB.js",
"-- # Clipperz/PM/Strings/Strings_en-CA.js",
"-- Clipperz/PM/Strings/Strings_it-IT.js",
"-- Clipperz/PM/Strings/Strings_pt-BR.js",
"-- # Clipperz/PM/Strings/Strings_pt-PT.js",
"-- Clipperz/PM/Strings/Strings_ja-JP.js",
"-- Clipperz/PM/Strings/Strings_zh-CN.js",
"-- Clipperz/PM/Strings/Strings_es-ES.js",
"-- Clipperz/PM/Strings/Strings_fr-FR.js",
"-- # Clipperz/PM/Strings/Strings_de-DE.js",
"-- # Clipperz/PM/Strings/Strings_el-GR.js",
"-- # Clipperz/PM/Strings/Strings_ru-RU.js",
"-- # Clipperz/PM/Strings/Strings_he-IL.js",
"Clipperz/PM/Strings.js",
"-- Clipperz/PM/Strings/MessagePanelConfigurations.js",
"Clipperz/PM/Date.js",
"Clipperz/PM/Toll.js",
"Clipperz/PM/Proxy.js",
"Clipperz/PM/Proxy/Proxy.JSON.js",
"Clipperz/PM/Proxy/Proxy.Offline.js",
"Clipperz/PM/Proxy/Proxy.Offline.DataStore.js",
"Clipperz/PM/Connection.js",
"Clipperz/PM/Crypto.js",
"Clipperz/PM/BookmarkletProcessor.js",
"Clipperz/PM/DataModel/EncryptedRemoteObject.js",
"Clipperz/PM/DataModel/User.js",
"Clipperz/PM/DataModel/User.Header.Legacy.js",
"Clipperz/PM/DataModel/User.Header.RecordIndex.js",
"Clipperz/PM/DataModel/User.Header.Preferences.js",
"Clipperz/PM/DataModel/User.Header.OneTimePasswords.js",
"Clipperz/PM/DataModel/Record.js",
"Clipperz/PM/DataModel/Record.Version.js",
"Clipperz/PM/DataModel/Record.Version.Field.js",
"Clipperz/PM/DataModel/DirectLogin.js",
"Clipperz/PM/DataModel/DirectLoginInput.js",
"Clipperz/PM/DataModel/DirectLoginBinding.js",
"Clipperz/PM/DataModel/DirectLoginFormValue.js",
"Clipperz/PM/DataModel/OneTimePassword.js",
"Clipperz/PM/UI/Canvas/Marks/exclamationMark.js",
"Clipperz/PM/UI/Canvas/Marks/questionMark.js",
"Clipperz/PM/UI/Canvas/Marks/info.js",
"Clipperz/PM/UI/Canvas/Features/store.js",
"Clipperz/PM/UI/Canvas/Features/protect.js",
"Clipperz/PM/UI/Canvas/Features/directLogin.js",
"Clipperz/PM/UI/Canvas/Features/share.js",
"Clipperz/PM/UI/Canvas/Star/normal.js",
"Clipperz/PM/UI/Canvas/CoverActions/look.js",
"Clipperz/PM/UI/Canvas/CoverActions/download.js",
"Clipperz/PM/UI/Canvas/Tips/open.js",
"Clipperz/PM/UI/Canvas/Tips/close.js",
"Clipperz/PM/UI/Canvas/RegisterButton/normal.js",
"Clipperz/PM/UI/Canvas/Logo/normal.js",
"Clipperz/PM/UI/Canvas/GraphicFunctions.js",
"Clipperz/PM/UI/Common/Components/BaseComponent.js",
"Clipperz/PM/UI/Common/Components/Button.js",
"Clipperz/PM/UI/Common/Components/ComponentSlot.js",
"Clipperz/PM/UI/Common/Components/FaviconComponent.js",
"Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js",
"Clipperz/PM/UI/Common/Components/ProgressBar.js",
"Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js",
"Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js",
"Clipperz/PM/UI/Common/Components/TabPanelComponent.js",
"Clipperz/PM/UI/Common/Components/Tooltip.js",
"Clipperz/PM/UI/Common/Components/TranslatorWidget.js",
"Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js",
"Clipperz/PM/UI/Common/Controllers/ProgressBarController.js",
"Clipperz/PM/UI/Common/Controllers/TabPanelController.js",
"Clipperz/PM/UI/Common/Controllers/WizardController.js",
"Clipperz/PM/UI/Web/Components/Page.js",
"Clipperz/PM/UI/Web/Components/PageHeader.js",
"Clipperz/PM/UI/Web/Components/PageFooter.js",
"Clipperz/PM/UI/Web/Components/LoginPage.js",
"Clipperz/PM/UI/Web/Components/LoginForm.js",
"Clipperz/PM/UI/Web/Components/LoginProgress.js",
"Clipperz/PM/UI/Web/Components/AppPage.js",
"Clipperz/PM/UI/Web/Components/UserInfoBox.js",
"Clipperz/PM/UI/Web/Components/TabSidePanel.js",
"Clipperz/PM/UI/Web/Components/GridComponent.js",
"Clipperz/PM/UI/Web/Components/ColumnManager.js",
"Clipperz/PM/UI/Web/Components/TextColumnManager.js",
"Clipperz/PM/UI/Web/Components/FaviconColumnManager.js",
"Clipperz/PM/UI/Web/Components/ImageColumnManager.js",
"Clipperz/PM/UI/Web/Components/DateColumnManager.js",
"Clipperz/PM/UI/Web/Components/LinkColumnManager.js",
"Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js",
"Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js",
"Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js",
"Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js",
"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
+}