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
|
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
|
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
|
eb6bd20132
|
Fix error message
|
2019-04-03 16:16:51 +02:00 |
|
Laurent Destailleur
|
65844bcb06
|
Fix detection of current page
|
2019-03-29 22:31:52 +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 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +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 |
|
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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
98c3657d45
|
Fix default status of website
|
2018-09-10 21:43:21 +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 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|