clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-01-25 18:11:31 +01:00
Code Issues Releases Wiki Activity
password-manager-mirror/frontend/delta/js/Clipperz/PM/UI
History
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
..
Components
Merge remote-tracking branch 'clipperz/export' into import
2015-06-27 18:33:01 +02:00
Components.js
Updated to React 13.1
2015-03-23 18:10:09 +01:00
DirectLoginController.js
updated copyright statements
2015-03-09 15:45:35 +01:00
ExportController.js
Merged Import and Export branches, implemented Giulio's remarks on Import feature
2015-05-21 14:34:49 +02:00
ImportContext.js
Merged Import and Export branches, implemented Giulio's remarks on Import feature
2015-05-21 14:34:49 +02:00
MainController.js
Merge remote-tracking branch 'clipperz/export' into import
2015-06-27 18:33:01 +02:00