Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

2238 Commits

Author SHA1 Message Date
Philippe GRAND
86c826bd87 internationalization 2019-11-09 15:54:09 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Frédéric FRANCE
f81ac3a388 Update type.php 2019-11-04 22:57:46 +01:00
Frédéric FRANCE
b0d0e306d1 missing newtoken for csrf 2019-11-04 22:54:34 +01:00
Laurent Destailleur
1aef1c60dd Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Laurent Destailleur
bdbec58461 Merge pull request #12309 from ptibogxiv/patch-274 
NEW change duration membertype
 2019-11-04 20:53:42 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
stickler-ci
8007b22030 Fixing style errors. 2019-11-03 11:37:44 +00:00
ptibogxiv
44b80fdc44 Update type.php 2019-11-03 12:35:52 +01:00
ptibogxiv
871b6d9dd6 NEW change duration membertype 2019-11-03 12:35:05 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
f9031cdbfd Clean code 2019-11-02 11:36:48 +01:00
Frédéric FRANCE
77d4ca81dc Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701 Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
Laurent Destailleur
811a30c9c2 Merge pull request #12212 from frederic34/patch-3 
Update adherent.class.php
 2019-10-30 03:16:46 +01:00
Laurent Destailleur
58188423e2 Merge pull request #12227 from ptibogxiv/patch-272 
Fix php error display
 2019-10-30 03:10:02 +01:00
Frédéric FRANCE
d889d1ba7b css 2019-10-25 18:20:48 +02:00
ptibogxiv
60f43a80c8 Fix php error display 2019-10-25 18:05:11 +02:00
Frédéric FRANCE
a43e6f96b5 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Frédéric FRANCE
833e761633 Update adherent.class.php 2019-10-24 16:35:48 +02:00
Laurent Destailleur
2eed48e091 Limit number of lines in statistics table 2019-10-24 15:16:26 +02:00
Laurent Destailleur
433f6918fd Look and feel v11 2019-10-23 21:21:39 +02:00
Laurent Destailleur
7297514afb NEW Use the gender of member for picto in member lists. 2019-10-23 21:00:29 +02:00
Laurent Destailleur
fd04729727 Fix tooltip on extrafield title was on wrong line. 2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07 Theme v11 2019-10-23 20:12:29 +02:00
Frédéric FRANCE
9ec7836387 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Frédéric FRANCE
360bf55f5b clean indent 2019-10-20 01:09:11 +02:00
Frédéric FRANCE
f4540dddb8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
d9ba09bec1 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Frédéric FRANCE
9f59656589 fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Frédéric FRANCE
f253315c8d Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
3acf7211c3 Merge pull request #11847 from ptibogxiv/patch-257 
NEW: Option to allow to create members from third-party
 2019-10-08 15:08:34 +02:00
Frédéric FRANCE
b78187c1eb Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
da5890e584 Update adherent.class.php 2019-10-07 20:32:51 +02:00
ptibogxiv
ff992d996c Update type_translation.php 2019-10-07 13:37:35 +02:00
ptibogxiv
decbdaa5af Rename traduction.php to type_translation.php 2019-10-07 13:35:40 +02:00
Laurent Destailleur
e02794248e Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +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
ec8569dd85 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-06 15:56:21 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00