Laurent Destailleur
|
f442dac2c9
|
Add token on most GET url for admin action
|
2020-09-30 15:13:28 +02:00 |
|
Nicolas
|
e58d0d4af4
|
FIX Stickler error
|
2020-09-28 20:56:19 +02:00 |
|
Nicolas
|
848ee9decf
|
FIX Stickler error
|
2020-09-28 20:49:51 +02:00 |
|
Nicolas
|
dfba9a06ad
|
NEW Field to link website page to an other object
|
2020-09-28 20:39:02 +02:00 |
|
Inovea Conseil
|
789defa46f
|
Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite
|
2020-09-28 20:08:22 +02:00 |
|
Florian
|
bdb38da9d3
|
Add 2 new field typeObject and ObjectId to website
|
2020-09-28 18:17:23 +02:00 |
|
Laurent Destailleur
|
3c6dda9dd5
|
Clean code
|
2020-09-25 10:27:30 +02:00 |
|
Laurent Destailleur
|
0cced26e46
|
fix phpunit
|
2020-09-23 19:23:33 +02:00 |
|
Laurent Destailleur
|
09c6761dae
|
NEW Include the tag editor of page as a popup into website editor
|
2020-09-23 16:36:19 +02:00 |
|
Laurent Destailleur
|
d38168f49e
|
Fix escape
|
2020-09-19 22:59:04 +02:00 |
|
Laurent Destailleur
|
c4b5f5a249
|
Maxi clean of code
|
2020-09-18 01:29:17 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
b8fe2188a6
|
Standardize code around model_pdf
|
2020-09-10 01:49:09 +02:00 |
|
Laurent Destailleur
|
ad87e753b4
|
Clean trim on GETPOST (already included inside GETPOST when not 'none'
|
2020-08-28 21:27:50 +02:00 |
|
Laurent Destailleur
|
bf1f295602
|
NEW Can disable, from edit page, the whole web site
FIX position of a cloned website
|
2020-08-04 02:50:56 +02:00 |
|
Laurent Destailleur
|
7239232528
|
Add total
|
2020-08-02 16:28:59 +02:00 |
|
Laurent Destailleur
|
d685aec482
|
css
|
2020-08-02 16:19:34 +02:00 |
|
Laurent Destailleur
|
367914015c
|
NEW Add a counter of number of words of pages in website module
|
2020-08-02 15:53:34 +02:00 |
|
Laurent Destailleur
|
6046f1f9d6
|
css
|
2020-07-09 14:12:19 +02:00 |
|
Laurent Destailleur
|
e6b241a083
|
NEW Show tags and status in search list of website pages
|
2020-07-09 14:07:41 +02:00 |
|
Laurent Destailleur
|
cfcb40dd2a
|
Fix scrutinizer errors
|
2020-07-02 03:48:32 +02:00 |
|
Laurent Destailleur
|
88cf904ced
|
Fix edit of tag of website
|
2020-06-30 02:50:58 +02:00 |
|
Laurent Destailleur
|
a607ff4c1a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
|
2020-06-18 15:50:31 +02:00 |
|
Laurent Destailleur
|
dc70cab2cb
|
Fix tooltip
|
2020-06-17 22:29:05 +02:00 |
|
Laurent Destailleur
|
b763b40d8c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-12 19:37:27 +02:00 |
|
Laurent Destailleur
|
c90ab62989
|
Fix We must include version into filename
|
2020-06-12 15:31:12 +02:00 |
|
Laurent Destailleur
|
2a20fc3968
|
Fix missing author into export_alias
|
2020-06-12 15:27:28 +02:00 |
|
Laurent Destailleur
|
6e81542148
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-12 14:36:11 +02:00 |
|
Laurent Destailleur
|
5d5fb46af6
|
Fix We never add .noexe of files into medias dir
|
2020-06-12 14:35:50 +02:00 |
|
Laurent Destailleur
|
ee611fa7a0
|
Fix bad definition of field for parent
|
2020-06-11 18:32:05 +02:00 |
|
Laurent Destailleur
|
c289001507
|
Fix bad definition of field for parent
|
2020-06-11 18:31:26 +02:00 |
|
Laurent Destailleur
|
5794b1abea
|
Fix for use with text browser
Conflicts:
htdocs/main.inc.php
|
2020-06-10 12:46:55 +02:00 |
|
Laurent Destailleur
|
bd22ad4174
|
Fix for use with text browser
|
2020-06-10 12:35:39 +02:00 |
|
Laurent Destailleur
|
c175fbd697
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/website/class/website.class.php
htdocs/website/index.php
|
2020-06-09 22:09:57 +02:00 |
|
Laurent Destailleur
|
756ef0b583
|
Fix disallow < > into meta info
Fix message page regenerated
|
2020-06-09 21:43:42 +02:00 |
|
Laurent Destailleur
|
0f1447cf05
|
Fix position of clone
|
2020-06-08 23:42:48 +02:00 |
|
Laurent Destailleur
|
738fa35471
|
Fix clone web site
|
2020-06-08 23:37:49 +02:00 |
|
Laurent Destailleur
|
ff9312c96a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
|
2020-06-08 20:36:54 +02:00 |
|
Laurent Destailleur
|
2e06ce306a
|
Tooltip
|
2020-06-08 15:03:10 +02:00 |
|
Laurent Destailleur
|
6ec2ff01f1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/website/index.php
|
2020-06-07 23:15:13 +02:00 |
|
Laurent Destailleur
|
f7563818ac
|
css
|
2020-06-07 23:12:56 +02:00 |
|
Laurent Destailleur
|
148bdec96f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 20:25:24 +02:00 |
|
Laurent Destailleur
|
fb02edf254
|
Fix For select language component, we force on root
|
2020-06-06 20:25:05 +02:00 |
|
Laurent Destailleur
|
788ec1f87d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 20:18:51 +02:00 |
|
Laurent Destailleur
|
34778937c3
|
Fix link to image
|
2020-06-06 20:16:07 +02:00 |
|
Laurent Destailleur
|
f00b2d1e6f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 20:11:57 +02:00 |
|
Laurent Destailleur
|
2d87da8815
|
Fix link
|
2020-06-06 20:11:01 +02:00 |
|
Laurent Destailleur
|
88aaec63f7
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 18:57:41 +02:00 |
|
Laurent Destailleur
|
7061e9b4cb
|
Fix deletion of website page
|
2020-06-06 18:57:24 +02:00 |
|
Laurent Destailleur
|
3197f717c3
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 17:12:58 +02:00 |
|