6304 Commits

Author	SHA1	Message	Date
Laurent Destailleur	4885e61240	Fix tdclass	2018-08-24 15:16:03 +02:00
Laurent Destailleur	9f92974e98	Fix tdclass	2018-08-24 15:13:34 +02:00
Laurent Destailleur	32bde2c375	Add tdclass to form confirm for more control	2018-08-24 15:12:47 +02:00
Laurent Destailleur	d2a7c9976b	Fix syntax error	2018-08-24 15:05:57 +02:00
Laurent Destailleur	07407f46a7	Remove colspan	2018-08-24 15:02:19 +02:00
Laurent Destailleur	7a35b560a6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-23 19:51:52 +02:00
Philippe GRAND	215677c972	Standardize and update code	2018-08-23 18:17:09 +02:00
Philippe GRAND	74ce0bfea6	Standardize and update code	2018-08-23 16:54:24 +02:00
Philippe GRAND	80b7229174	Standardize and update code	2018-08-23 11:34:55 +02:00
Philippe GRAND	9e900e583d	Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018	2018-08-23 11:13:54 +02:00
Philippe GRAND	aafa16afa5	Update and standardize code	2018-08-23 11:11:46 +02:00
Philippe Grand	e09f7bedd0	Update commonobject.class.php	2018-08-23 09:57:19 +02:00
Philippe GRAND	504b0e3d16	Update and standardize code	2018-08-22 18:34:50 +02:00
Frédéric FRANCE	96f16b7497	Update commondocgenerator.class.php	2018-08-22 17:29:05 +02:00
Laurent Destailleur	b650f7ac17	Fix tab	2018-08-22 13:37:18 +02:00
Laurent Destailleur	c7a241a5db	FIX Get templates in a forced language ... Conflicts: htdocs/core/class/html.formmail.class.php	2018-08-22 13:22:49 +02:00
Laurent Destailleur	c20d556265	FIX Get templates in a forced language	2018-08-22 13:16:55 +02:00
Frédéric FRANCE	d1d6d81f8f	Update antivir.class.php	2018-08-22 11:53:08 +02:00
Philippe GRAND	95349365ba	Update and standardize code	2018-08-22 11:39:37 +02:00
Philippe GRAND	0ffad50974	Update and standardize code	2018-08-22 11:24:31 +02:00
Philippe GRAND	d91b1fd895	Update and standardize code	2018-08-22 11:06:34 +02:00
Philippe GRAND	a669830427	Update and standardize code	2018-08-22 10:37:16 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Frédéric FRANCE	0fbccce9a7	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 19:59:07 +02:00
Laurent Destailleur	db3c17668e	Fix coding style	2018-08-21 19:08:11 +02:00
Laurent Destailleur	3f4714416d	Clean comment	2018-08-21 18:58:10 +02:00
Laurent Destailleur	f8b3ec7b87	Fix PHPCS	2018-08-21 18:57:34 +02:00
Frédéric FRANCE	aba69b94b2	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-21 14:03:02 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration ... function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	85eed6cf80	Merge branch 'develop' into trimtrailing	2018-08-21 13:40:04 +02:00
Laurent Destailleur	289f194641	Merge pull request #9058 from defrance/patch-123 ... New : Add total price on dashboard	2018-08-21 13:33:33 +02:00
Laurent Destailleur	b40e32b8c3	Merge pull request #9264 from grandoc/new_branch_17_08_2018 ... standardize code	2018-08-21 12:52:34 +02:00
Laurent Destailleur	26d34422b0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-19 03:01:26 +02:00
Laurent Destailleur	795b2f3d58	FIX Delete file on smartphone	2018-08-19 03:00:11 +02:00
Philippe GRAND	c48211ad70	Update and standardize code	2018-08-17 19:31:22 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Laurent Destailleur	5c712a6cd3	Merge branch 'develop' into trimtrailing	2018-08-16 00:47:09 +02:00
Laurent Destailleur	3b245f1b30	Merge pull request #9247 from frederic34/missingReturn ... return comment	2018-08-16 00:35:39 +02:00
Frédéric FRANCE	69a7af88e7	function declaration	2018-08-15 18:14:02 +02:00
Frédéric FRANCE	54a078149a	function declaration	2018-08-15 17:34:35 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Laurent Destailleur	ec56ad752c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2018-08-15 14:26:38 +02:00
Frédéric FRANCE	5146ab9177	trim	2018-08-14 15:34:44 +02:00
Frédéric FRANCE	d25fa61998	return comment	2018-08-14 13:14:55 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	33f0172603	Fix select zip/town	2018-08-13 16:44:49 +02:00
Frédéric FRANCE	1b27cca91c	Merge remote-tracking branch 'upstream/develop' into trimtrailing	2018-08-13 08:53:07 +02:00