Commit Graph

5372 Commits

Author SHA1 Message Date
Laurent Destailleur
ca7ce63648 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/societe/class/societe.class.php
2019-09-02 23:04:15 +02:00
Laurent Destailleur
a126b1e538 FIX Add char $ and ; in sanitizing of filenames. 2019-09-02 22:25:44 +02:00
Laurent Destailleur
a96742ee9b Can search into global site files.
Support of cancel to previous page
2019-09-02 18:43:22 +02:00
Laurent Destailleur
c068177027 Work on search on global site files 2019-09-02 16:39:56 +02:00
Laurent Destailleur
29d2e7edd0 missing reposition 2019-09-02 04:39:36 +02:00
Laurent Destailleur
ee15ccf82e missing reposition 2019-09-02 04:28:55 +02:00
Laurent Destailleur
40890ae345 Fix scrutinizer 2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Laurent Destailleur
7f5728ead9 A better message when database is off. 2019-08-31 19:39:39 +02:00
Laurent Destailleur
2f49fc6a7b Fix scrutinizer 2019-08-31 02:49:54 +02:00
Laurent Destailleur
a3e221468a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
Laurent Destailleur
01962cbc67 Clean code 2019-08-29 13:17:14 +02:00
Laurent Destailleur
ff7c122b6d Add class specific to web page ref 2019-08-29 02:36:32 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619 Fix compatibility with old multicompany modules 2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09 NEW Add option multiselect for developers on the selector of language. 2019-08-28 16:06:19 +02:00
Laurent Destailleur
c0262f1e19 Fix type integer 2019-08-28 12:24:56 +02:00
Laurent Destailleur
9109eeaa77 Fix type integer 2019-08-28 12:24:35 +02:00
Laurent Destailleur
7236df37d4 FIX error management when adding a property with type real 2019-08-28 12:16:59 +02:00
Laurent Destailleur
ed42f59201 FIX error management when adding a property with type real 2019-08-28 12:10:28 +02:00
Laurent Destailleur
e3a4ad00d7 Code comment 2019-08-28 10:22:40 +02:00
Laurent Destailleur
04e11bcbd1 Doxygen 2019-08-27 20:35:42 +02:00
Laurent Destailleur
4ceb3c2e85 Add context 'ws' for web services authentication. 2019-08-27 20:35:06 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Laurent Destailleur
60c3cefc53 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:44:39 +02:00
Laurent Destailleur
69b2d03c47 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:41:59 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
2019-08-22 12:39:07 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354 Merge pull request #11685 from ptibogxiv/patch-224
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-22 11:25:08 +02:00
Regis Houssin
90f60b0137 FIX add $context parameter in checkLoginPassEntity 2019-08-22 10:56:07 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
Laurent Destailleur
bfbabbf626 Update geoip v1 2019-08-21 18:26:41 +02:00
Laurent Destailleur
689aa4979e Code comment 2019-08-21 17:28:54 +02:00
Laurent Destailleur
2c3b2cd1a0 Look and feel 2019-08-21 04:21:43 +02:00
Laurent Destailleur
c60fc6c3d4 Add param logcontext on dol_syslog 2019-08-20 13:57:25 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
cc3fd0f1f6 Merge pull request #11679 from atm-john/develop_new_task_progress_bar
FIX/NEW task widget and add task progress bar
2019-08-19 10:05:16 +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
4fd68798a3 Fix phpcs 2019-08-18 20:38:51 +02:00
Laurent Destailleur
2f46b40da2 Prepare feature "Never show this message again" 2019-08-18 18:36:18 +02:00
Laurent Destailleur
7e4cf224ec Merge branch 'develop' into develop_new_task_progress_bar 2019-08-18 05:38:45 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
b8e1cc8d16 Enhance #11643 2019-08-18 03:42:38 +02:00
Laurent Destailleur
467ad3ed22 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/product/stock/card.php
2019-08-16 21:48:46 +02:00