Giulio Cesare Solaroli
							
						 
					 | 
					
						
						
							
						
						1f9c30cdfb
					 | 
					
						
						
							
							Fixed minor issues reported by user after official release of /delta
						
						
						
						
						
						
					 | 
					
						2015-07-20 10:27:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Giulio Cesare Solaroli
							
						 
					 | 
					
						
						
							
						
						755df7d360
					 | 
					
						
						
							
							More fixes before /delta release
						
						
						
						
						
						
					 | 
					
						2015-07-05 09:09:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Giulio Cesare Solaroli
							
						 
					 | 
					
						
						
							
						
						e6d071a7c1
					 | 
					
						
						
							
							Final fixed before official /delta release
						
						
						
						
						
						
					 | 
					
						2015-07-04 18:43:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Giulio Cesare Solaroli
							
						 
					 | 
					
						
						
							
						
						e02ba2c20c
					 | 
					
						
						
							
							Merged all pending work done on the private repository
						
						
						
						
						
						
					 | 
					
						2015-06-27 19:08:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dario Chiappetta
							
						 
					 | 
					
						
						
							
						
						0126873868
					 | 
					
						
						
							
							Merged Import and Export branches, implemented Giulio's remarks on Import feature
						
						
						
						
						
						
					 | 
					
						2015-05-21 14:34:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dario Chiappetta
							
						 
					 | 
					
						
						
							
						
						d1d5fae5de
					 | 
					
						
						
							
							Added Import feature
						
						
						
						
						
						
					 | 
					
						2015-05-14 18:55:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Giulio Cesare Solaroli
							
						 
					 | 
					
						
						
							
						
						e329f6926a
					 | 
					
						
						
							
							Reviewed and improved export feature
						
						
						
						
						
						
					 | 
					
						2015-05-07 16:23:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dario Chiappetta
							
						 
					 | 
					
						
						
							
						
						b812ea4efb
					 | 
					
						
						
							
							Added Export feature
						
						
						
						
						
						
					 | 
					
						2015-04-20 18:18:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Giulio Cesare Solaroli
							
						 
					 | 
					
						
						
							
						
						edeb859746
					 | 
					
						
						
							
							Merged and cleaned-up features implemented by Dario
						
						
						
						
						
						
						
						- delete account
- change passphrase 
						
						
					 | 
					
						2015-04-14 11:07:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dario Chiappetta
							
						 
					 | 
					
						
						
							
						
						e2781071d0
					 | 
					
						
						
							
							Added Delete Account feature (no dev backend support yet) - fix
						
						
						
						
						
						
					 | 
					
						2015-04-14 10:44:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dario Chiappetta
							
						 
					 | 
					
						
						
							
						
						00ab234ed8
					 | 
					
						
						
							
							Added Delete Account feature (no dev backend support yet)
						
						
						
						
						
						
					 | 
					
						2015-04-14 10:36:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dario Chiappetta
							
						 
					 | 
					
						
						
							
						
						6377fab657
					 | 
					
						
						
							
							Fixed empty field bug on change passphrase
						
						
						
						
						
						
					 | 
					
						2015-04-03 19:03:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dario Chiappetta
							
						 
					 | 
					
						
						
							
						
						0863e61631
					 | 
					
						
						
							
							Added change passphrase logic in MainController
						
						
						
						
						
						
					 | 
					
						2015-04-03 16:03:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Giulio Cesare Solaroli
							
						 
					 | 
					
						
						
							
						
						b1de7de2c5
					 | 
					
						
						
							
							Added basic behaviour for extra panel components
						
						
						
						
						
						
					 | 
					
						2015-04-01 18:28:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |