Commit Graph

491 Commits

Author SHA1 Message Date
Laurent Destailleur
346e9f3e1b Fix import of web site
Fix sort on constant setup page lost
2019-10-09 15:01:19 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00
Laurent Destailleur
34c4de3287 Better responsive for website toolbar 2019-10-02 16:18:33 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
4db6badfc2 Fix link when no title in search of website content 2019-09-16 10:24:41 +02:00
Laurent Destailleur
d2b2cc010b Update ckeditor 4.12 2019-09-10 17:50:55 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
Laurent Destailleur
c0b8315e19 Replace deprecated code 2019-09-06 02:45:00 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
fa11bbe2d5 Fix phpcs 2019-09-03 12:51:11 +02:00
Laurent Destailleur
a96742ee9b Can search into global site files.
Support of cancel to previous page
2019-09-02 18:43:22 +02:00
Laurent Destailleur
c068177027 Work on search on global site files 2019-09-02 16:39:56 +02:00
Laurent Destailleur
ddae5315f1 Updat fontawesome to 5.10.2 2019-09-02 16:13:11 +02:00
Laurent Destailleur
3abe83b83d FIX Css was saved on wrong website. 2019-08-29 13:41:42 +02:00
Laurent Destailleur
01962cbc67 Clean code 2019-08-29 13:17:14 +02:00
Laurent Destailleur
77dfc19389 Try to compile css with lessc 2019-08-29 04:38:24 +02:00
Laurent Destailleur
ff7c122b6d Add class specific to web page ref 2019-08-29 02:36:32 +02:00
Laurent Destailleur
a8eb0e87a8 Translate 2019-08-29 02:11:46 +02:00
Laurent Destailleur
5dee861f7d Fix typo 2019-08-19 18:39:40 +02:00
Laurent Destailleur
6d60b53dbb Enhance export/import of web sites 2019-08-19 18:25:27 +02:00
Laurent Destailleur
28c18afbb6 Enhance export of website 2019-08-19 18:06:27 +02:00
Laurent Destailleur
2f46b40da2 Prepare feature "Never show this message again" 2019-08-18 18:36:18 +02:00
Laurent Destailleur
ac1203fce3 Update template 2019-08-17 18:42:43 +02:00
Laurent Destailleur
b99b49c542 Enhance website module 2019-08-17 17:39:31 +02:00
Laurent Destailleur
08038e5078 FIX save of empty files 2019-08-16 02:31:06 +02:00
Laurent Destailleur
d70e6e4e9a Fix record file with empty name 2019-08-16 02:17:33 +02:00
Laurent Destailleur
bf6f92edf8 Fix template 2019-08-15 23:54:33 +02:00
Laurent Destailleur
056626b8e3 Nicer toolbar for website menu 2019-08-15 18:59:08 +02:00
Laurent Destailleur
ffece8dd34 Better link for syntax help 2019-08-15 18:46:48 +02:00
Laurent Destailleur
a346b052e7 Enhance help 2019-08-15 18:37:57 +02:00
Laurent Destailleur
3dedb2149a Fix edit inline of sections 2019-08-15 18:12:40 +02:00
Laurent Destailleur
b5d72edebc Can add more samples of pages. Add an exemple of page with dynamic
content.
2019-08-15 18:07:36 +02:00
Laurent Destailleur
46ceb11685 Replace special chars in name of website page 2019-08-15 16:58:36 +02:00
Laurent Destailleur
14030affe5 Update website templates 2019-08-15 02:57:00 +02:00
Laurent Destailleur
f81463af0c Update templates 2019-08-15 00:55:47 +02:00
Laurent Destailleur
b2f1cb22e8 Add tooltip in website module 2019-08-14 23:57:44 +02:00
Laurent Destailleur
2b805cc63d Add tooltip help in CSS edition 2019-08-14 23:47:01 +02:00
Laurent Destailleur
f753799810 FIX Support #tag into url of website module 2019-08-14 23:27:34 +02:00
Laurent Destailleur
0818571827 Work on the edit inline tool. 2019-08-14 19:48:52 +02:00
Laurent Destailleur
10a3e773ce FIX Avoid to add new line in css file at each save 2019-08-14 16:28:41 +02:00
Laurent Destailleur
bb4618e2cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
2019-08-14 04:12:37 +02:00
Laurent Destailleur
4a20c99656 FIX Content send before header warning 2019-08-14 04:06:50 +02:00
Laurent Destailleur
6de2118f11 FIX Bad error management in zip compress and web site export
Conflicts:
	htdocs/website/index.php
