1
0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-24 01:07:35 +02:00

Merged Import and Export branches, implemented Giulio's remarks on Import feature

This commit is contained in:
Dario Chiappetta
2015-05-21 14:32:51 +02:00
parent d1d5fae5de
commit 0126873868
43 changed files with 4494 additions and 1008 deletions

View File

@@ -5,8 +5,8 @@
"mochikit.commit": "6f26f745d5d915540aa0fc6c34fda24952891a9d",
"reactjs.repository": "https://github.com/facebook/react.git",
"reactjs.version": "0.11.0",
"reactjs.commit": "95d82cacd6e9cc6a2fe6366d79510cc9133886cb",
"reactjs.version": "0.13.1",
"reactjs.commit": "f308c03455f07ec1c7f422220b411ff1c3b024de",
"modernizr.repository": "https://github.com/Modernizr/Modernizr",
"modernizr.version": "2.8.2",
@@ -62,6 +62,9 @@
"-- Modernizr/modernizr-2.8.2.js",
"OnMediaQuery/onmediaquery-0.2.0.js",
"FileSaver/Blob.js",
"FileSaver/FileSaver.js",
"PapaParse/papaparse.js",
"-- PapaParse/papaparse.min.js",
@@ -177,9 +180,9 @@
"Clipperz/PM/UI/Components/ExtraFeatures/DevicePIN.js",
"Clipperz/PM/UI/Components/ExtraFeatures/Passphrase.js",
"Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js",
"Clipperz/PM/UI/Components/ExtraFeatures/Import.js",
"Clipperz/PM/UI/Components/ExtraFeatures/DataExport.js",
"Clipperz/PM/UI/Components/ExtraFeatures/DataImport.js",
"Clipperz/PM/UI/Components/ExtraFeatures/DataImport/StepsNavigation.js",
"Clipperz/PM/UI/Components/ExtraFeatures/DataImport/Input.js",
"Clipperz/PM/UI/Components/ExtraFeatures/DataImport/CsvColumns.js",
"Clipperz/PM/UI/Components/ExtraFeatures/DataImport/CsvLabels.js",
@@ -203,6 +206,9 @@
"Clipperz/PM/UI/MainController.js",
"-- Clipperz/PM/UI/MainDesktopController.js",
"Clipperz/PM/UI/DirectLoginController.js",
"Clipperz/PM/UI/ExportController.js",
"Clipperz/PM/UI/ImportController.js",
"Clipperz/PM/UI/ImportContext.js",
"main.js"
],