alban
							
						 | 
						
							
							
							
							
							
								
							
							
								4cfa0d3603
								
							
						 | 
						
							
							
								
								[fix] tweaks
							
							
							
							
							
						 | 
						
							2014-09-15 17:13:26 +02:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								5a31dc9b96
								
							
						 | 
						
							
							
								
								Merge branch 'stable-3.1'
							
							
							
							
							
							
							
							Conflicts:
	bureau/class/m_action.php
	bureau/class/m_bro.php
	bureau/class/m_dom.php
	debian/changelog
	install/mysql.sql
	install/upgrades/3.3.0~a.sql 
							
						 | 
						
							2014-09-15 15:25:27 +02:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								7c597daa73
								
							
						 | 
						
							
							
								
								[fix] Missing chmod action
							
							
							
							
							
						 | 
						
							2014-09-09 14:52:56 +02:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								c96f928056
								
							
						 | 
						
							
							
								
								fixing alternc_shutdown bug
							
							
							
							
							
						 | 
						
							2014-08-27 11:20:54 +02:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								81aae4c2f4
								
							
						 | 
						
							
							
								
								back to our normal code syntax, fixing 'R = ' bug in urls
							
							
							
							
							
						 | 
						
							2014-08-22 11:04:05 +02:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								beebd51f37
								
							
						 | 
						
							
							
								
								fixing a bug when deleting file (double directory)
							
							
							
							
							
						 | 
						
							2014-08-21 11:37:48 +02:00 | 
						
					
				
					
						
							
							
								 
								Squidly
							
						 | 
						
							
							
							
							
							
								
							
							
								2f0a68c280
								
							
						 | 
						
							
							
								
								Bugfixing domain deletion with update_domains php style ( This might be a ugly hack but who cares about technical debt right ^^ )
							
							
							
							
							
						 | 
						
							2014-07-04 13:46:32 +02:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								0fdd3c4775
								
							
						 | 
						
							
							
								
								also fix IMAP help texts
							
							
							
							
							
						 | 
						
							2014-07-23 19:08:34 +00:00 | 
						
					
				
					
						
							
							
								 
								Dominique Rousseau
							
						 | 
						
							
							
							
							
							
								
							
							
								1af5b301d4
								
							
						 | 
						
							
							
								
								Condition !== FALSE sur le while pour gerer les cas ou readdir renvoie un nom de fichier/repertoire qui est "0" et que PHP interprete du coup comme FALSE
							
							
							
							
							
							
							
							fixes #613 
							
						 | 
						
							2014-07-23 13:09:15 +02:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								9cbabcc14f
								
							
						 | 
						
							
							
								
								silence warning in piwik
							
							
							
							
							
						 | 
						
							2014-07-16 17:36:43 +00:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								4f0aa82d20
								
							
						 | 
						
							
							
								
								properly deal with undefined errors
							
							
							
							
							
						 | 
						
							2014-07-16 15:43:43 +00:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								d301587995
								
							
						 | 
						
							
							
								
								[fix] Missing check in browser for dir list
							
							
							
							
							
						 | 
						
							2014-07-10 00:05:53 +02:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								9951fd6902
								
							
						 | 
						
							
							
								
								Merge branch 'feature-diagnostic'
							
							
							
							
							
						 | 
						
							2014-07-08 22:39:50 +02:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								71f3a60e8c
								
							
						 | 
						
							
							
								
								Tweaks get_problems
							
							
							
							
							
						 | 
						
							2014-07-04 16:10:25 +00:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								94cead4494
								
							
						 | 
						
							
							
								
								On s'en moque des compte en cours de suppression dans la conf Apache
							
							
							
							
							
						 | 
						
							2014-07-04 15:06:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								0823bc73f4
								
							
						 | 
						
							
							
								
								No generation parameters for apache conf when the vhost is not enabled or is waiting to be deleted
							
							
							
							
							
						 | 
						
							2014-07-04 14:55:52 +00:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								9c4c68b6eb
								
							
						 | 
						
							
							
								
								[enh] allow different path for system_bind
							
							
							
							
							
						 | 
						
							2014-07-04 16:15:16 +02:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								53fd6a98cb
								
							
						 | 
						
							
							
								
								properly edit subdomains when deactivating domains
							
							
							
							
							
						 | 
						
							2014-07-03 18:12:43 +00:00 | 
						
					
				
					
						
							
							
								 
								AlternC VM
							
						 | 
						
							
							
							
							
							
								
							
							
								27e7c08b18
								
							
						 | 
						
							
							
								
								refactoring with regard to old API ;)
							
							
							
							
							
						 | 
						
							2014-06-30 17:20:10 +02:00 | 
						
					
				
					
						
							
							
								 
								AlternC VM
							
						 | 
						
							
							
							
							
							
								
							
							
								ea7c943b67
								
							
						 | 
						
							
							
								
								rollback because of MySQL API not merged yet. Still fixes the return true which can be false because of do_action()
							
							
							
							
							
						 | 
						
							2014-06-30 17:11:56 +02:00 | 
						
					
				
					
						
							
							
								 
								root
							
						 | 
						
							
							
							
							
							
								
							
							
								64fa8a2795
								
							
						 | 
						
							
							
								
								refactor code, and correct return true, which may be false because of do_action()
							
							
							
							
							
						 | 
						
							2014-06-30 17:08:37 +02:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								86d0d876d2
								
							
						 | 
						
							
							
								
								fix from 3.1.1 merged into master
							
							
							
							
							
						 | 
						
							2014-06-26 15:21:46 +02:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								9c2090ff8b
								
							
						 | 
						
							
							
								
								ignore redundant entries when not OK on web_action
							
							
							
							
							
						 | 
						
							2014-06-25 16:38:00 +02:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								8113d2b866
								
							
						 | 
						
							
							
								
								disable help texts if empty, partly (missing IMAP/POP)
							
							
							
							
							
						 | 
						
							2014-06-18 18:55:00 +00:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								73606b8e26
								
							
						 | 
						
							
							
								
								add get_login_by_uid API
							
							
							
							
							
						 | 
						
							2014-06-18 15:26:53 +00:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								dd6ace0c0c
								
							
						 | 
						
							
							
								
								don't create piwik accounts with random gmail addresses, properly prefix the accounts so they're unique
							
							
							
							
							
						 | 
						
							2014-06-18 15:24:38 +00:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								fb9d6d8457
								
							
						 | 
						
							
							
								
								piwik: properly record the site id after creation
							
							
							
							
							
						 | 
						
							2014-06-18 15:05:34 +00:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								954ffc2ab0
								
							
						 | 
						
							
							
								
								fix the way we interpolate the URL
							
							
							
							
							
						 | 
						
							2014-06-18 14:40:07 +00:00 | 
						
					
				
					
						
							
							
								 
								Antoine Beaupr��
							
						 | 
						
							
							
							
							
							
								
							
							
								dbd029d8cf
								
							
						 | 
						
							
							
								
								warn users to switch to HTTPS if it's not enable, admins can opt out through a variable
							
							
							
							
							
						 | 
						
							2014-06-17 20:57:26 +00:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								1c627d243f
								
							
						 | 
						
							
							
								
								Test unitaires de demo
							
							
							
							
							
						 | 
						
							2014-04-07 16:28:48 +00:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								91f8745d84
								
							
						 | 
						
							
							
								
								[fix] m_variables multidimensinal values parsing and better documentation
							
							
							
							
							
						 | 
						
							2014-03-28 17:46:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								ac9e50ac33
								
							
						 | 
						
							
							
								
								Doc + cosmetics
							
							
							
							
							
						 | 
						
							2014-03-28 16:14:32 +00:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								b2bcca72bd
								
							
						 | 
						
							
							
								
								new translations
							
							
							
							
							
						 | 
						
							2014-03-28 17:02:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								9a6d9adfba
								
							
						 | 
						
							
							
								
								Merge branch 'master' of alternc.org:alternc
							
							
							
							
							
						 | 
						
							2014-03-28 16:28:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								1f64a75743
								
							
						 | 
						
							
							
								
								adding \n after END AUTOMATIC FILE
							
							
							
							
							
						 | 
						
							2014-03-28 16:28:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								408ff30a79
								
							
						 | 
						
							
							
								
								Shame on me : debug test was here...
							
							
							
							
							
						 | 
						
							2014-03-28 15:23:18 +00:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								cde8eb71e8
								
							
						 | 
						
							
							
								
								Mini modif
							
							
							
							
							
						 | 
						
							2014-03-28 15:18:23 +00:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								dfdd41655d
								
							
						 | 
						
							
							
								
								fixing 'undefined index' error
							
							
							
							
							
						 | 
						
							2014-03-28 16:08:21 +01:00 | 
						
					
				
					
						
							
							
								 
								fufroma
							
						 | 
						
							
							
							
							
							
								
							
							
								5409257c77
								
							
						 | 
						
							
							
								
								Commentaires sur m_dom
							
							
							
							
							
						 | 
						
							2014-03-28 16:01:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								56fdcb8f9f
								
							
						 | 
						
							
							
								
								Quelques modifs sur la classe variables
							
							
							
							
							
						 | 
						
							2014-03-28 14:28:25 +00:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								d2e69b4975
								
							
						 | 
						
							
							
								
								Corrige des variables
							
							
							
							
							
						 | 
						
							2014-03-28 11:37:36 +00:00 | 
						
					
				
					
						
							
							
								 
								fufroma
							
						 | 
						
							
							
							
							
							
								
							
							
								c78437221d
								
							
						 | 
						
							
							
								
								Revert "Commence a passer en mysqli"
							
							
							
							
							
							
							
							This reverts commit faaf268d68. 
							
						 | 
						
							2014-03-28 10:49:11 +01:00 | 
						
					
				
					
						
							
							
								 
								fufroma
							
						 | 
						
							
							
							
							
							
								
							
							
								41cee2ee5a
								
							
						 | 
						
							
							
								
								Revert "Mysql to mysqli"
							
							
							
							
							
							
							
							This reverts commit ae216fee31. 
							
						 | 
						
							2014-03-28 10:48:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								ae216fee31
								
							
						 | 
						
							
							
								
								Mysql to mysqli
							
							
							
							
							
						 | 
						
							2014-03-28 09:42:06 +00:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								faaf268d68
								
							
						 | 
						
							
							
								
								Commence a passer en mysqli
							
							
							
							
							
						 | 
						
							2014-03-28 09:26:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								62981ecfa5
								
							
						 | 
						
							
							
								
								Some cosmetics
							
							
							
							
							
						 | 
						
							2014-03-28 09:14:53 +00:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								aa9acaa165
								
							
						 | 
						
							
							
								
								[fix] serveurList on m_dom.php
							
							
							
							
							
						 | 
						
							2014-03-27 19:08:33 +01:00 | 
						
					
				
					
						
							
							
								 
								alban
							
						 | 
						
							
							
							
							
							
								
							
							
								6fc53c040d
								
							
						 | 
						
							
							
								
								[fix] tabulations on m_dom.php
							
							
							
							
							
						 | 
						
							2014-03-27 19:03:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Alan Garcia
							
						 | 
						
							
							
							
							
							
								
							
							
								c63a814dbd
								
							
						 | 
						
							
							
								
								Cosmetics
							
							
							
							
							
						 | 
						
							2014-03-27 17:02:55 +00:00 | 
						
					
				
					
						
							
							
								 
								Benjamin Sonntag
							
						 | 
						
							
							
							
							
							
								
							
							
								b6462b87c7
								
							
						 | 
						
							
							
								
								merging mysql.sql from alan
							
							
							
							
							
						 | 
						
							2014-03-27 17:56:37 +01:00 |