103 Commits

Author	SHA1	Message	Date
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Philippe GRAND	3a8bde227b	Standardize and update code	2018-08-31 19:26:08 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 ... Update and standardize code	2018-08-28 02:13:28 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +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	41ac5dfd29	Merge branch 'develop' into patch-18	2018-08-21 16:02:43 +02:00
Laurent Destailleur	4d8e5ab0e6	Fix PHPCS	2018-08-21 14:58:20 +02:00
Frédéric FRANCE	ca6461ea2d	align parameters	2018-08-21 14:30:06 +02:00
Laurent Destailleur	a369822e5a	Fix export/import web site	2018-08-20 21:00:45 +02:00
Laurent Destailleur	36c7007aaa	Add control to avoid duplicate aliases	2018-08-20 19:10:33 +02:00
Laurent Destailleur	8ac3b01f04	NEW Can export/import a website template	2018-08-16 23:57:19 +02:00
Laurent Destailleur	ab22c9d0de	Work on import	2018-08-16 21:48:16 +02:00
Frédéric FRANCE	d30874750f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-14 09:02:12 +02:00
Laurent Destailleur	5e762fe712	Fix cloning website switch on new web site	2018-08-13 23:22:20 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	174394c476	Work on website module	2018-07-23 14:08:20 +02:00
Laurent Destailleur	5883899bc7	Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS	2018-07-05 02:33:39 +02:00
Laurent Destailleur	944ba69cd8	Add unique key. Dolibarrize view of stripe card.	2018-03-13 17:32:49 +01:00
Laurent Destailleur	6338328c90	Fix scrutinizer errors	2018-03-04 11:09:53 +01:00
Laurent Destailleur	e2c7585ae7	NEW Support alternative aliases of page name in website	2018-02-28 14:36:22 +01:00
Laurent Destailleur	60a77a6d85	Add option to grab images into same dir or subdir	2018-02-19 14:56:37 +01:00
Laurent Destailleur	8783857aa5	Fix tooltip of website editor	2018-02-14 20:33:48 +01:00
Laurent Destailleur	2812dae3b3	Fix website in multicompany mode	2018-01-07 18:28:47 +01:00
Laurent Destailleur	5264aec853	Add js into export of website	2017-12-27 20:21:19 +01:00
Laurent Destailleur	89a62103ca	Debug module website	2017-12-19 11:40:29 +01:00
Laurent Destailleur	48aada6090	Export of website	2017-12-11 21:27:43 +01:00
Laurent Destailleur	6f3c839d65	Fix error management	2017-12-11 18:58:08 +01:00
Laurent Destailleur	dbefb93e0f	Error management	2017-12-11 18:25:23 +01:00
Laurent Destailleur	dc04ab3164	Missing field in website module	2017-12-02 13:24:21 +01:00
Laurent Destailleur	9b8011f75b	Fix class not found	2017-11-25 16:52:04 +01:00
Laurent Destailleur	c78c06776b	Fix bug reported by scrutinizer	2017-11-05 03:39:27 +01:00
Laurent Destailleur	a346a1a5e9	Work on website module	2017-11-03 15:56:16 +01:00
Laurent Destailleur	55386a3ae2	Work on website module	2017-11-03 13:52:03 +01:00
Laurent Destailleur	fa1fbe7db7	Work on websiteaccounts	2017-11-03 13:25:49 +01:00
Laurent Destailleur	5f5cbec1cf	Debug module website	2017-10-26 13:09:11 +02:00
Laurent Destailleur	e865f41b86	NEW Extrafields "link to object" now use a combo selection and getNomUrl	2017-10-26 02:55:43 +02:00
Laurent Destailleur	66d2c29fe1	Work on modulebuilder and website module	2017-10-26 01:02:13 +02:00
Laurent Destailleur	ff9a6ca01b	Work on module builder	2017-10-25 22:23:54 +02:00
Laurent Destailleur	b64d60d381	Fix dos file	2017-10-25 22:06:24 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	f381361c8b	Work on modulebuilder	2017-10-24 19:57:36 +02:00
Laurent Destailleur	d2f723045c	Work on website and modulebuilder	2017-10-24 17:30:05 +02:00