Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 04:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,048 Commits 36 Branches 190 Tags
50b5226d10547030c0a2cb151935251bb6ec6937
Commit Graph

5903 Commits

Author SHA1 Message Date
Laurent Destailleur
24ad67e0e1 Fix missing $conf 2019-09-27 20:01:57 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
66cbb4020b Merge branch 'develop' into patch-4 2019-09-27 14:46:39 +02:00
Alexandre SPANGARO
4b73e09c60 Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-27 14:20:53 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
f96c9c3bb5 FIX #11931 #11963 2019-09-27 11:51:34 +02:00
Alexandre SPANGARO
e38bb89a2e NEW Add fa_icon on load_fiche_titre 2019-09-27 11:48:40 +02:00
Laurent Destailleur
6fbb5c0db7 Merge pull request #11963 from aspangaro/11.0_fa_icon 
#11931 NEW Add fa_icon "tools" for load_fiche_titre
 2019-09-27 11:38:44 +02:00
Laurent Destailleur
e03667dc75 Merge pull request #11939 from frederic34/patch-17 
fix badge linked resources on fichinter
 2019-09-27 11:32:27 +02:00
Frédéric FRANCE
03086026b8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
Laurent De Coninck
040e7bdfdf working solution about filtering the contacs of one company 2019-09-25 18:24:36 +02:00
Alexandre SPANGARO
f4929c5315 NEW Add fa_icon "tools" for load_fiche_titre 2019-09-25 15:24:52 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
19c78d42e9 Fix az09 -> aZ09 2019-09-24 14:20:29 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
Frédéric FRANCE
44ba0deae6 fix badge linked resources on fichinter 2019-09-20 17:58:22 +02:00
Laurent Destailleur
345ac28c89 Fix js injection 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
 2019-09-18 14:21:02 +02:00
John Botella
d72548bd76 add filters 2019-09-18 13:43:34 +02:00
Laurent Destailleur
3f6afa810c Code comment 2019-09-17 17:55:30 +02:00
ptibogxiv
c8bfd2c7c2 NEW translation for member type 
usefull for sync with API and multilanguage front end or application
 2019-09-17 13:37:34 +02:00
Frédéric FRANCE
e43f3a0f58 Update functions.lib.php 2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a Update functions.lib.php 2019-09-16 17:57:40 +02:00
John Botella
010e58d957 Add switch view behavior 2019-09-16 13:56:07 +02:00
Laurent Destailleur
544a1237bc FIX regression with option to hide picto on top menu 2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2 FIX regression with option to hide picto on top menu 2019-09-15 15:09:36 +02:00
Frédéric FRANCE
904d0ecaee Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 18:42:31 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
584549df11 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
Frédéric FRANCE
6444c7378f Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 16:40:23 +02:00
Laurent Destailleur
166d56f7a3 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:15:49 +02:00
Frédéric FRANCE
de3a67f5bd Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Frédéric FRANCE
0d3a2f800b fix colspan in show_project 2019-09-12 21:39:57 +02:00
ATM john
859904587f add private support and title buttons 2019-09-12 21:17:48 +02:00
Frédéric FRANCE
6f33874d75 add entity 2019-09-12 21:13:00 +02:00
Frédéric FRANCE
cd109d04cd add function 2019-09-12 20:44:24 +02:00
John Botella
7dcb871048 Fix private message type 2019-09-12 18:39:29 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
florian HENRY
d6dcbc714c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-12 09:38:14 +02:00
stickler-ci
b2187c829a Fixing style errors. 2019-09-11 22:44:17 +00:00
ATM john
bf924f113e Add more style ans edit button 2019-09-12 00:37:36 +02:00
Laurent Destailleur
84e197e48a Clean code 2019-09-12 00:09:49 +02:00
Laurent Destailleur
d7d764e5f9 Fix var not defined 2019-09-11 23:56:53 +02:00
ATM john
907669bb51 New ticket messaging page 2019-09-11 23:30:09 +02:00
Frédéric FRANCE
e0f17cc71c add socialnetworks dictionary 2019-09-11 22:47:23 +02:00