Commit Graph

539 Commits

Author SHA1 Message Date
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00
Laurent Destailleur
bf8ba511cb Fix missing index.php file on "regenerate all files" button for alt lang 2022-05-12 01:28:20 +02:00
Laurent Destailleur
82b65f3517
Merge pull request #20707 from hregis/fix_wrong_data_root_with_multicompany
NEW Module website now supports the multicompany module
2022-05-01 12:33:07 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Laurent Destailleur
9ff4903608 css 2022-04-02 19:52:12 +02:00
Laurent Destailleur
e9aab2188e css 2022-03-24 15:39:02 +01:00
lmarcouiller
43c39d833a Fix bug preview on closed status page 2022-03-16 15:56:39 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/doleditor.class.php
2022-03-03 00:16:55 +01:00
Laurent Destailleur
d15c303590 Fix missing button 2022-03-02 11:57:19 +01:00
Laurent Destailleur
b598671484 NEW ACE Editor is restored at same cursor position after a save 2022-02-27 14:46:40 +01:00
Laurent Destailleur
98da84f9b2 FIX #yogosha9086 2022-02-24 18:15:04 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
2d841d5b99 Fix param 2022-02-22 18:48:25 +01:00
Laurent Destailleur
eede3aaf17 Fix #yogosha9033 2022-02-21 22:50:32 +01:00
Laurent Destailleur
856b83a202 CSS 2022-02-07 09:26:03 +01:00
Laurent Destailleur
840e3b5bc3 Fix url 2022-02-03 19:21:59 +01:00
Laurent Destailleur
b1728a2129 css 2022-01-30 01:58:29 +01:00
Laurent Destailleur
9e86e5ce93 Fix creation of page 2022-01-30 01:46:14 +01:00
Laurent Destailleur
ed2ca6af79 CSS 2022-01-19 14:32:15 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Laurent Destailleur
2ba5f1369f Fix alternate 2021-11-28 15:53:55 +01:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
e8e63e85f1 NEW: Editing a page in website module keep old page with name .back 2021-10-20 17:08:33 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
2021-10-10 21:11:48 +02:00
Laurent Destailleur
ff5f371428 Fix add protection to avoid deletion of page when deleting a file 2021-10-10 20:46:06 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Laurent Destailleur
0168a9860b Fix tooltip on website syntax disappear
Fix backard compatibility of getLabelStatus
2021-09-18 12:09:08 +02:00
Laurent Destailleur
4e0ae972f1 Fix css 2021-09-07 17:26:31 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
2021-09-01 17:52:04 +02:00
Laurent Destailleur
3e4d7dfaba Fix $_SERVER["PHP_SEFL"] into $_SERVER["PHP_SELF"] 2021-09-01 17:44:54 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
lmarcouiller
0d70c81897 ix error in website module -> sitemap 2021-07-30 15:16:38 +02:00
Laurent Destailleur
8df9815049 Add warning to help understand bug of post_max_size. 2021-06-20 01:04:16 +02:00
Laurent Destailleur
4a3da84098 Clean code 2021-06-19 23:52:52 +02:00
Laurent Destailleur
2681d58107 FIx CVE ID: CVE-2021-33816 2021-06-09 16:41:31 +02:00
Laurent Destailleur
94467ea8cf Fix selection 2021-05-28 17:05:26 +02:00
Laurent Destailleur
a3c28edfbb Fix regenerate wrapper when rebuilding cache 2021-05-20 10:34:49 +02:00
Laurent Destailleur
1b25c4daa0 Fix phpcs 2021-05-17 11:29:51 +02:00
Laurent Destailleur
90d6f70bce Comment 2021-05-17 06:54:39 +02:00
Laurent Destailleur
5dfa18758c CSS 2021-05-07 01:36:59 +02:00
Laurent Destailleur
575d335374 Debug generation of webp 2021-05-01 15:12:30 +02:00
Laurent Destailleur
ae773ff938 FIX Disabled pages must not appears into sitemap 2021-04-27 12:12:45 +02:00
Laurent Destailleur
9941236d76 Fix alternate into sitemap 2021-04-27 11:47:33 +02:00
Laurent Destailleur
071fe087fd Fix replacement of sitemap entry in robot.txt 2021-04-27 11:29:47 +02:00
Laurent Destailleur
0d391ec185 Show name of sitemap file 2021-04-27 11:20:04 +02:00
Laurent Destailleur
b5868acf18 Fix phpcs 2021-04-19 15:30:30 +02:00
Laurent Destailleur
1988703a60 Bad test 2021-04-18 23:27:39 +02:00
Laurent Destailleur
a1acc896e2 Accept several sizes for favicon 2021-04-18 23:25:47 +02:00
Laurent Destailleur
97564bfcc9 css 2021-04-18 23:18:32 +02:00
Laurent Destailleur
69aa5553f5 Fix syntax error 2021-04-18 15:28:52 +02:00
Laurent Destailleur
10f1443d4a Debug sitemap generation. Bad format of date 2021-04-18 15:27:45 +02:00
Laurent Destailleur
cad7ea0b92 css 2021-04-18 15:07:22 +02:00
Laurent Destailleur
03f7ec13cf Can sort on language on list of website pages 2021-04-18 15:00:23 +02:00
Laurent Destailleur
8067e1d70a Fix order 2021-04-18 14:48:38 +02:00
Laurent Destailleur
fd3f2f4e27 Set order in sitemap 2021-04-18 14:46:14 +02:00
Laurent Destailleur
038b005e6a Fix sql error 2021-04-18 14:44:33 +02:00
Laurent Destailleur
08deb3c0e9 Fix selection of files to report into sitemap 2021-04-18 14:41:05 +02:00
Laurent Destailleur
20fb70d493 Fix syntax error 2021-04-18 14:34:08 +02:00
Laurent Destailleur
ecadc03b75 Fix sitemaps for multilang 2021-04-18 14:32:17 +02:00
Laurent Destailleur
ae595d8545 Fix sitemap 2021-04-18 14:18:05 +02:00
Laurent Destailleur
54c90059ff Fix sitemaps 2021-04-18 14:11:22 +02:00
Laurent Destailleur
3502c4c269 Debug sitemap generation 2021-04-18 13:45:46 +02:00
Laurent Destailleur
fbc28795bc Debug sitemap generation 2021-04-18 12:51:37 +02:00
Laurent Destailleur
70383cca73 Add protection to avoid to overwrite a page with another similar name 2021-04-11 18:49:17 +02:00
lmarcouiller
19ee78e123 Close #17193 : Move button convert in webp 2021-04-09 15:44:47 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
2021-04-09 14:17:41 +02:00
Laurent Destailleur
5fd9ee20eb
Merge branch 'develop' into develop#4 2021-04-08 15:42:07 +02:00
Laurent Destailleur
f8b5bee9eb Add function getListOfPossibleImageExt 2021-04-08 14:20:59 +02:00
Laurent Destailleur
638a4a6194
Merge pull request #17161 from Hystepik/develop#3
Close #17108 : New button to convert images in webp format
2021-04-08 14:06:45 +02:00
Laurent Destailleur
59c8e70fd2 Fix #yogosha4510 2021-04-07 23:43:10 +02:00
lmarcouiller
0611db68cf add of tooltip 2021-04-07 11:21:41 +02:00
lmarcouiller
49b3970700 Close #17113 : Can upload a favicon in website module 2021-04-07 11:13:14 +02:00
Indelog
17fa9559a3 Fix empty string WEBSITE_OTHERLANG
If post WEBSITE_OTHERLANG with empty value or with value like this
'en,,sv' or 'en,sv,' we can get an otherlang with empty value. This can lead
unexpected behaviour when we use an element of otherlang to set the
subdirectory name to store pages for a sub lang.
2021-04-07 09:29:40 +02:00
lmarcouiller
c04387ff3b Close #17108 : New button to convert images in webp format 2021-04-06 11:52:04 +02:00
Laurent Destailleur
7cba3f8a0a css 2021-04-05 12:41:39 +02:00
Laurent Destailleur
39fc2e6e60 NEW Save old page with .old in edition of a website page 2021-04-01 19:49:36 +02:00
Laurent Destailleur
6a8f4ac892 NEW Add permission "export website" 2021-03-20 19:30:08 +01:00
Laurent Destailleur
ac6b6f22e7 Enhance sanitizing of data 2021-03-18 11:39:23 +01:00
Laurent Destailleur
7755a44958 Reduce possible actions 2021-03-13 13:23:44 +01:00
Laurent Destailleur
ff2f93815f Fix backtourl 2021-03-13 12:33:26 +01:00
Laurent Destailleur
5e75da3319 Fix return page if error 2021-03-11 14:10:50 +01:00
Laurent Destailleur
26cb59e2f9 Enhance regeneration of pages 2021-03-11 14:10:08 +01:00
Frédéric FRANCE
15623ae852
fix 2021-03-02 16:39:04 +01:00
Frédéric FRANCE
5d78c3530b
test stickler 2021-03-02 16:34:04 +01:00
Laurent Destailleur
5af8e49c86 Fix permission on generated sitemap file 2021-03-02 15:08:03 +01:00
Laurent Destailleur
13e1ccb795
Update index.php 2021-03-02 14:55:42 +01:00
lmarcouiller
b097e909a6 changes to fix pr with eldy advices 2021-03-01 09:52:34 +01:00
Hystepik
460bc2dbde
Merge branch 'develop' into develop#5 2021-03-01 09:03:38 +01:00
Laurent Destailleur
79ed52c3d3 NEW Add last date of modification for website pages in list 2021-02-28 20:49:52 +01:00
Frédéric FRANCE
256001ebd6
code syntax website directory 2021-02-26 12:03:07 +01:00
Laurent Destailleur
0a7e692fbf Wip website module 2021-02-21 14:46:52 +01:00
Laurent Destailleur
b8007209cb Fix concat 2021-02-16 13:54:47 +01:00