Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

9275 Commits

Author SHA1 Message Date
Zebedeu
35ea990cff Fix #15675 fixed the error of installation start of version 13.0.0-beta 
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
 2020-12-06 07:49:22 +01:00
Zebedeu
e38c6e4322 Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta" 
This reverts commit 3b7e510e61.
 2020-12-06 07:42:45 +01:00
Zebedeu
3b7e510e61 Fix #15675 fixed the error of installation start of version 13.0.0-beta 
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
 2020-12-06 07:31:54 +01:00
Zebedeu
2a4fe639ae Revert "fix | fixed the error of installation start of version 13.0.0-beta" 
This reverts commit 8697fda78b.
 2020-12-06 07:28:18 +01:00
Zebedeu
8697fda78b fix | fixed the error of installation start of version 13.0.0-beta 
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
 2020-12-06 07:22:06 +01:00
Zebedeu
f708065445 Revert "Fix | fixed the error of installation start of version 13.0.0-beta" 
This reverts commit 1a1850c6f1.
 2020-12-06 07:14:11 +01:00
Zebedeu
1a1850c6f1 Fix | fixed the error of installation start of version 13.0.0-beta 2020-12-05 20:28:55 +01:00
Zebedeu
1917d9b508 Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta" 
This reverts commit 7a8d031d56.
 2020-12-05 20:23:31 +01:00
Zebedeu
7a8d031d56 Fix #15675 fixed the error of installation start of version 13.0.0-beta 2020-12-05 20:17:57 +01:00
Laurent Destailleur
6c2d520e21 FIX caluclation of open days must not depends on TZ. 2020-12-05 17:41:05 +01:00
Frédéric FRANCE
d1204e5e9b typo ortho 2020-12-05 15:35:52 +01:00
Laurent Destailleur
cb9d6318e7 Fix warning 2020-12-05 14:09:51 +01:00
Laurent Destailleur
5860bf69ce fix warning 2020-12-05 13:48:51 +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
bb0c33a49e Merge pull request #15654 from frederic34/commonkanban 
keep common if wanted
 2020-12-04 22:25:51 +01:00
Laurent Destailleur
0536ed87a2 Avoid to process too large user agent 2020-12-04 21:38:33 +01:00
Frédéric FRANCE
a2eab824c1 Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
stickler-ci
d89970ddd1 Fixing style errors. 2020-12-04 19:31:53 +00:00
Frédéric FRANCE
c8407b2f91 keep common if wanted 2020-12-04 20:28:05 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
atm-lena
d22646e6ae pricetonum() - preg-replace() delete "-" negativ number 2020-12-04 16:06:10 +01:00
Laurent Destailleur
f06d920460 FIX #15583 2020-12-03 16:22:03 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +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
99e4aab46e CSS 2020-11-30 20:31:22 +01:00
Frédéric FRANCE
765df41918 introduce GETPOSTINT 2020-11-30 15:44:29 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
6af9c9f857 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-11-30 07:50:26 +01:00
Laurent Destailleur
b6ccfaf180 css 2020-11-30 07:50:14 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
 2020-11-29 21:35:03 +01:00
Laurent Destailleur
58eaef37d2 Fix regression 2020-11-29 21:29:22 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Laurent Destailleur
404634919d Look and feel v13 2020-11-29 15:47:08 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
41984f9934 Clean code 2020-11-28 14:00:35 +01:00
Laurent Destailleur
b1603ed1f5 Fix warning 2020-11-28 12:12:31 +01:00
Laurent Destailleur
7c4599a5c5 Look and feel v13 2020-11-28 01:15:23 +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
Frédéric FRANCE
1704de39bb Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-27 11:18:04 +01:00
Laurent Destailleur
47a5037155 Fix dolGetFirstLastname() for 4 and 5 2020-11-27 01:18:01 +01:00
Laurent Destailleur
2cf005d22c Removed warning 2020-11-27 00:39:49 +01:00
Laurent Destailleur
b3b511a6d4 FIX #15546 2020-11-26 22:44:11 +01:00
Laurent Destailleur
e1a6e8f2fc CSS 
Security: Add param to fight against Clickjacking attacks
 2020-11-26 11:29:16 +01:00
Laurent Destailleur
c7e5b0dcc1 Fix warning 2020-11-26 10:12:24 +01:00
Laurent Destailleur
e272130a6a Fix phpcs 2020-11-26 08:40:08 +01:00
Frédéric FRANCE
c09a6d1435 Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-25 12:59:32 +01:00
Frédéric FRANCE
66ad0e5b13 add note on ecm files 2020-11-24 18:54:59 +01:00
Laurent Destailleur
47ca74965b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-24 12:26:50 +01:00