Merge branch 'develop' of projects.ceondo.com:indefero into feature.scilab
This commit is contained in:
		@@ -206,7 +206,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
 | 
			
		||||
                        $mtn_master_branch)) {
 | 
			
		||||
            throw new Pluf_Form_Invalid(__(
 | 
			
		||||
                'The master branch is empty or contains illegal characters, '.
 | 
			
		||||
                'please use only letters, digits, dashs and dots as separators.'
 | 
			
		||||
                'please use only letters, digits, dashes and dots as separators.'
 | 
			
		||||
            ));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -161,7 +161,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
 | 
			
		||||
                          'label' => __('Staff'),
 | 
			
		||||
                          'initial' => $this->user->staff,
 | 
			
		||||
                          'widget' => 'Pluf_Form_Widget_CheckboxInput',
 | 
			
		||||
                          'help_text' => __('If you give staff rights to a user, you really need to trust them.'),
 | 
			
		||||
                          'help_text' => __('If you give staff rights to a user, you really need to trust him.'),
 | 
			
		||||
                          ));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user