Laurent Destailleur
|
716f765ce1
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
|
2020-02-08 16:00:06 +01:00 |
|
Laurent Destailleur
|
83598a0b53
|
FIX After import of a website template, home page was not set
|
2020-02-06 23:35:04 +01:00 |
|
Laurent Destailleur
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
3a9e238dc6
|
FIX Missing value of $formconfirm as parameters of hook
|
2020-01-28 12:00:27 +01:00 |
|
Scrutinizer Auto-Fixer
|
0aa156db78
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-16 01:54:00 +00:00 |
|
Laurent Destailleur
|
4716b82249
|
Fix clone of page
|
2020-01-11 14:44:12 +01:00 |
|
Laurent Destailleur
|
c6c321b004
|
Fix website when ckeditor is off
|
2020-01-09 17:28:08 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
1af67a4336
|
Merge pull request #12713 from frederic34/doxygen_warning
doxygen
|
2019-12-16 19:02:10 +01:00 |
|
Laurent Destailleur
|
98cc2c2886
|
Add tooltip
|
2019-12-16 14:29:47 +01:00 |
|
Frédéric FRANCE
|
9e4fb8d4fe
|
doxygen
|
2019-12-15 10:02:20 +01:00 |
|
Laurent Destailleur
|
a6ca56a7e1
|
Fix navigation backtopage and "save and stay"
|
2019-12-08 15:57:51 +01:00 |
|
Laurent Destailleur
|
dbbe40ca3d
|
Fix link
|
2019-12-07 19:09:45 +01:00 |
|
Laurent Destailleur
|
f35577d792
|
Fix backtopage link
|
2019-12-07 19:08:40 +01:00 |
|
Laurent Destailleur
|
0e063a3bb3
|
Fix hreflang tag (must include itself)
|
2019-12-07 15:46:14 +01:00 |
|
Laurent Destailleur
|
3030a9fa2a
|
Fix manifest file was saved but not enabled.
|
2019-12-07 13:09:55 +01:00 |
|
Laurent Destailleur
|
cdb0453661
|
Help
|
2019-12-05 14:17:40 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
Laurent Destailleur
|
32a539a8c0
|
Update website templates
|
2019-12-02 09:19:05 +01:00 |
|
Laurent Destailleur
|
aedec91b5d
|
Fix phpcs
|
2019-11-30 10:55:29 +01:00 |
|
Laurent Destailleur
|
a8b9cc1286
|
Fix export of image
|
2019-11-29 23:19:23 +01:00 |
|
Laurent Destailleur
|
1bace80a9b
|
Fix the home page is not set on first page created
|
2019-11-24 20:59:17 +01:00 |
|
Laurent Destailleur
|
24bb345ee1
|
Fix bad name of function
|
2019-11-22 15:35:19 +01:00 |
|
Laurent Destailleur
|
f40fdad06c
|
Fix link between translations
|
2019-11-16 12:54:05 +01:00 |
|
Laurent Destailleur
|
53bbfcff6b
|
Fix link translation of
|
2019-11-16 12:43:32 +01:00 |
|
Laurent Destailleur
|
2d73dc8f5c
|
Fix new line
|
2019-11-16 12:17:37 +01:00 |
|
Laurent Destailleur
|
56c2dc2614
|
Reduce need of translations
|
2019-11-12 22:29:36 +01:00 |
|
Laurent Destailleur
|
2c826d73bd
|
Fix translation
|
2019-11-12 14:07:56 +01:00 |
|
Scrutinizer Auto-Fixer
|
df664e790b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 23:15:34 +00:00 |
|
Laurent Destailleur
|
0bcd4c630d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-10 18:14:07 +01:00 |
|
Laurent Destailleur
|
2b63e2963a
|
Set autofocus
|
2019-11-10 18:13:55 +01:00 |
|
stickler-ci
|
278e3a7076
|
Fixing style errors.
|
2019-11-10 11:23:37 +00:00 |
|
Philippe GRAND
|
9b0debfd08
|
add some comment
|
2019-11-10 12:22:24 +01:00 |
|
Laurent Destailleur
|
dcdcd7c67e
|
Look and feel v11
|
2019-11-09 12:03:11 +01:00 |
|
Laurent Destailleur
|
e1f676f2f7
|
Fix css fro website
|
2019-11-09 11:30:08 +01:00 |
|
Scrutinizer Auto-Fixer
|
812d0af1d9
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 14:51:54 +00:00 |
|
Scrutinizer Auto-Fixer
|
0b406172fd
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-07 11:59:59 +00:00 |
|
Laurent Destailleur
|
4433cff49d
|
Merge pull request #12346 from frederic34/centpercent
100% centpercent
|
2019-11-07 10:39:09 +01:00 |
|
Laurent Destailleur
|
4455a21dab
|
Disable not finished dev
|
2019-11-06 19:02:15 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
ec8bd6327d
|
Fix css
|
2019-11-04 18:53:46 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Laurent Destailleur
|
0e7a868087
|
translation og pages
|
2019-10-31 21:27:25 +01:00 |
|
Laurent Destailleur
|
f98df3c807
|
NEW Can edit link to the translation page in website module
|
2019-10-31 21:09:33 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
a7797ba1da
|
clean indent in variants directory
|
2019-10-26 20:53:39 +02:00 |
|
Laurent Destailleur
|
b21bca17de
|
Add button Save and stay when editing property of web site
|
2019-10-21 00:55:52 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
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 |
|