password-manager/frontend/delta/js/Clipperz/PM/UI/Components
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
..
Cards Updated to React 13.1 2015-03-23 18:10:09 +01:00
ExtraFeatures Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
Pages Added Delete Account feature (no dev backend support yet) - fix 2015-04-14 10:44:23 +02:00
Panels Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
AccountStatus.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
Button.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
CardToolbar.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
Checkbox.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
DialogBox.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
ExpiredPanel.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
MessageBox.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
Overlay.js Merged Import and Export branches, implemented Giulio's remarks on Import feature 2015-05-21 14:34:49 +02:00
Selections.js Updated to React 13.1 2015-03-23 18:10:09 +01:00
TagIndexItem.js Updated to React 13.1 2015-03-23 18:10:09 +01:00