WolFi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bd92aec77 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'fix_486' into feature/merges_v2.2.0  
							
							
							
						 
						
							2018-12-17 21:11:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									WolFi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1e0ec7a76 
								
							 
						 
						
							
							
								
								Merge branch 'feature/noid/iconpickersearch' into feature/merges_v2.2.0  
							
							
							
						 
						
							2018-12-16 14:07:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									WolFi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f23c9e36a0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/noid/iconpickersearch  
							
							
							
						 
						
							2018-12-16 14:07:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									WolFi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f00a9dc30 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/fix_486' into feature/merges_v2.2.0  
							
							
							
						 
						
							2018-12-16 13:01:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									WolFi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5643d9c318 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/fix_layout_for_14' into feature/merges_v2.2.0  
							
							
							
						 
						
							2018-12-16 12:36:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fnuesse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c019a4ebe8 
								
							 
						 
						
							
							
								
								Improved performance by only getting the correct credential instead of full list  
							
							... 
							
							
							
							Signed-off-by: fnuesse <felix.nuesse@t-online.de> 
							
						 
						
							2018-12-16 12:32:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fnuesse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea1c107236 
								
							 
						 
						
							
							
								
								added label to custom icon-upload  
							
							... 
							
							
							
							Signed-off-by: fnuesse <felix.nuesse@t-online.de> 
							
						 
						
							2018-12-16 12:12:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fnuesse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67fbba1a84 
								
							 
						 
						
							
							
								
								implemented search in icon-picker  
							
							... 
							
							
							
							Signed-off-by: fnuesse <felix.nuesse@t-online.de> 
							
						 
						
							2018-12-15 13:05:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rakekniven 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								721da338d5 
								
							 
						 
						
							
							
								
								l10n: changed grammar for keys  
							
							... 
							
							
							
							Reported at Transifex.
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de> 
							
						 
						
							2018-12-09 18:25:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Felix Nüsse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea23930352 
								
							 
						 
						
							
							
								
								Added proper returnvalue to updatemethod of credentials and add the resulting value to the list if it does not exist or replace it if it exists  
							
							... 
							
							
							
							Fixed Nullpointer on listadd
Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de> 
							
						 
						
							2018-11-23 20:07:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fnuesse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce138267d2 
								
							 
						 
						
							
							
								
								Added decryption to proper credentialelement after creating a new credential  
							
							... 
							
							
							
							Signed-off-by: fnuesse <felix.nuesse@t-online.de> 
							
						 
						
							2018-11-23 01:29:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fnuesse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e73ba9c09c 
								
							 
						 
						
							
							
								
								Added empty search result message  
							
							... 
							
							
							
							Signed-off-by: fnuesse <felix.nuesse@t-online.de> 
							
						 
						
							2018-11-21 17:34:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fnuesse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc4d849a0a 
								
							 
						 
						
							
							
								
								added hint that the selected tags dont match any credentials  
							
							... 
							
							
							
							Signed-off-by: fnuesse <felix.nuesse@t-online.de> 
							
						 
						
							2018-11-21 17:34:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fnuesse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c109bad869 
								
							 
						 
						
							
							
								
								Added Translationstrings properly  
							
							... 
							
							
							
							Signed-off-by: fnuesse <felix.nuesse@t-online.de> 
							
						 
						
							2018-11-21 17:34:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Allan Nordhøy 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65c1408909 
								
							 
						 
						
							
							
								
								into vault, insufficient, unlabeled, "Share"  
							
							
							
						 
						
							2018-04-07 04:46:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								95980fb876 
								
							 
						 
						
							
							
								
								Reprase string. Ref  #396  
							
							
							
						 
						
							2017-11-07 23:03:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c5ba4abfa 
								
							 
						 
						
							
							
								
								Specify default icon mime type  
							
							
							
						 
						
							2017-10-29 14:41:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ed525e4b1 
								
							 
						 
						
							
							
								
								Make use of icon groups  
							
							
							
						 
						
							2017-10-29 14:14:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2c4d613d8 
								
							 
						 
						
							
							
								
								Add icons to credentials  
							
							
							
						 
						
							2017-10-29 13:31:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Barendregt (Msc.) 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								87f361ca7c 
								
							 
						 
						
							
							
								
								Fixes   #238  - @brantje own solution  
							
							
							
						 
						
							2017-10-16 22:41:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								120a168b91 
								
							 
						 
						
							
							
								
								Merge comradekingu-patch-2 and sign  
							
							
							
						 
						
							2017-07-12 19:48:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joas Schilling 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4179d43f5 
								
							 
						 
						
							
							
								
								Fix translations  
							
							... 
							
							
							
							Signed-off-by: Joas Schilling <coding@schilljs.com> 
							
						 
						
							2017-05-06 13:32:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61e07f598c 
								
							 
						 
						
							
							
								
								Update translation. Closes PR  #284 .  
							
							
							
						 
						
							2017-05-06 13:32:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8a694a0885 
								
							 
						 
						
							
							
								
								Disable database test. Fix tests.  
							
							
							
						 
						
							2017-05-06 13:32:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ccb84a600 
								
							 
						 
						
							
							
								
								Merge message parts.  Fixes   #287  
							
							
							
						 
						
							2017-05-06 13:32:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acedaf1535 
								
							 
						 
						
							
							
								
								Code style fixes  
							
							
							
						 
						
							2017-02-22 18:02:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33d1a5db01 
								
							 
						 
						
							
							
								
								Small fixes  
							
							
							
						 
						
							2017-02-22 18:02:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fd8dcc6c1c 
								
							 
						 
						
							
							
								
								Add feature to request vault destructions  
							
							
							
						 
						
							2017-02-22 18:02:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								514cb569fb 
								
							 
						 
						
							
							
								
								Add feature to move vaults to other account  
							
							
							
						 
						
							2017-02-22 18:02:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e7f47a715 
								
							 
						 
						
							
							
								
								Add a generic CSV importer  
							
							
							
						 
						
							2017-02-22 18:02:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dca12aee07 
								
							 
						 
						
							
							
								
								Fix Call to a member function getId() on array ( Fixes   #252 )  
							
							
							
						 
						
							2017-02-22 18:02:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6767322a22 
								
							 
						 
						
							
							
								
								Lock vault after 3 wrong attempts ( Fixes   #197 )  
							
							... 
							
							
							
							Fix share button, fix shared_key not added to storedCredential after sharing (Fixes  #249 )
    Add password app importer. Fixes  #248 
    Fix version check via proxy. Fixes  #237 
    Fix activity app not filtering. Fixes  #246 
    Add EnPass txt importer. Fixes  #159 
    Fix for disabled share button
    Require vault key for export. Fixes  #199 
    Indicate that sharing only works with users that have 1 or more vaults.
    Fixes  #242 
    Reset tags on logout. Fixes  #245 
    Ability to enter OTP secret manually. Fixes  #198 
    Create teampass importer. Fixes  #244  
							
						 
						
							2017-02-17 21:25:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9c35282f89 
								
							 
						 
						
							
							
								
								Small fixes for 2.0.1  
							
							... 
							
							
							
							Fix for going back from deleted credentials
Use method 
							
						 
						
							2017-02-06 12:17:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39bd0d8b20 
								
							 
						 
						
							
							
								
								Fix OTP not working  
							
							... 
							
							
							
							Fix [Object object] for file fields.
Add a copy icon to share link
Signed-off-by: brantje <brantje@gmail.com> 
							
						 
						
							2017-01-29 15:00:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d509bbd160 
								
							 
						 
						
							
							
								
								Fix cors headers  
							
							
							
						 
						
							2017-01-19 13:39:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								612dcd355b 
								
							 
						 
						
							
							
								
								Fix missing admin-settings.js  
							
							... 
							
							
							
							Remove settings property (Fixes  #211 )
Add file to avoid errors (Fixes  #210 )
Fix for deleting credential
Fix for deleting vault (fixes  #212 ) 
							
						 
						
							2017-01-18 19:08:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8ae7e0bda 
								
							 
						 
						
							
							
								
								Implement delete vault  
							
							
							
						 
						
							2017-01-12 00:17:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								331eda72ff 
								
							 
						 
						
							
							
								
								Clean up when a credential is deleted  
							
							
							
						 
						
							2017-01-11 21:25:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5f7661659a 
								
							 
						 
						
							
							
								
								Adjust reviewed code  
							
							
							
						 
						
							2017-01-11 20:06:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f4afba34f 
								
							 
						 
						
							
							
								
								Fixes  
							
							
							
						 
						
							2017-01-11 18:09:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								734496ebcc 
								
							 
						 
						
							
							
								
								Implement encryption class  
							
							
							
						 
						
							2017-01-11 18:09:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c82b795e2 
								
							 
						 
						
							
							
								
								Add vault logout timer  
							
							
							
						 
						
							2017-01-09 13:54:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0e00c5704 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'EdOverflow/hash_equals'  
							
							
							
						 
						
							2017-01-06 19:38:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Davis 
								
							 
						 
						
							
							
							
							
								
							
							
								45590f745c 
								
							 
						 
						
							
							
								
								Translation text  
							
							
							
						 
						
							2017-01-06 17:39:47 +05:45 
							
								 
							
						 
					 
				
					
						
							
								
								
									EdOverflow 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf59eee98c 
								
							 
						 
						
							
							
								
								Add hash_equals  
							
							
							
						 
						
							2017-01-04 16:59:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ac3db47232 
								
							 
						 
						
							
							
								
								Fixes for errors found by tests  
							
							
							
						 
						
							2017-01-04 11:55:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f30f986d60 
								
							 
						 
						
							
							
								
								Fix if statements  
							
							
							
						 
						
							2017-01-03 21:33:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a224ce4af9 
								
							 
						 
						
							
							
								
								Implement middleware for sharing  
							
							... 
							
							
							
							Check if sharing is enabled, if not return an empty array.
Signed-off-by: brantje <brantje@gmail.com> 
							
						 
						
							2016-12-30 15:47:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									brantje 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bb1839184 
								
							 
						 
						
							
							
								
								Refactor settings, create SettingsService  
							
							... 
							
							
							
							Fix settings not working in ownCloud
Signed-off-by: brantje <brantje@gmail.com> 
							
						 
						
							2016-12-30 13:37:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rakekniven 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								392a52e798 
								
							 
						 
						
							
							
								
								Update translationcontroller.php  
							
							... 
							
							
							
							Fixed typo 
							
						 
						
							2016-12-29 12:37:46 +01:00