Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 23:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe GRAND
33efd77fc7 more internationalization 2019-10-12 12:10:33 +02:00
Laurent Destailleur
dccfdad9dd Work on inventory feature 2019-10-12 11:32:47 +02:00
Laurent Destailleur
9b8e6a3664 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-12 04:51:51 +02:00
Laurent Destailleur
71227e43fa Debug stripe deprecated page 2019-10-12 04:51:41 +02:00
Laurent Destailleur
5474e40db6 Merge pull request #12103 from frederic34/patch-14 
In list of mailing, the ref of emailing is clickable
 2019-10-12 03:30:53 +02:00
Laurent Destailleur
cffe46729d Merge pull request #12101 from frederic34/typos 
fix typo inspired by grandoc
 2019-10-12 03:29:40 +02:00
Laurent Destailleur
a35173973c Merge pull request #12102 from frederic34/patch-13 
fix translation for showemailing
 2019-10-12 03:26:46 +02:00
Frédéric FRANCE
849eda2023 Update index.php 2019-10-12 00:05:26 +02:00
Frédéric FRANCE
c3e8aec07c fix translation for showemailing 
in lang files, it's ShowEMailing not ShowEmailing
 2019-10-11 23:54:05 +02:00
Frédéric FRANCE
9f59656589 fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
2fa3b23cf1 Fix missing price level field 2019-10-11 19:36:36 +02:00
Laurent Destailleur
f345b5fdb0 Fix look and feel v10 2019-10-11 19:32:45 +02:00
Laurent Destailleur
dfaf2ae34b Trans 2019-10-11 19:20:52 +02:00
Laurent Destailleur
51383ce6af FIX Reset of password can use email like the login. 2019-10-11 18:42:07 +02:00
JC Prieto
d109341ebe Update card.php 
Variable $mesg not do anything
 2019-10-11 18:08:15 +02:00
Laurent Destailleur
63982652eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 17:43:40 +02:00
Laurent Destailleur
5446a7bd8e Try phpunit fix 2019-10-11 17:43:15 +02:00
Laurent Destailleur
f334180cb8 Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent 
NEW add parent category id or label in import category module
 2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3 Update modCategorie.class.php 2019-10-11 17:33:13 +02:00
Laurent Destailleur
1fadb2dfb6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 17:24:17 +02:00
Laurent Destailleur
d9dde34ba6 Fix phpcs 2019-10-11 17:24:02 +02:00
Laurent Destailleur
56bfbd8b80 Merge pull request #12086 from ptibogxiv/patch-267 
NEW contacts type dictionnary in api_setup.class.php
 2019-10-11 17:21:22 +02:00
Laurent Destailleur
95305a313d Fix trans 2019-10-11 17:02:35 +02:00
Laurent Destailleur
60bdb3133e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 16:57:56 +02:00
Laurent Destailleur
b58c2c38b2 Fix missing token 2019-10-11 16:57:47 +02:00
Laurent Destailleur
3f62a6d532 Merge pull request #12093 from frederic34/patch-23 
fix search by roles
 2019-10-11 16:57:33 +02:00
Laurent Destailleur
b276abea26 Fix missing token in form 
Fix date lost after search
 2019-10-11 16:49:58 +02:00
Frédéric FRANCE
367ef4acaf Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
b41f7274dd Merge pull request #12085 from aspangaro/11.0_accounting 
NEW : Accountancy - List by account - Modify sortfield, nowrap on amo…
 2019-10-11 16:39:09 +02:00
Laurent Destailleur
fbc4e3b441 Update listbyaccount.php 2019-10-11 16:37:10 +02:00
Laurent Destailleur
5d6b4c568a Merge pull request #12080 from frederic34/patch-18 
fontawesome chart-bar for stats icon
 2019-10-11 16:33:01 +02:00
Laurent Destailleur
cc73877e03 Merge branch 'develop' into patch-18 2019-10-11 16:32:48 +02:00
Laurent Destailleur
541357027e Merge pull request #12077 from frederic34/patch-15 
globe fontawesome
 2019-10-11 16:31:37 +02:00
Laurent Destailleur
143a04a341 Merge pull request #12076 from frederic34/patch-14 
Update list.php
 2019-10-11 16:30:59 +02:00
Laurent Destailleur
85b4403bb9 Merge branch 'develop' into patch-14 2019-10-11 16:30:50 +02:00
Laurent Destailleur
d9e434965a Update list.php 2019-10-11 16:29:44 +02:00
Laurent Destailleur
7b81ffe3fe Update list.php 2019-10-11 16:29:16 +02:00
Laurent Destailleur
43f08cefe8 Merge pull request #12092 from frederic34/patch-22 
get relative path for favicon
 2019-10-11 16:28:28 +02:00
Laurent Destailleur
2f8508c449 Merge branch 'develop' into patch-22 2019-10-11 16:28:17 +02:00
Laurent Destailleur
55cd960d38 Merge pull request #12078 from frederic34/patch-16 
Update fournisseur.commande.class.php
 2019-10-11 16:27:22 +02:00
Laurent Destailleur
d6881f9192 Merge pull request #12095 from atm-john/develop_fix_logo_bg 
Fix logo container css name and add hidden conf to remove background
 2019-10-11 16:25:48 +02:00
Laurent Destailleur
a0f918c85a Merge pull request #12094 from grandoc/new_branch_11_10_2019 
fix some translations
 2019-10-11 16:21:06 +02:00
Laurent Destailleur
7f503fa98d Merge pull request #12071 from ptibogxiv/patch-266 
NEW: support Net Measure in product's card.php
 2019-10-11 16:16:33 +02:00
Laurent Destailleur
dbb06adf98 Merge pull request #12090 from frederic34/patch-19 
doxygen
 2019-10-11 16:15:36 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
520a2652e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 16:10:21 +02:00
Laurent Destailleur
b5a2d37315 Fix phpunit of BOM 2019-10-11 16:10:09 +02:00
Laurent Destailleur
114e741975 Merge pull request #12079 from frederic34/patch-17 
Update box_factures_imp.php
 2019-10-11 15:54:37 +02:00