2019-08-14 04:06:29 +02:00
Laurent Destailleur
198b35b419 FIX Content send before header warning 2019-08-14 02:46:09 +02:00
Laurent Destailleur
bc230c2d25 FIX Bad error management in zip compress and web site export 2019-08-14 01:43:06 +02:00
Laurent Destailleur
df53826426 FIX Missing some replacements in website module 2019-08-13 18:22:18 +02:00
Laurent Destailleur
7891c8d856 Enhance logs 2019-08-13 06:52:07 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
277a693c16 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks
2019-08-13 06:37:06 +02:00
Laurent Destailleur
52d34edb03 FIX USEDOLIBARREDITOR not always set 2019-08-13 05:23:10 +02:00
Laurent Destailleur
172271c98a FIX USEDOLIBARREDITOR not always set 2019-08-13 05:22:49 +02:00
Laurent Destailleur
7824731f17 NEW Add feature to search a string into containers 2019-08-13 00:34:42 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
Laurent Destailleur
ac57e527ce Fix translation 2019-08-12 19:01:23 +02:00
Laurent Destailleur
19bb5aa006 NEW Can edit a manifest.json.php file for web app 2019-08-12 17:34:18 +02:00
Laurent Destailleur
e29023f155 Fix 2019-07-25 14:12:22 +02:00
Laurent Destailleur
6bda130835 Protect from dir scan 2019-06-18 14:51:57 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
Laurent Destailleur
1415ad5b53 Debug website module 2019-06-02 17:27:00 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Laurent Destailleur
cd32734c58 CSS 2019-05-28 16:10:11 +02:00
Laurent Destailleur
0cd1fc79f2 NEW Add a security permission to edit php dynamic content on website. 2019-04-30 13:05:13 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
2019-04-30 03:30:40 +02:00
Laurent Destailleur
70975b36c7 Fix link 2019-04-27 19:46:53 +02:00
Laurent Destailleur
789a76320a Fix info message 2019-04-27 19:43:48 +02:00
Laurent Destailleur
6b2b996935 Missing translation 2019-04-27 19:41:47 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb FIX CVE-2019-11201 2019-04-25 23:21:25 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
d728af9ced Add the test for ckeditor with mode "inline" in setup page of ckeditor 2019-04-12 17:44:22 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
Laurent Destailleur
163665e4b5 FIX A page of a site replaced with another when switching in edit mode
Conflicts:
	htdocs/website/index.php
