Commit Graph

620 Commits

Author SHA1 Message Date
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
d0c02f3714 FIX #yogosha4426 2020-09-16 14:51:46 +02:00
Laurent Destailleur
6dd1f522eb CSS 2020-09-14 22:30:22 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Alexandre SPANGARO
b3cd9688d5 Typo 2020-09-02 23:43:47 +02:00
Laurent Destailleur
a4c34c2bc5 NEW Add Manufacturing Orders into the automatic ECM 2020-08-23 15:19:03 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
lvessiller
d5acc85ef0 FIX param entity in html form file 2020-08-14 12:18:28 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu
Fix picto in search_page
2020-06-05 13:41:33 +02:00
Laurent Destailleur
8023bc2fbb Fix cancel in media filemanager 2020-06-03 12:39:06 +02:00
Laurent Destailleur
ae3d786593 Fix crop on media file manager
Conflicts:
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/photos_resize.php
	htdocs/theme/eldy/global.inc.php
2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc Fix cancel in media filemanager 2020-06-03 12:34:09 +02:00
Laurent Destailleur
8894570054 Fix crop on media file manager 2020-06-03 11:20:59 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +02:00
Laurent Destailleur
4af17a342c Doc 2020-06-01 00:00:24 +02:00
Laurent Destailleur
1992b633ba Fix phpcs 2020-05-28 20:02:07 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
796f97c671 Support tag $capture in input of files 2020-05-10 15:08:01 +02:00
Laurent Destailleur
4b34a6bd4a Look and feel 2020-05-04 12:43:47 +02:00
Laurent Destailleur
86928efb95 Var not defined 2020-04-23 13:35:40 +02:00
Laurent Destailleur
8d59ce2e03 Look and feel v12 2020-04-20 02:48:05 +02:00
Laurent Destailleur
f23266e560 css 2020-04-18 11:40:26 +02:00
Laurent Destailleur
7c6c600225 CSS 2020-04-18 11:38:24 +02:00
Laurent Destailleur
965bdf733d FIX Can overwrite file if exists in file manager 2020-04-17 13:10:18 +02:00
Laurent Destailleur
024abe8b58 FIX Preview of svg files into file manager 2020-04-17 12:34:35 +02:00
Laurent Destailleur
3740d59848 Look and feel v12 2020-04-13 04:14:28 +02:00
Laurent Destailleur
33a5288125 Add log 2020-04-11 16:34:59 +02:00
Tobias Sekan
91483fd560 Add optional remove action for showDocuments 2020-04-08 10:24:32 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2020-04-05 04:03:53 +02:00
Laurent Destailleur
a41f54c82f Fix css 2020-04-05 02:39:40 +02:00
Laurent Destailleur
e75e49426f Look and feel v12 2020-03-31 13:52:02 +02:00
Laurent Destailleur
94750ed350 css 2020-03-17 01:31:48 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Laurent Destailleur
9bc5eb44ca FIX #13182 2020-02-26 20:25:26 +01:00
Laurent Destailleur
05f0242198 NEW The info_admin() can show text after click on other text 2020-02-11 10:38:09 +01:00
pnueda
c083458adf Update html.formfile.class.php
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-08 16:18:52 +01:00
pnueda
8eb9c10788 Update html.formfile.class.php
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-07 18:01:14 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
John Botella
98bd4f3a66 Fix document module call 2019-12-16 09:44:08 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
5a17289e75 Fix crop for proposal image 2019-12-03 18:04:58 +01:00