Commit Graph

77183 Commits

Author SHA1 Message Date
Laurent Destailleur
1e93d3d790 Prepare v10.0.2 2019-08-16 17:03:11 +02:00
Laurent Destailleur
b63c4b74b8 Code comment 2019-08-16 16:56:28 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Laurent Destailleur
12e6dabc43 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-15 20:41:56 +02:00
Laurent Destailleur
64e52789d6 FIX #11591 FIX #11592 2019-08-15 20:39:47 +02:00
Laurent Destailleur
a8afb4549a
Merge pull request #11634 from fmarcet/9.0
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-15 20:22:27 +02:00
Laurent Destailleur
38fc05866d
Merge pull request #11619 from simnandez/10.0
Fix: allow access from any other class that inherits Form class.
2019-08-15 19:48:41 +02:00
Laurent Destailleur
ac8bf7b066
Update propal.class.php 2019-08-15 19:48:29 +02:00
Laurent Destailleur
c131af5ae1 FIX #11672 2019-08-15 19:16:52 +02:00
Laurent Destailleur
9cb5ba35dd
Merge pull request #11681 from hregis/10.0_mc
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
2019-08-15 19:08:42 +02:00
Laurent Destailleur
4534826583
Merge pull request #11633 from fmarcet/10.0
FIX: Make protected all pfd models functions
2019-08-15 19:04:32 +02:00
Laurent Destailleur
12bebdefbb Fix can replace PclZip with ZipArchive 2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091 FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 04:07:02 +02:00
Laurent Destailleur
4a20c99656 FIX Content send before header warning 2019-08-14 04:06:50 +02:00
Laurent Destailleur
6de2118f11 FIX Bad error management in zip compress and web site export
Conflicts:
	htdocs/website/index.php
2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7 FIX Missing some replacements in website module
Conflicts:
	htdocs/website/index.php
2019-08-14 04:02:57 +02:00
Laurent Destailleur
b443b1b372 FIX permission check on API intervention 2019-08-13 14:21:43 +02:00
Regis Houssin
34579dd4db FIX phpcs 2019-08-13 07:46:03 +02:00
Regis Houssin
056f51bfc5 FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme 2019-08-13 07:14:42 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
52d34edb03 FIX USEDOLIBARREDITOR not always set 2019-08-13 05:23:10 +02:00
Laurent Destailleur
8e0a023270 FIX Disabling a website does not put it offline 2019-08-13 05:05:19 +02:00
Laurent Destailleur
77c96a49e1 Update website template 2019-08-13 04:53:47 +02:00
Laurent Destailleur
f4e58aab22 FIX Enable web site 2019-08-13 04:49:49 +02:00
Laurent Destailleur
ac57e527ce Fix translation 2019-08-12 19:01:23 +02:00
Laurent Destailleur
b3e9cf3be7 Sync transifex 2019-08-12 17:37:23 +02:00
Juanjo Menent
7dab396d08 Fix: error creating a budget from an intervention 2019-08-12 17:29:25 +02:00
Laurent Destailleur
5346135a0c Fix removed duplicate load 2019-08-12 17:12:57 +02:00
Laurent Destailleur
446f0590dc FIX VAT number for Monaco (it uses FR) 2019-08-12 13:45:04 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Laurent Destailleur
00660d4885 Fix responsive 2019-08-12 02:52:36 +02:00
Laurent Destailleur
49e2f447a8 Fix responsive 2019-08-12 02:41:27 +02:00
Laurent Destailleur
5ca988b3d2 Fix position of requests 2019-08-12 02:36:15 +02:00
Laurent Destailleur
e21d6289ea FIX Can't add a new chart of account 2019-08-10 02:09:59 +02:00
Laurent Destailleur
9c92acadaa Fix lang 2019-08-10 01:51:50 +02:00
Laurent Destailleur
d0f1a23f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:44:08 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-08-10 01:43:52 +02:00
Laurent Destailleur
babeb52986
Merge pull request #11624 from ptibogxiv/patch-208
Fix update stripe api for more compliance to API
2019-08-10 01:39:31 +02:00
Laurent Destailleur
5dc2fd8ca0
Merge pull request #11621 from ptibogxiv/patch-205
Fix application_fee_amount
2019-08-10 01:38:30 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
Laurent Destailleur
0cb1210acc
Merge pull request #11622 from ptibogxiv/patch-206
Fix table in admin stripe.php
2019-08-10 01:33:57 +02:00
Laurent Destailleur
13a8ef8258
Merge pull request #11618 from ptibogxiv/patch-203
FIX author in message / ticket API
2019-08-10 01:33:21 +02:00
Laurent Destailleur
c647195689
Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields
FIX delivery extrafields
2019-08-10 01:28:46 +02:00
Laurent Destailleur
76b0f42d4c
Merge pull request #11620 from ptibogxiv/patch-204
FIX document list for products in API
2019-08-10 01:27:52 +02:00
Laurent Destailleur
6089547e0e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:26:18 +02:00
Laurent Destailleur
46a5c05b75
Merge pull request #11623 from ptibogxiv/patch-207
FIX round for application fee in stripe
2019-08-10 01:25:07 +02:00
Laurent Destailleur
eea5ad9b81
Merge pull request #11627 from ptibogxiv/patch-209
FIX display payment intent in stripe's charge list
2019-08-10 01:23:06 +02:00
Laurent Destailleur
ab370137a8
Merge pull request #11628 from ptibogxiv/patch-210
FIX display only stripe sources for customer
2019-08-10 01:21:41 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
Laurent Destailleur
049a08f435
Merge pull request #11631 from frederic34/patch-9
Update admin.lang
2019-08-10 01:15:28 +02:00