55888 Commits

Author	SHA1	Message	Date
Frédéric FRANCE	def89d30ae	Merge remote-tracking branch 'upstream/develop' into patch-2	2018-01-28 15:36:40 +01:00
Laurent Destailleur	cebda2b141	Prepare 8.0	2018-01-28 10:57:12 +01:00
Laurent Destailleur	97c2828d04	Fix install.lock not always saved	2018-01-28 10:57:01 +01:00
Laurent Destailleur	2f28240ce4	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-27 19:37:33 +01:00
Laurent Destailleur	7a2992bc4b	Fix var serialized twice	2018-01-27 19:35:30 +01:00
Laurent Destailleur	f1cd905bf1	Fix var not initialized	2018-01-27 19:29:57 +01:00
Laurent Destailleur	f2a3c83053	Better error messages	2018-01-27 18:46:52 +01:00
Laurent Destailleur	28417a6c24	Fix css	2018-01-26 23:54:45 +01:00
Laurent Destailleur	a61b420759	Fix css	2018-01-26 23:29:49 +01:00
Laurent Destailleur	34140ca3f0	Merge pull request #7983 from AlainRnet/patch-6 ... NEW Show total number of records by category	2018-01-26 18:04:18 +01:00
Laurent Destailleur	86e501808c	Merge pull request #7975 from dolibarr95/patch-31 ... Create 7.0.0-8.0.0.sql	2018-01-26 18:03:07 +01:00
Laurent Destailleur	e379b02b81	Merge pull request #8009 from dolibarr95/patch-33 ... NEW add a hook in dol_print_phone	2018-01-26 18:02:27 +01:00
Laurent Destailleur	ae1641f4b9	Merge pull request #8063 from Alabate/develop ... NEW : Add password_hash as hash algorithm	2018-01-26 18:01:13 +01:00
Laurent Destailleur	6cae36cc33	NEW Add key __USER_REMOTE_IP__ into available substitution variables	2018-01-26 17:23:30 +01:00
Laurent Destailleur	eb3eee9b6a	Code comment	2018-01-26 15:25:47 +01:00
Laurent Destailleur	b9d5ed37dd	Prepare 8.0	2018-01-26 12:46:44 +01:00
Laurent Destailleur	d4e15545b4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2018-01-26 12:10:13 +01:00
Laurent Destailleur	1834be79a0	Fix supplier suggested when creating order from project overview	2018-01-26 11:31:34 +01:00
Laurent Destailleur	5b917c039e	Prepare 6.0.6	2018-01-26 11:08:08 +01:00
Laurent Destailleur	82c2079d40	Fix var not initialized	2018-01-26 10:23:24 +01:00
Laurent Destailleur	d751f9153f	Fix look and feel v7	2018-01-26 10:21:53 +01:00
Frédéric FRANCE	336c44dc88	trigger on shipping method update	2018-01-26 08:33:35 +01:00
Frédéric FRANCE	d0e83b7902	trigger on bank account update	2018-01-26 08:14:39 +01:00
Laurent Destailleur	1be42a7af8	Fix comment	2018-01-26 02:23:26 +01:00
Laurent Destailleur	4f9f1b51d7	Fix translation	2018-01-26 01:34:49 +01:00
Laurent Destailleur	e79f6fda2b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-26 01:23:18 +01:00
Frédéric FRANCE	ec38b8a5a2	Update interface_99_modMyModule_MyModuleTriggers.class.php	2018-01-25 22:07:10 +01:00
Laurent Destailleur	2c0eeaf8de	FIX #8093	2018-01-25 20:57:51 +01:00
Laurent Destailleur	c922498e79	Code comment	2018-01-25 20:35:25 +01:00
Laurent Destailleur	cff1dc6827	Rename	2018-01-25 17:57:49 +01:00
Laurent Destailleur	e9441f7881	Fix name of log module to avoid confusion with blocked log	2018-01-25 17:56:46 +01:00
Frédéric FRANCE	9e0a548eff	Update commonobject.class.php	2018-01-25 17:42:25 +01:00
Laurent Destailleur	59c907260b	Export of unalterablelog must contains init hash	2018-01-25 13:18:52 +01:00
Laurent Destailleur	8d7f6843a4	Must be able to export lockedlog for a dedicated year. ... Fix date are nto humanly readable.	2018-01-25 12:57:36 +01:00
Laurent Destailleur	005bccc63d	Fix missing badge of nb of permissions	2018-01-25 12:06:22 +01:00
Laurent Destailleur	f66ac935c8	Fix migration for files from modules	2018-01-24 20:00:27 +01:00
Laurent Destailleur	18ed53b9a7	Fix css	2018-01-24 18:04:06 +01:00
Laurent Destailleur	60c1a1e745	Code comment on accesskey	2018-01-24 17:29:29 +01:00
Laurent Destailleur	d796f403a9	Fix sender email when sending a password remind	2018-01-24 15:43:55 +01:00
Laurent Destailleur	f3b89d9d39	Add missing trans	2018-01-24 14:47:52 +01:00
Laurent Destailleur	9cdb7f0f27	Code comment	2018-01-24 14:37:26 +01:00
Laurent Destailleur	e45d35dcb1	Fix code comment	2018-01-24 14:22:11 +01:00
Laurent Destailleur	fbeb66fedd	Fix refreshing of captcha broken if a cache-control set by server	2018-01-24 13:40:39 +01:00
Laurent Destailleur	6e906ac0e3	Clean code	2018-01-24 13:08:09 +01:00
Laurent Destailleur	64f6e9e5c0	CSS	2018-01-24 12:23:52 +01:00
Laurent Destailleur	3a4ca8ae2b	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-24 11:49:36 +01:00
Laurent Destailleur	1da7b154c1	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-01-24 11:48:31 +01:00
Laurent Destailleur	54fb59d8db	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/paiement.php	2018-01-24 11:45:43 +01:00
Laurent Destailleur	af2efaf137	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-01-24 11:44:01 +01:00
Laurent Destailleur	561f273900	Minor fix for smartphone	2018-01-24 11:43:34 +01:00