Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,777 Commits 36 Branches 189 Tags
2b8fe93fc8d6b81eb68d69a72d0a1af9132015e0
Commit Graph

1303 Commits

Author SHA1 Message Date
Regis Houssin
2b8fe93fc8 Fix: remove unused global 2018-03-27 17:40:17 +02:00
Regis Houssin
35b6cb750f Fix: move "moreHtmlRef" hook in "showrefnav" function 2018-03-27 17:36:25 +02:00
Regis Houssin
180f2a0336 Fix: multi_dir compatibility 2018-03-25 12:56:43 +02:00
Regis Houssin
d5ed29c567 NEW add "moreHtmlRef" hook 2018-03-25 12:13:29 +02:00
Laurent Destailleur
ab9edef3c7 Fix external links ko when substitution key are inside domain 2018-03-24 12:46:52 +01:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
Laurent Destailleur
35938b1942 NEW Variable __ONLINE_PAYMENT_URL__ available in email templates 2018-03-21 20:06:22 +01:00
Laurent Destailleur
42b0a22df2 Use font-awsome for play icon 2018-03-21 13:16:05 +01:00
Laurent Destailleur
51b6723b08 Dolibarrize module ticket 2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
cb1069cf0b Use font-awesome for the picto to move/transfer a line 2018-03-17 13:21:27 +01:00
Laurent Destailleur
71c51eb789 NEW Add hook printEmail 2018-03-15 22:22:42 +01:00
Laurent Destailleur
7c62f22408 Remove doubtful code 2018-03-15 14:02:32 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Laurent Destailleur
0d1e26b02c Fix error management 2018-03-12 13:19:09 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
 2018-03-08 16:37:17 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
Laurent Destailleur
c02e8e9831 Css 2018-03-07 19:13:15 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
Laurent Destailleur
0270e21289 Merge pull request #8242 from hregis/develop_multicompany 
Fix: use "multidir_output" instead "dir_output" (propal)
 2018-03-02 17:49:25 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Laurent Destailleur
7e48db2869 Clean code 2018-02-26 15:03:09 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
1666f371bf css 2018-02-26 00:13:16 +01:00
Laurent Destailleur
a5b1f114c2 FIX Generic substitution of constant disabled for sensitive constant 2018-02-24 14:03:32 +01:00
Laurent Destailleur
1ec5a5d0bf FIX Generic substitution of constant disabled for sensitive constant 2018-02-24 14:02:27 +01:00
Laurent Destailleur
b6737d3607 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-02-23 11:24:45 +01:00
Laurent Destailleur
194f5a2cef Fix substitution key 2018-02-23 11:03:48 +01:00
Laurent Destailleur
3f9a9f20ce Fix missing substitution key 2018-02-22 17:06:18 +01:00
Laurent Destailleur
76543023a1 Fix missing substitution key 2018-02-22 17:05:24 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
ab6d0d2530 Fix errors 2018-02-17 01:16:52 +01:00
Laurent Destailleur
03e58f86f3 Merge pull request #8199 from dolibarr95/patch-37 
Fix : Bad copy/paste in var name
 2018-02-15 17:28:46 +01:00
Laurent Destailleur
4f0ba4982b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-15 15:34:35 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
dolibarr95
634f3bc025 Bad copy/paste 2018-02-15 13:38:21 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
dolibarr95
3ffc671052 Add phone format for several countries 2018-02-15 10:47:32 +01:00
Laurent Destailleur
434980bb22 Fix svg image preview ko 2018-02-13 18:15:39 +01:00
Laurent Destailleur
92e67ebb8f Fix svg image preview ko 2018-02-13 16:33:45 +01:00
Laurent Destailleur
8a32ae6935 Move ajax_autoselect into functions.lib.php 2018-02-13 15:46:39 +01:00
Laurent Destailleur
f51d6a2e50 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:07:16 +01:00
Laurent Destailleur
b2536d8ebb FIX #8110 2018-02-01 15:44:35 +01:00
Laurent Destailleur
7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-01-31 20:25:24 +01:00