Commit Graph

694 Commits

Author SHA1 Message Date
Laurent Destailleur
c69631d646 Fix css for multiselect component that are fist hidden 2021-01-18 11:05:02 +01:00
Laurent Destailleur
b6bb08ec2e Fix management of hreflang 2020-12-19 13:44:15 +01:00
Laurent Destailleur
fe93ee4d08 Debug website module for multilanguage 2020-12-19 13:03:40 +01:00
Laurent Destailleur
25e4791497 Fix missing creation of master.inc.php file in website import 2020-12-18 14:27:22 +01:00
Laurent Destailleur
a64f30d23e Fix message 2020-12-15 00:16:58 +01:00
Laurent Destailleur
2f8ee92c51 Fix CSS 2020-12-11 02:02:41 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
1f83e22aea Fix set of translation of website page during cloning 2020-12-06 15:59:19 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
800f8977b9 Fix tooltips 2020-12-01 20:00:02 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
6af9c9f857 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-11-30 07:50:26 +01:00
Laurent Destailleur
b6ccfaf180 css 2020-11-30 07:50:14 +01:00
Laurent Destailleur
e1a6e8f2fc CSS
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Frédéric FRANCE
2480e1ab9e
doxygen 2020-11-24 22:31:03 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
44f532e1da Fix look and feel v13 2020-10-31 03:50:16 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
858c48bd15 Fix 2020-10-25 22:12:16 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
d1c2772ee7 NEW Add function dolButtonToOpenUrlInDialogPopup() to be able to open
any url into a dialog popup.
2020-10-07 12:31:15 +02:00
Laurent Destailleur
ce0fa53cb0 Fix delete of file from file manager 2020-10-02 03:07:31 +02:00
Laurent Destailleur
14736bee63
Merge pull request #14852 from inovea-conseil/newfieldwebsite
NEW website page fields
2020-10-01 19:31:14 +02:00
Florian
c89f8b323b Rename fk_typeobject to type_object 2020-10-01 15:18:19 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
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
Laurent Destailleur
dd5b5e9bbf Fix lang suggested in clone of page 2020-06-06 17:12:37 +02:00
Laurent Destailleur
8023bc2fbb Fix cancel in media filemanager 2020-06-03 12:39:06 +02:00
Laurent Destailleur
51c578840c Fix cancel in media filemanager 2020-06-03 12:39:00 +02:00
Laurent Destailleur
93320deddc Fix cancel in media filemanager 2020-06-03 12:34:09 +02:00
Laurent Destailleur
66df7fca41 Fix cancel in media filemanager 2020-06-03 11:40:51 +02:00
Laurent Destailleur
2965dda815 Typo 2020-06-03 01:02:48 +02:00
Laurent Destailleur
a37a4031e9 FIX Delete of website page need permission. Conflict with mass action.
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1 FIX Delete of website page need permission. Conflict with mass action. 2020-06-03 00:46:09 +02:00
Laurent Destailleur
1992b633ba Fix phpcs 2020-05-28 20:02:07 +02:00
Laurent Destailleur
ada9c9addc Fix count of records 2020-05-27 15:37:30 +02:00
Laurent Destailleur
7c653c0873 Fix count of records 2020-05-27 15:36:16 +02:00
Laurent Destailleur
00e88fcf76 Fix backtourl 2020-05-27 15:26:38 +02:00
Laurent Destailleur
264c1d6491 List website into combo sorted by position, ref fields 2020-05-27 14:50:10 +02:00
Laurent Destailleur
da8bd7507e NEW Add mass action to set category on a list of website pages. 2020-05-26 22:29:46 +02:00
Laurent Destailleur
d51bf44f55 Add picto 2020-05-26 12:53:58 +02:00
Laurent Destailleur
05ac3de2f0 Enhance search / filter 2020-05-26 12:46:51 +02:00
Laurent Destailleur
2d30d33303 NEW Can filter on container type, language and tags in the list of pages
of website module.
2020-05-26 12:25:41 +02:00
Laurent Destailleur
3aaefd15b0 Fix set of categories 2020-05-26 01:07:43 +02:00
Laurent Destailleur
5f90596bb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 00:20:36 +02:00
Laurent Destailleur
f9f5beb064 NEW Can set tags/categories to website pages. 2020-05-26 00:19:32 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
748a120b71 Show button for categories if module is enabled 2020-05-23 15:50:15 +02:00
Laurent Destailleur
d4b1485c97 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:11:30 +02:00
Laurent Destailleur
755c47f900 Fix save of wrapper missing 2020-05-23 13:10:33 +02:00
Laurent Destailleur
333ae9d496 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 12:58:18 +02:00
Laurent Destailleur
aff2872fc1 Fix RSS 2020-05-23 12:57:58 +02:00
Laurent Destailleur
50d063256e NEW Povide a RSS Feed for blogposts 2020-05-23 12:54:06 +02:00
Laurent Destailleur
e947ddba10 Fix RSS feed 2020-05-23 12:51:44 +02:00
Laurent Destailleur
f2c02f5559 FIX Language for RSS 2020-05-23 12:41:06 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 08:27:12 +02:00
Laurent Destailleur
38c8ebd627 Add link into toolbar to create website tags 2020-05-22 01:01:27 +02:00
Laurent Destailleur
5d78f6dac5 NEW Add link to edit property from search result of website pages 2020-05-22 00:38:01 +02:00
stickler-ci
459154edc0 Fixing style errors. 2020-05-21 13:11:06 +00:00
Frédéric FRANCE
def53338de
add new rule 2020-05-21 09:07:10 +02:00
Laurent Destailleur
3b7f3cf76a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 13:20:12 +02:00
Laurent Destailleur
00f189c921 Introduce button to allow migration of files from old version at once 2020-05-20 13:19:32 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
Laurent Destailleur
3e187f8ce0 Fix add check on size limit 2020-05-19 03:36:29 +02:00
Laurent Destailleur
d35a24ee76 Removed not expected file 2020-05-19 01:36:33 +02:00
Laurent Destailleur
d89c9abcb6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 00:53:01 +02:00
Laurent Destailleur
7b29ce036a Fix input of virtual host and canonical url 2020-05-19 00:50:30 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
0842259012 Fix lang must be set to null and not 0 when not defined 2020-05-14 18:56:07 +02:00
Laurent Destailleur
a660fd61c9 Fix lang must be set to null and not 0 when not defined 2020-05-14 18:55:20 +02:00
Laurent Destailleur
40fa0933eb Fix on sarch pages 2020-05-14 18:44:21 +02:00
Laurent Destailleur
4cf7f68b6c Fix search on pages 2020-05-14 18:44:05 +02:00
Laurent Destailleur
d8ee049b4c Can select not defined language 2020-05-14 18:41:31 +02:00
Laurent Destailleur
40d30f9a60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 18:37:47 +02:00
Laurent Destailleur
1bf677f537 Can set status of a websitepage 2020-05-14 18:14:55 +02:00
Laurent Destailleur
949e0f2326 Fix filter on language 2020-05-14 17:27:12 +02:00
Laurent Destailleur
f6e0553093 fix var_dump 2020-05-04 14:29:57 +02:00
Laurent Destailleur
358bc6d5df Fix search on entities 2020-05-04 14:29:25 +02:00
Laurent Destailleur
d27ccb0233 Fix pb of lang subdir in exporting website 2020-05-03 14:58:53 +02:00
Laurent Destailleur
da91a857a5 Fix pb of lang subdir in cloning website 2020-05-03 14:49:06 +02:00
Laurent Destailleur
77cf9fb569 Add .dolibarr file into CMS 2020-05-03 14:28:23 +02:00
Laurent Destailleur
fcee3a68f4 Fix sort on file manager of website 2020-05-03 13:00:39 +02:00
Laurent Destailleur
c4b87d01ce Fix non traversable var 2020-05-02 03:36:01 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
46716f2259 Typo 2020-04-23 12:34:37 +02:00
Laurent Destailleur
fa056e59df Look and feel v12 2020-04-20 02:14:43 +02:00
Laurent Destailleur
162cd94138 FIX Keep sort order after deletion of a file into file manager. 2020-04-17 12:32:05 +02:00