Commit Graph

77208 Commits

Author SHA1 Message Date
Laurent Destailleur
a19228ccc0 Fix compatibility with twofactor
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 10:53:42 +02:00
Laurent Destailleur
9bd229bc7a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/modules.php
2019-08-21 16:04:34 +02:00
Laurent Destailleur
ed7480ddbb Fix phpcs 2019-08-21 16:03:49 +02:00
Laurent Destailleur
1b21905c55 Fix test on uploaded modules
Conflicts:
	htdocs/admin/modules.php
2019-08-21 14:53:58 +02:00
Laurent Destailleur
e75d7e4686 Fix test on uploaded modules 2019-08-21 14:51:48 +02:00
Laurent Destailleur
f98d3c5c48 FIX Do not show tooltip if tooltip is empty 2019-08-20 14:08:30 +02:00
Laurent Destailleur
def0311f9d Fix translation 2019-08-19 17:26:13 +02:00
Laurent Destailleur
15a765a79a Fix responsive 2019-08-19 13:28:24 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3 FIX too many record in sql request. Whena criteria is a filter, we must
use an inner join.
2019-08-18 23:59:24 +02:00
Laurent Destailleur
71be9f5b3f Fix test on terminal for 'cashdesk' module 2019-08-18 21:01:17 +02:00
Laurent Destailleur
cef88283b3 Fix missing error message 2019-08-18 20:52:18 +02:00
Laurent Destailleur
783e01588c FIX It was possible to create cashfence without entering data. 2019-08-18 20:47:40 +02:00
andreubisquerra
bbc1dfb0f7 Cashcontrol TakePOS fixes 2019-08-18 20:40:31 +02:00
Laurent Destailleur
477384105f FIX missing test on permission on button to delete ledger record 2019-08-18 19:25:36 +02:00
Laurent Destailleur
d8d927547f Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU 2019-08-18 19:09:53 +02:00
Laurent Destailleur
ad5f2dbe9d Fix update on id 2019-08-18 18:56:58 +02:00
Laurent Destailleur
8cf0671804 FIX Missing transaction 2019-08-18 18:56:21 +02:00
Laurent Destailleur
2ddf7c1d1f Fix responsive 2019-08-18 17:03:20 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00
Laurent Destailleur
898996da4a FIX vulenrability in uploading file found by 美创科技安全实验室 2019-08-16 21:45:13 +02:00
Laurent Destailleur
d51a651ab4 Fix phpcs 2019-08-16 17:35:12 +02:00
Laurent Destailleur
ee50c41e74 Fix phpcs 2019-08-16 17:34:23 +02:00
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