password-manager/frontend/delta/js/Clipperz/PM/DataModel
Giulio Cesare Solaroli 75d5724c8a Merge remote-tracking branch 'clipperz/export' into import
Conflicts:
	frontend/delta/css/clipperz.css
	frontend/delta/js/Clipperz/PM/DataModel/Record.js
	frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js
	frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js
	frontend/delta/js/Clipperz/PM/UI/MainController.js
	frontend/delta/properties/delta.properties.json
	frontend/delta/scss/style/settingsPanel.scss
2015-06-27 18:33:01 +02:00
..
DevicePreferences.js updated copyright statements 2015-03-09 15:45:35 +01:00
DirectLogin.js Merged Import and Export branches, implemented Giulio's remarks on Import feature 2015-05-21 14:34:49 +02:00
DirectLoginBinding.js updated copyright statements 2015-03-09 15:45:35 +01:00
DirectLoginFormValue.js updated copyright statements 2015-03-09 15:45:35 +01:00
DirectLoginInput.js updated copyright statements 2015-03-09 15:45:35 +01:00
EncryptedRemoteObject.js updated copyright statements 2015-03-09 15:45:35 +01:00
Feature.js Added a few more files to the project 2015-03-10 22:54:46 +01:00
OneTimePassword.js Added semicolon to fix install build 2015-03-11 18:25:29 +01:00
Record.js Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
Record.Version.Field.js Fixed a minor issue with the implementation of Field.isEmpty method 2015-03-22 22:38:54 +01:00
Record.Version.js Merged Import and Export branches, implemented Giulio's remarks on Import feature 2015-05-21 14:34:49 +02:00
User.AccountInfo.js updated copyright statements 2015-03-09 15:45:35 +01:00
User.Header.Legacy.js updated copyright statements 2015-03-09 15:45:35 +01:00
User.Header.OneTimePasswords.js updated copyright statements 2015-03-09 15:45:35 +01:00
User.Header.Preferences.js updated copyright statements 2015-03-09 15:45:35 +01:00
User.Header.RecordIndex.js updated copyright statements 2015-03-09 15:45:35 +01:00
User.js Merged Import and Export branches, implemented Giulio's remarks on Import feature 2015-05-21 14:34:49 +02:00