Commit Graph

1883 Commits

Author SHA1 Message Date
Laurent Destailleur
0bd7d28fd9 Better log 2021-03-13 12:13:33 +01:00
Laurent Destailleur
60016cc3f3 Fix phpcs 2021-02-26 11:29:16 +01:00
Frédéric FRANCE
55a5e46527 code syntax comm directory 2021-02-23 20:26:57 +01:00
Laurent Destailleur
2346d8e12d Merge pull request #16371 from frederic34/patch-2
add log for token reclaimed
2021-02-22 14:22:44 +01:00
Frédéric FRANCE
1971f51973 Update main.inc.php 2021-02-22 11:24:21 +01:00
Laurent Destailleur
d6081d7d87 code comment 2021-02-22 11:13:12 +01:00
Frédéric FRANCE
0e96093def add log for token reclaimed 2021-02-21 21:51:26 +01:00
Laurent Destailleur
3d1dfccc1d More robust code 2021-02-19 18:12:15 +01:00
Laurent Destailleur
e9f9c46cd6 Clean code. Fix nojs=1 2021-02-19 15:37:42 +01:00
Laurent Destailleur
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +01:00
Laurent Destailleur
d588086c47 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 21:21:28 +01:00
Laurent Destailleur
032503f397 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/main.inc.php
2021-02-09 21:13:54 +01:00
Laurent Destailleur
9c535d6d7e Fix comment in js must be a js comment 2021-02-09 21:09:46 +01:00
Laurent Destailleur
0e2c27d795 Fix javascript error 2021-02-09 21:06:11 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
3473e0a5d0 Exclude include if not required 2021-01-31 17:10:31 +01:00
Laurent Destailleur
13378897a8 FIX Report by Ricardo Matias
Conflicts:
	test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f FIX Report by Ricardo Matias 2021-01-25 22:46:09 +01:00
Laurent Destailleur
820ab1a110 Better error message 2021-01-16 13:03:34 +01:00
Laurent Destailleur
199b46cfaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/langs/en_US/modulebuilder.lang
2020-12-27 16:53:15 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
4fcf606d04 Error management on emailcollector edition 2020-12-22 17:22:24 +01:00
Laurent Destailleur
5f476e7e7e Compatibility of nusoap with PHP8 2020-12-12 15:37:15 +01:00
Regis Houssin
37193557df FIX rename hook to be more explicit and $test = false 2020-12-09 08:56:39 +01:00
Laurent Destailleur
a92ad1484a Merge pull request #15709 from hregis/fix_add_hook_for_security
NEW add hook "loginCheckSecurityAccess" (eg for external captcha)
2020-12-08 23:08:17 +01:00
Laurent Destailleur
e987e6e093 Context for hook showSocinfoOnPrint has been moved from
"showsocinfoonprint" to "main"
2020-12-08 22:16:38 +01:00
Regis Houssin
3836e5685a FIX same context of others 2020-12-08 19:30:40 +01:00
Regis Houssin
724d03c754 NEW add hook "loginCheckSecurityAccess" (eg for external captcha) 2020-12-08 19:26:24 +01:00
Laurent Destailleur
3b55eb1d82 FIX master must be after session_start but dol_getprefix must be before
and after filefunc.inc.php.
2020-12-05 13:26:58 +01:00
Laurent Destailleur
613ed8bcfa FIX No use of $_SESSION into master.inc.php 2020-12-04 23:50:55 +01:00
Laurent Destailleur
34679c3bc1 Fix warning in phpunit 2020-12-04 13:22:47 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
9147c85d9f Fix size of roboto font 2020-11-28 03:35:32 +01:00
Laurent Destailleur
e4128bad80 Fix management of Robot font 2020-11-28 03:32:25 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
b6640da281 Fix javascript obfuscating with HTML comments 2020-11-26 23:37:35 +01:00
Laurent Destailleur
d2f8b65dbf Prepare use of session in db 2020-11-24 12:26:32 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Florian HENRY
8b2ec747d4 fix warning 2020-11-19 17:59:03 +01:00
Laurent Destailleur
548a25b005 Fix use of token 2020-11-16 14:36:23 +01:00
Laurent Destailleur
62ba731823 Fix the follow/nofollow was not propagated 2020-11-07 12:47:42 +01:00
Laurent Destailleur
7e835c4eda Set country to unkown in ping if not defined 2020-10-31 18:45:12 +01:00
Laurent Destailleur
939f5ce095 Fix escaping of data on ping 2020-10-31 18:44:28 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
2668efa132 Fix missing global 2020-10-30 12:44:29 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00