2019-04-05 11:36:48 +02:00
Laurent Destailleur
44f113c718 FIX A page of a site replaced with another when switching in edit mode 2019-04-05 11:34:06 +02:00
Laurent Destailleur
76dcbf7424 Fix phpcs for wrapper 2019-04-03 18:16:33 +02:00
Laurent Destailleur
eb6bd20132 Fix error message 2019-04-03 16:16:51 +02:00
Laurent Destailleur
7120078b0f NEW Simplification of styles architcture: Showing or not the menuhider
is completely decided by CSS and screen size instead of PHP+CSS.
2019-04-03 13:26:50 +02:00
Laurent Destailleur
65844bcb06 Fix detection of current page 2019-03-29 22:31:52 +01:00
Laurent Destailleur
d659543ac0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 19:00:57 +01:00
Laurent Destailleur
fa4467fb5f FIX Tooltip on click was ko on smartphone 2019-03-09 18:37:07 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
e9d370e5c3
Update website.class.php 2019-02-13 23:53:33 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
f4e4377435 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 15:24:14 +01:00
Laurent Destailleur
4097d648ae Fix search with alias 2019-02-05 15:23:51 +01:00
Laurent Destailleur
d49dd8d593 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 15:16:44 +01:00
Laurent Destailleur
b7f2a2b3f3 Fix search alias page if page not found 2019-02-05 15:15:41 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
cfa850cd20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:32:00 +01:00
Laurent Destailleur
3f75bb694c Fix phpcs 2019-01-26 01:31:22 +01:00
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
278b3e0b08 Fix css 2019-01-23 15:30:54 +01:00
Laurent Destailleur
ad54a2b8af Fix website edit of virtualhost 2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2 FIX Edit of virtualhost 2019-01-23 14:57:43 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
55c90b0578 Fix #10359 cloning of proposal 2019-01-19 13:17:07 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
6159703116 Fix warning and date 2019-01-15 11:14:01 +01:00
Laurent Destailleur
0f2406c202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-15 10:55:28 +01:00
Laurent Destailleur
2ec2daa18d FIX Edit blog meta post 2019-01-15 10:53:28 +01:00
Laurent Destailleur
2040ca1141 FIX Warning 2019-01-11 18:17:51 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
e47cf24fa1 Try to fix chrome xss protection 2019-01-04 19:10:25 +01:00
ldestailleur
89f24f6fe8 Fix cache not working on css files 2019-01-04 18:58:36 +01:00
ldestailleur
3485d0b4e5 Fix regression when editing html source 2019-01-04 18:39:02 +01:00
ldestailleur
3b6d6eec9a Fix cach on image for website 2019-01-04 18:06:54 +01:00
ldestailleur
082b126c06 FIX Can't switch page when html editing without save or cancel 2019-01-03 22:39:51 +01:00
Regis Houssin
483c6ef257 FIX wrong field name for WEBSITE_VIRTUALHOST
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-02 14:43:54 +01:00
Laurent Destailleur
3ae03d619d Fix tooltip 2018-12-18 11:03:23 +01:00
Laurent Destailleur
c444ef3b4d FIX wrapper could not download shared files 2018-12-17 19:37:17 +01:00
Laurent Destailleur
ffaff4dc7f Debug website module 2018-12-17 17:29:04 +01:00
Laurent Destailleur
4a873917ce Fix import 2018-12-04 12:40:36 +01:00
Laurent Destailleur
2dc6351593 Fix website import 2018-11-30 15:16:17 +01:00
Laurent Destailleur
7a4c1cddc8 Fix save master file of a website 2018-11-30 14:46:44 +01:00
Laurent Destailleur
e8d29c644b Fix grab web site 2018-11-30 14:30:00 +01:00
Laurent Destailleur
a4fc564048 css 2018-11-27 18:04:45 +01:00
Laurent Destailleur
780a538fe0 Fix multicompany not accessible from website. 2018-11-27 17:37:39 +01:00
Laurent Destailleur
70bd931d08 FIX empty page due to preg_replace JIT error on large strings 2018-11-27 16:20:31 +01:00
Laurent Destailleur
62e39f5a31 Fix title 2018-11-26 14:37:19 +01:00
Laurent Destailleur
a06b032c23 fix trans 2018-11-23 10:53:04 +01:00
Laurent Destailleur
61fddadc3f Complete the fetchAll of modulebuilder + websitepage 2018-11-20 18:29:29 +01:00
Laurent Destailleur
200de22807 Missing image in container 2018-11-20 16:48:34 +01:00
Laurent Destailleur
8ecd5ffa3b FIX Missing button cancel 2018-11-20 13:41:38 +01:00
Laurent Destailleur
1f6ccd4a66 Fix permission to edit websites 2018-11-14 13:58:00 +01:00
Laurent Destailleur
224d37cfeb Add bootstrap-iso class 2018-11-08 12:12:08 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
985ab1efda FIX delete of a file in file_manager return to same dir 2018-10-19 10:59:34 +02:00
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
96ddebad4a Set canonical tag 2018-10-15 17:48:39 +02:00
Laurent Destailleur
a20498126a Fix init var 2018-10-15 13:40:22 +02:00
Laurent Destailleur
ab807ada07 Work on translation 2018-10-14 23:26:57 +02:00
Laurent Destailleur
ac143b28ae Work on multilang 2018-10-14 20:54:28 +02:00
Laurent Destailleur
45860b2494 Work on multilang 2018-10-14 20:04:25 +02:00
Laurent Destailleur
b0569de166 Work on multilang support 2018-10-14 18:44:29 +02:00
Laurent Destailleur
96d2950051 Better tooltip 2018-10-14 16:10:02 +02:00
Laurent Destailleur
278910b66b Fix website 2018-10-14 14:26:18 +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
f6099fba15 Fix phpcs 2018-10-04 16:58:34 +02:00
Laurent Destailleur
378013b863 Better select language component 2018-10-03 20:58:45 +02:00
Laurent Destailleur
83be1759b1 Work on multilang website 2018-10-03 20:00:52 +02:00
Laurent Destailleur
fd859d3162 Add a component to select lang into a web site 2018-10-03 18:40:54 +02:00
Laurent Destailleur
957d5958a4 Work on website 2018-10-01 13:09:12 +02:00
Laurent Destailleur
33130853c8 Fix website 2018-09-28 00:59:02 +02:00
Laurent Destailleur
0987db765c Work on export/import 2018-09-26 11:28:41 +02:00
Laurent Destailleur
0a4d80012a Support export/import of logo site in web site templates 2018-09-26 11:15:11 +02:00
Laurent Destailleur
2ef0cb8d9b Fix cloning 2018-09-25 20:34:05 +02:00
Laurent Destailleur
eff1d1c89e Work on website module 2018-09-25 16:35:59 +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
Laurent Destailleur
9dc4ad4cc3 Add warning when using editinline 2018-09-24 15:38:13 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Laurent Destailleur
6e95fb5f05 Warning in website module 2018-09-20 14:36:13 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +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
3bf296c9cf
Merge pull request #9448 from frederic34/loadfichetitre
remove deprecated
2018-09-12 18:23:24 +02:00
Laurent Destailleur
45e769243d Fix import web site 2018-09-11 00:11:14 +02:00
Laurent Destailleur
a4a4b8ddff Fix error management 2018-09-10 23:23:44 +02:00
Laurent Destailleur
b0be1ddadb Fix files generated 2018-09-10 23:20:31 +02:00
Laurent Destailleur
9e982e05df Fix import 2018-09-10 22:58:20 +02:00
Laurent Destailleur
280f15e8bf Fix fk_user 2018-09-10 21:55:03 +02:00
Laurent Destailleur
98c3657d45 Fix default status of website 2018-09-10 21:43:21 +02:00
Laurent Destailleur
5a279bfce0 Fix import 2018-09-10 21:25:30 +02:00
Laurent Destailleur
3de8381c20 Website module 2018-09-10 19:36:46 +02:00
Laurent Destailleur
47cfda6734 Webiste 2018-09-10 09:09:51 +02:00
Frédéric FRANCE
0e0db9d1ee
remove deprecated 2018-09-09 15:52:55 +02:00
Laurent Destailleur
5719a38ea7 Work on website module. Support now links to company logos. 2018-09-09 14:05:23 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
e73bd6da6b
completly comment unused code 2018-09-09 13:29:58 +02:00
Laurent Destailleur
a5edd530d2 Fix delete of website 2018-09-08 14:10:07 +02:00
Laurent Destailleur
a2b71d9a7a NEW Can delete a website in experimental website module 2018-09-08 12:04:40 +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
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
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
c013f9cf3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm
NEW hook formConfirm always called if hooked
2018-09-01 14:50:08 +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