26f28254a0 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						... 
						
						
						
						# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit. 
						
						
					 
					
						2018-01-24 09:48:35 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						460e74a584 
					 
					
						
						
							
							DEV: add estonian translation  
						
						
						
						
					 
					
						2018-01-24 09:46:11 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0362c9bc04 
					 
					
						
						
							
							Document the maxPasswordAge config parameter  #102  
						
						
						
						
					 
					
						2018-01-23 06:01:43 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ad0c6c86ba 
					 
					
						
						
							
							Password age check filter  #102  
						
						
						
						
					 
					
						2018-01-23 06:01:39 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5484074d8e 
					 
					
						
						
							
							Enforce password change event only if set  #102  
						
						
						
						
					 
					
						2018-01-23 05:15:01 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7c68c9af0e 
					 
					
						
						
							
							Merge pull request  #133  from phiurs/bug-usersearch  
						
						... 
						
						
						
						Fix user search returning no results in admin page 
						
						
					 
					
						2018-01-22 14:04:57 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1729a1f97a 
					 
					
						
						
							
							Update CHANGELOG.md  
						
						
						
						
					 
					
						2018-01-22 10:36:08 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4244f1cdb3 
					 
					
						
						
							
							Fix user search returning no results in admin page  
						
						
						
						
					 
					
						2018-01-17 15:51:17 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bf89beff4e 
					 
					
						
						
							
							Merge pull request  #129  from Szykar/typos  
						
						... 
						
						
						
						social-network-authentication.md typo fix 
						
						
					 
					
						2017-12-19 17:09:07 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						927ba821c6 
					 
					
						
						
							
							social-network-authentication.md typo fix  
						
						
						
						
					 
					
						2017-12-19 16:16:32 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						da760de01e 
					 
					
						
						
							
							Merge pull request  #128  from faenir/master  
						
						... 
						
						
						
						Fix for #125  
						
						
					 
					
						2017-12-12 20:00:14 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4dc6c2f4cd 
					 
					
						
						
							
							Update changelog  
						
						
						
						
					 
					
						2017-12-12 13:24:30 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2e3673ff07 
					 
					
						
						
							
							Check is user found or not.  
						
						
						
						
					 
					
						2017-12-11 13:15:26 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						067862cee7 
					 
					
						
						
							
							Fix validation ( #125 ).  
						
						
						
						
					 
					
						2017-12-11 13:14:36 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3e281d7a22 
					 
					
						
						
							
							Merge pull request  #127  from Eseperio/patch-1  
						
						... 
						
						
						
						Mispelling 
						
						
					 
					
						2017-12-08 18:11:43 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						483a3253ff 
					 
					
						
						
							
							Mispelling  
						
						... 
						
						
						
						Also formal and informal ways were mixed in the same phrase. 
						
						
					 
					
						2017-12-08 18:00:48 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f0915a284a 
					 
					
						
						
							
							Update CHANGELOG.md  
						
						
						
						
					 
					
						2017-12-01 16:52:00 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5218f7ae56 
					 
					
						
						
							
							Merge pull request  #123  from liviuk2/master  
						
						... 
						
						
						
						Fix wrong email on email change confirmation message, #122  
						
						
					 
					
						2017-12-01 16:50:11 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9a923aaace 
					 
					
						
						
							
							Fix wrong email on email change confirmation message,  #122  
						
						
						
						
					 
					
						2017-12-01 15:27:21 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						18acee7585 
					 
					
						
						
							
							re  #111  update CHANGELOG  
						
						
						
						
					 
					
						2017-11-27 16:10:07 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1066d56ee5 
					 
					
						
						
							
							Merge pull request  #121  from maxxer/italian_translation  
						
						... 
						
						
						
						Updated 'it' 
						
						
					 
					
						2017-11-27 07:53:02 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7cc7db6086 
					 
					
						
						
							
							Updated 'it'  
						
						
						
						
					 
					
						2017-11-27 07:39:10 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3281169b86 
					 
					
						
						
							
							Password expiration feature  #102  
						
						... 
						
						
						
						It's still missing an enforcement which redirects all actions to profile
update until the password is changed 
						
						
					 
					
						2017-11-26 20:09:09 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f1af47b459 
					 
					
						
						
							
							Merge pull request  #116  from Dezinger/bugfix_type_convertion  
						
						... 
						
						
						
						#115  Convert client_id to string because pgsql fail with type convertion 
					
						2017-11-24 08:28:46 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						28b25fb454 
					 
					
						
						
							
							Merge branch 'master' into bugfix_type_convertion  
						
						
						
						
					 
					
						2017-11-24 00:44:07 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d39f959bfc 
					 
					
						
						
							
							Merge branch 'master' into bugfix_type_convertion  
						
						
						
						
					 
					
						2017-11-24 00:43:00 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						49d9780e31 
					 
					
						
						
							
							Merge pull request  #114  from Dezinger/secfix_access_rulecontroller  
						
						... 
						
						
						
						#119  Security fix: add AccessControl to RuleController 
					
						2017-11-23 22:41:04 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						67dec04d79 
					 
					
						
						
							
							Merge branch 'master' into secfix_access_rulecontroller  
						
						
						
						
					 
					
						2017-11-23 23:25:58 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						381d213f32 
					 
					
						
						
							
							Merge branch 'master' into bugfix_type_convertion  
						
						
						
						
					 
					
						2017-11-23 23:24:50 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						044b1766f7 
					 
					
						
						
							
							Merge branch 'master' into secfix_access_rulecontroller  
						
						
						
						
					 
					
						2017-11-23 12:20:55 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6527d03991 
					 
					
						
						
							
							Merge branch 'master' into bugfix_type_convertion  
						
						
						
						
					 
					
						2017-11-23 12:19:41 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b875093ff6 
					 
					
						
						
							
							Merge pull request  #117  from Dezinger/i18n-ru-1  
						
						... 
						
						
						
						#120  2FA i18n russian translation 
					
						2017-11-23 12:18:28 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9c9be53f67 
					 
					
						
						
							
							#120  Add to changelog  
						
						
						
						
					 
					
						2017-11-22 21:28:31 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b2161c3224 
					 
					
						
						
							
							#115  Add to changelog  
						
						
						
						
					 
					
						2017-11-22 21:23:43 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3718ae5332 
					 
					
						
						
							
							#119  Add to changelog  
						
						
						
						
					 
					
						2017-11-22 21:16:50 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						94e44ad944 
					 
					
						
						
							
							2FA i18n russian translation  
						
						
						
						
					 
					
						2017-11-19 00:15:47 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6e80f0a62d 
					 
					
						
						
							
							#115  Convert client_id to string because pgsql fail with type convertion string <> int  
						
						
						
						
					 
					
						2017-11-18 23:42:42 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f5e5f20e15 
					 
					
						
						
							
							Security fix: add AccessControl to RuleController  
						
						
						
						
					 
					
						2017-11-18 23:02:27 +03:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						17c775d193 
					 
					
						
						
							
							Merge pull request  #112  from MKiselev/issue_111  
						
						... 
						
						
						
						Close  #111  | Fix migration for PostgreSQL 
					
						2017-11-16 11:53:11 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						82937ca7d6 
					 
					
						
						
							
							Update CHANGELOG.md  
						
						
						
						
					 
					
						2017-11-16 15:32:06 +05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dede5ee36e 
					 
					
						
						
							
							Close   #111  | Fix migration for PostgreSQL  
						
						
						
						
					 
					
						2017-11-16 10:30:59 +05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						97e437bb67 
					 
					
						
						
							
							re  #107  minor fix on phpdoc  
						
						
						
						
					 
					
						2017-11-12 23:44:08 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						83458a13e4 
					 
					
						
						
							
							Close   #109  provide better error classes + phpdoc fixes  
						
						
						
						
					 
					
						2017-11-12 23:13:42 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c418ad967c 
					 
					
						
						
							
							Close   #108  phpcs fixes  
						
						
						
						
					 
					
						2017-11-12 22:01:28 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						190fafa5f1 
					 
					
						
						
							
							re  #108  use app main logger + multiple fixes  
						
						
						
						
					 
					
						2017-11-12 21:58:48 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						77430fbb74 
					 
					
						
						
							
							re  #108  $roleParams was not defined in scope  
						
						
						
						
					 
					
						2017-11-12 21:46:06 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7a6f84a486 
					 
					
						
						
							
							Merge pull request  #105  from maxxer/consolidate_2fa_messages  
						
						... 
						
						
						
						Consolitation of 2FA messages #103  
						
						
					 
					
						2017-11-12 20:53:41 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						11cce5540f 
					 
					
						
						
							
							Updated translations for new 2FA strings  #103  
						
						
						
						
					 
					
						2017-11-06 08:04:50 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						19eb9df623 
					 
					
						
						
							
							Removed acronyms for 2fa  #103  
						
						
						
						
					 
					
						2017-11-06 08:03:29 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f6d2651655 
					 
					
						
						
							
							Merge pull request  #106  from kartik-v/patch-2  
						
						... 
						
						
						
						Correct exception value returned in `MailEvent::getException` 
						
						
					 
					
						2017-11-05 12:57:31 +01:00