Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
79,466 Commits 36 Branches 190 Tags
b78187c1eb3bae7ec55e5f409f74e07b90479137
Commit Graph

1763 Commits

Author SHA1 Message Date
Frédéric FRANCE
b78187c1eb Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
1060ac4608 Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus 
Fix : LibStatut missing dolgetstatus usage
 2019-10-07 13:08:33 +02:00
Laurent Destailleur
c2a7ae23bc Merge pull request #12034 from aspangaro/11_faicon 
Fix Fa-icon
 2019-10-07 13:03:27 +02:00
Frédéric FRANCE
6384e7eb67 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
Laurent Destailleur
503973cec9 FIX Edit of ticket module parameters erased others 2019-10-04 14:04:31 +02:00
ATM john
027c8224b0 Fix dolGetStatus unused 2019-10-03 21:34:01 +02:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00
ATM john
77f666a236 Fix dolGetStatus param 2019-10-03 21:28:11 +02:00
Alexandre SPANGARO
8668e7157a Add bookmark fa-icon 2019-10-03 21:00:59 +02:00
Alexandre SPANGARO
d0840b038f Remove constant MAIN_DISABLE_FONT_AWESOME_5 2019-10-03 20:42:02 +02:00
Alexandre SPANGARO
14381927c7 Fix Bank Fa-icon 2019-10-03 20:32:15 +02:00
Frédéric FRANCE
98023353fe Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Frédéric FRANCE
37bb548d21 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 20:56:32 +02:00
Laurent Destailleur
b6a95b4be5 Look and feel v11 2019-10-02 19:04:24 +02:00
Frédéric FRANCE
3afb4355a8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 18:59:18 +02:00
Laurent Destailleur
f89701b4d4 Fix technical id align on left 2019-10-02 18:55:18 +02:00
Laurent Destailleur
d8a8c4fbe6 Look and feel v11. Picto are fontawesome. 2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Frédéric FRANCE
aca9d92db8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Laurent Destailleur
b79831ec39 Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Laurent Destailleur
11e01f5c86 Use correct style for table header 2019-10-01 12:02:28 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1 Fix bad name of trigger 2019-10-01 11:28:10 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
f32f528bc2 fix merge 2019-09-30 19:36:57 +02:00
Frédéric FRANCE
b87610adcc Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Laurent Destailleur
ecc2e8df67 Fix restore lost images 2019-09-30 17:58:31 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
bbc98c19bc Update functions.lib.php 2019-09-30 15:25:55 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Frédéric FRANCE
cea3669ffa Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
981c5c877a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 20:02:08 +02:00
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
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
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