Corsi di Formazione Area 1

.gitignore

@@ -43,7 +43,11 @@ upload/setup/autopull
 
 # Mantieni i placeholder
 !upload/avatar/placeholder/
+<<<<<<< HEAD
 
 # File di progetto IntelliJ
 .idea
 pma/
+=======
+/nbproject/private/
+>>>>>>> a09b42e652284469f2e0a50405d8b17a878fbd8d

README.md

@@ -62,4 +62,4 @@ Per il corretto funzionamento dell'applicazione e del sistema di posta, modifica
 
 # Ogni 1-5 minuti (smaltimento coda di invio)
 * * * * * cd ~/gaia && php mailer.php | tee -a upload/log/mailer.log
-```
+```

assets/css.build

@@ -0,0 +1,8 @@
+assets/css/bootstrap.min.css
+assets/css/font-awesome.min.css
+assets/css/main.css
+assets/css/jquery-ui-1.10.3.custom.css
+assets/css/chosen.min.css
+assets/css/chosen.override.css
+assets/css/fullcalendar.min.css
+#assets/css/fullcalendar.print.css

assets/css/chosen.override.css

@@ -0,0 +1,6 @@
+.chosen-container-multi .chosen-choices li {
+    clear: both;
+}
+.chosen-container-multi .chosen-choices li.search-field input:before {
+    content: '<span class="input-group-addon"><i class="fa fa-search"></i></span>';
+}

assets/css/font-awesome-ie7.min.css

@@ -382,3 +382,5 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
 .icon-vk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
 .icon-weibo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
 .icon-renren{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
+.icon-graduation-cap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
+.icon-user-secret{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}