Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,503 Commits 36 Branches 189 Tags
2bc958efe3fb48df00c7793cbc62ad6cd9708f4c
Commit Graph

95 Commits

Author SHA1 Message Date
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
 2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
Laurent Destailleur
cbae64f9aa FIX Add a hack to fix a bug in jquery 3.6.0/select 2 2022-04-07 17:51:38 +02:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-03-16 20:34:30 +01:00
Laurent Destailleur
3c9ebfbe32 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	.travis.yml
	htdocs/adherents/card.php
 2022-03-16 20:10:35 +01:00
Laurent Destailleur
0899caf74d Update lib_head.js.php 2022-03-15 19:23:17 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
lmarcouiller
22706b70e9 fix syntax error 2022-03-14 16:21:12 +01:00
Laurent Destailleur
f789fc24f7 Fix filter 2022-03-14 16:20:57 +01:00
lmarcouiller
1a20afe29b Fix #20351 : top navbar no longer hiden in extarnal site 2022-03-14 16:11:34 +01:00
Laurent Destailleur
9b1f04209d NEW Change in theme colors does not need to use the refresh button 2022-02-06 22:11:44 +01:00
Laurent Destailleur
3fa3cd28cd clean code 2022-02-06 15:21:49 +01:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
9918873719 Better log 2021-09-16 13:07:02 +02:00
Laurent Destailleur
047bbbb298 NEW Can set/unset the usual working day of the week 2021-08-05 14:42:28 +02:00
Laurent Destailleur
aa9d98a336 Clean code of lib_notification. Now use cache like other js. 2021-07-08 23:20:55 +02:00
Laurent Destailleur
1306ff4c0b Clean code of lib_notification. Now use cache like other js. 2021-07-08 23:19:43 +02:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
 2021-02-26 12:53:06 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Regis Houssin
0a3d1ab92e FIX use var "saved_url" instead global var "$url" 2021-02-23 16:56:45 +01:00
Regis Houssin
ec5d9983e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 
fix_avoid_missing_url_and_token

Conflicts:
	htdocs/core/js/lib_head.js.php
 2021-02-23 16:55:32 +01:00
Laurent Destailleur
d2e1f9fce9 FIX #16096 #16085 Any call of ajax pages must provide the token 2021-02-23 11:13:57 +01:00
Regis Houssin
77cecf58ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 11:10:32 +01:00
Laurent Destailleur
34dcebea78 Code comment 2021-02-23 11:03:34 +01:00
Regis Houssin
7c32e43c68 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 08:19:18 +01:00
daraelmin
29b1f10fd4 Fix #16096 #16085 missing CSRF token 2021-02-22 17:33:54 +01:00
Laurent Destailleur
b167a4a0c7 FIX date selector when using reduced year (like on smartphone) 2021-02-19 22:00:44 +01:00
Regis Houssin
5217a38359 FIX use post instead get 2021-01-31 12:51:13 +01:00
Regis Houssin
74795b87e5 FIX avoid undefined url and missing token 2021-01-31 12:46:54 +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
44f532e1da Fix look and feel v13 2020-10-31 03:50:16 +01:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +02:00
Laurent Destailleur
6a45545ec1 Prepare for fix 2020-09-19 01:53:22 +02:00
Laurent Destailleur
b7a97b2c81 Prepare for fix 2020-09-19 01:45:40 +02:00
Laurent Destailleur
7b84518e59 Fix webp support 2020-06-03 14:05:18 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
f509c6a266 Add user id into ajaxconst_onoff 2020-03-25 16:00:42 +01:00
Laurent Destailleur
b618581692 More ajax button in setup. Can reload after on ajaxonoff. 2020-02-18 09:38:34 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
33c35780e0 wip 2019-10-20 11:17:54 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
c92488986b NEW Can have a preview of website template when loading a template 2019-08-15 02:32:07 +02:00
Laurent Destailleur
2b90df6f80 Fix responsive 2019-05-22 16:08:21 +02:00
Laurent Destailleur
11e4411400 TakePOS Can enter payment in several times and with different modes 2019-03-27 15:42:53 +01:00
Laurent Destailleur
ec0733d202 Use color on the amount of the payment page of TakePOS module 
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
 2019-03-27 12:40:32 +01:00
Laurent Destailleur
d659543ac0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-09 19:00:57 +01:00