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
|
f385e02c53
|
FIX title button attribute id empty
|
2020-08-13 17:43:18 +02:00 |
|
Laurent Destailleur
|
ada7b74ba1
|
Fix phpcs
|
2020-08-07 14:56:30 +02:00 |
|
Laurent Destailleur
|
5482a3134a
|
Merge pull request #14355 from fmarcet/10.0
Fix: User can see events that are not assigned to it
|
2020-08-07 14:54:39 +02:00 |
|
Laurent Destailleur
|
284378232b
|
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
FIX : JS CRASH - bad usage of moreparam
|
2020-08-07 10:10:09 +02:00 |
|
Laurent Destailleur
|
37f1b27bd2
|
Fix phpcs
|
2020-08-06 03:55:47 +02:00 |
|
Laurent Destailleur
|
b40177a8c8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-06 03:00:16 +02:00 |
|
Laurent Destailleur
|
641d9a6565
|
Fix number to string
|
2020-08-06 02:58:07 +02:00 |
|
Laurent Destailleur
|
ce960c8d0d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-06 02:53:19 +02:00 |
|
Laurent Destailleur
|
0b7aec1fa0
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/lib/functionsnumtoword.lib.php
|
2020-08-06 02:52:54 +02:00 |
|
Laurent Destailleur
|
73ea5b0e2d
|
Fix function to convert price to string
|
2020-08-06 02:50:24 +02:00 |
|
stickler-ci
|
8d88217434
|
Fixing style errors.
|
2020-08-04 14:48:15 +00:00 |
|
Ferran Marcet
|
70ad2fcee0
|
Fix: User can see events that are not assigned to it
|
2020-08-04 16:45:57 +02:00 |
|
Ferran Marcet
|
7a077a2d99
|
Fix: User can see events that are not assigned to it
|
2020-08-04 16:45:04 +02:00 |
|
Ferran Marcet
|
1a62a36b86
|
Merge remote-tracking branch 'origin/10.0' into 10.0
|
2020-08-04 16:40:01 +02:00 |
|
Ferran Marcet
|
7b6ef7aca8
|
Merge branch '10.0up' into 10.0
|
2020-08-04 16:39:40 +02:00 |
|
John Botella
|
11f14b8fe5
|
Fix bad usage of moreparam
|
2020-08-04 14:13:52 +02:00 |
|
stickler-ci
|
9926eac192
|
Fixing style errors.
|
2020-08-03 09:26:36 +00:00 |
|
quentin
|
72b2fb442b
|
fix test libelle
|
2020-08-03 11:17:39 +02:00 |
|
Ferran Marcet
|
63b15dd1b6
|
Fix: User can see events that are not assigned to it
|
2020-08-03 11:17:30 +02:00 |
|
Laurent Destailleur
|
930ae84dac
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
|
2020-07-29 13:50:31 +02:00 |
|
Laurent Destailleur
|
566f683c54
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-07-29 13:40:19 +02:00 |
|
VERDOL Gauthier
|
25994e61bc
|
FIX : We need to see unit line on PDF even though it's an option
|
2020-07-27 16:04:21 +02:00 |
|
Laurent Destailleur
|
fd95551940
|
Fix upload of file in import module
Conflicts:
htdocs/core/lib/security.lib.php
|
2020-07-09 21:52:27 +02:00 |
|
Laurent Destailleur
|
8dee17446d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/lib/company.lib.php
|
2020-06-28 21:46:08 +02:00 |
|
Florian Mortgat
|
ccfe6f18fe
|
FIX 10.0 - fatal with postgres
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
|
2020-06-25 16:06:16 +02:00 |
|
Laurent Destailleur
|
6d6abd4320
|
FIX vulenrability reported by wizlynx WLX-2020-012
|
2020-06-17 14:45:15 +02:00 |
|
Laurent Destailleur
|
23df5596e8
|
FIX vulenrability reported by wizlynx WLX-2020-012
|
2020-06-17 13:42:38 +02:00 |
|
Laurent Destailleur
|
6660923e94
|
FIX Privilege escalation reported by wizlynx WLX-2020-011
|
2020-06-17 13:29:43 +02:00 |
|
Florian Mortgat
|
5bc80f8626
|
FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax
|
2020-06-10 16:22:48 +02:00 |
|
Laurent Destailleur
|
a207365bd2
|
FIX XSS using the renaming of .noexe files - reported by Nolan.
|
2020-05-27 13:12:18 +02:00 |
|
Laurent Destailleur
|
0cd05887ce
|
FIX count of open day when date and start are not open should be 0
|
2020-05-07 17:21:27 +02:00 |
|
Laurent Destailleur
|
160009630f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/tools/dolibarr_export.php
|
2020-05-01 21:57:28 +02:00 |
|
Laurent Destailleur
|
b41b22996f
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
|
2020-05-01 21:03:16 +02:00 |
|
Laurent Destailleur
|
82ace4b4ef
|
FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
|
2020-04-30 11:52:30 +02:00 |
|
Frédéric FRANCE
|
1aafd4667b
|
fix countable php7 warning
|
2020-04-24 11:57:23 +02:00 |
|
Laurent Destailleur
|
7bc8a70b0a
|
FIX #13670
|
2020-04-22 18:23:48 +02:00 |
|
Maxime Kohlhaas
|
817e16d652
|
Fix birthdays boxes and filter on month
|
2020-04-18 20:01:18 +02:00 |
|
Laurent Destailleur
|
86eaa78f1e
|
FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
DOL_DOCUMENT_DIR.
|
2020-04-15 20:00:27 +02:00 |
|
Maxime Kohlhaas
|
f5ab957faf
|
FIX #13535 : state in italian address
|
2020-04-11 17:56:23 +02:00 |
|
Laurent Destailleur
|
47987f239d
|
Fix trans
|
2020-04-05 15:42:39 +02:00 |
|
Laurent Destailleur
|
13b47774e2
|
FIX #13424
|
2020-04-05 11:55:43 +02:00 |
|
Laurent Destailleur
|
a13287e285
|
Fix: validate of object is ok even if some fields are missing
|
2020-04-03 14:56:15 +02:00 |
|
Laurent Destailleur
|
70706d9ea7
|
FIX Missing token and take into account max date when it can.
|
2020-04-01 18:48:45 +02:00 |
|
Laurent Destailleur
|
9fcbec9f02
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-03-30 19:36:07 +02:00 |
|
Francis Appels
|
3eda785ca5
|
Add newline end of file
|
2020-03-30 10:36:49 +02:00 |
|
Francis Appels
|
076caa11ab
|
Add token functions to improve modulebuilder compatiblity with maintained versions.
|
2020-03-30 10:28:20 +02:00 |
|
gauthier
|
4c0de74470
|
FIX : sort by default role makes no sense
|
2020-03-24 16:27:53 +01:00 |
|
Laurent Destailleur
|
a5379c7144
|
FIX All forms must use newToken()
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
|
2020-03-24 13:14:23 +01:00 |
|
Laurent Destailleur
|
bcf17c79ef
|
FIX closing tags
|
2020-03-22 02:44:00 +01:00 |
|