Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

1859 Commits

Author SHA1 Message Date
Laurent Destailleur
dfda029da4 FIX a removed option was still in setup 2018-09-01 17:44:07 +02:00
Laurent Destailleur
c17233a409 More logs 2018-09-01 16:51:40 +02:00
Laurent Destailleur
c8912d6a4f Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Frédéric FRANCE
10200374ef Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
bb444c80d0 Merge pull request #9360 from frederic34/patch-18 
Update ldap.php
 2018-09-01 13:28:16 +02:00
Philippe GRAND
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3 Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Frédéric FRANCE
945eede4a5 doxygen fixs 2018-08-31 23:12:55 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Frédéric FRANCE
f61450ffa8 Update ldap.php 2018-08-30 23:04:32 +02:00
Frédéric FRANCE
9c44f80746 Update card.php 2018-08-30 23:03:03 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Laurent Destailleur
2daa5b3ae0 Fix phpcs 2018-08-29 17:09:58 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
1842a4bb41 Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
ptibogxiv
ca8a22a3ad fix sync user/member 
add more fields to sync
 2018-08-28 01:35:01 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
ptibogxiv
b2a438b384 fix sync user/member 
add more fields to sync
 2018-08-23 10:06:32 +02:00
Philippe Grand
92cb9c4204 Update adherentstats.class.php 2018-08-22 22:35:04 +02:00
Philippe GRAND
449ef9c464 Update and standardize code 2018-08-22 18:12:44 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Frédéric FRANCE
6b6daf178f Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Laurent Destailleur
0799970804 Merge pull request #9248 from frederic34/FunctionDeclaration 
function declaration
 2018-08-21 13:41:56 +02:00
Philippe GRAND
da951e61f2 Update and standardize code 2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Frédéric FRANCE
39462742e2 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6 Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Frédéric FRANCE
69a7af88e7 function declaration 2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
a0a6afc224 return comment 2018-08-14 12:23:10 +02:00
Frédéric FRANCE
3210181a3d rule for private function is different 2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
b11d5c2f71 Merge pull request #9228 from atm-florian/8.0 
fix : remove comment on commit
 2018-08-12 19:13:07 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
florian HENRY
f0a32a2dea fix : remove comment on commit 2018-08-09 20:41:15 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
ad2df304b4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/fourn/commande/card.php
	htdocs/societe/class/societe.class.php
 2018-06-18 13:31:29 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00