34 Commits

Author	SHA1	Message	Date
Philippe GRAND	729ff0b9bb	Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018	2018-10-16 14:20:11 +02:00
Laurent Destailleur	b0569de166	Work on multilang support	2018-10-14 18:44:29 +02:00
Philippe GRAND	ba40ad4aab	Standardize and update code	2018-10-12 12:23:45 +02:00
Philippe GRAND	073ec85208	Standardize code	2018-10-05 15:51:08 +02:00
Laurent Destailleur	e6be047178	Work on new management for website module	2018-09-25 15:00:37 +02:00
Laurent Destailleur	f04b8eea6d	Work on website module	2018-09-24 19:21:21 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	280f15e8bf	Fix fk_user	2018-09-10 21:55:03 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Frédéric FRANCE	2a9ef8dc05	move phpcs:ignore	2018-09-02 22:05:19 +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
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +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	36c7007aaa	Add control to avoid duplicate aliases	2018-08-20 19:10:33 +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	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	dc04ab3164	Missing field in website module	2017-12-02 13:24:21 +01:00
Laurent Destailleur	a346a1a5e9	Work on website module	2017-11-03 15:56:16 +01: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	36ad17cc95	Work on module builder	2017-10-22 16:45:18 +02:00
Laurent Destailleur	3bca0ad07d	More modern picto for switch on/off ... Work on website module	2017-10-20 21:39:19 +02:00