Laurent Destailleur
|
944a15d06b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-12 10:20:16 +01:00 |
|
Laurent Destailleur
|
f8e8d15606
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-12 10:19:01 +01:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
gauthier
|
e2680f7637
|
FIX : limit 20 prevent to see all products/services
|
2019-11-12 09:42:27 +01:00 |
|
Scrutinizer Auto-Fixer
|
038bda254d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 22:59:36 +00:00 |
|
Philippe GRAND
|
d760b799d9
|
internationalization
|
2019-11-09 16:26:57 +01:00 |
|
Philippe GRAND
|
ab267cdf0c
|
internationalization
|
2019-11-09 16:23:06 +01:00 |
|
Philippe GRAND
|
1ac4bf54d2
|
internationalization
|
2019-11-09 16:16:16 +01:00 |
|
Philippe GRAND
|
0690467b15
|
internationalization
|
2019-11-09 16:11:37 +01:00 |
|
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 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
Sebastien Baguet
|
5dbf34a864
|
Small fix on a query
|
2019-10-03 13:34:47 +02:00 |
|
stickler-ci
|
09b423d14d
|
Fixing style errors.
|
2019-10-02 22:35:09 +00:00 |
|
Sebastien Baguet
|
9daffcbe07
|
Fix for no subscription members
|
2019-10-03 00:29:41 +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
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
Frédéric FRANCE
|
010b2723b6
|
work on migration script
|
2019-10-01 20:14:06 +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
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Frédéric FRANCE
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
Laurent Destailleur
|
db32ca99c6
|
Fix translation and sql request
|
2019-09-28 12:36:09 +02:00 |
|
Laurent Destailleur
|
86e5465197
|
Standardize extrafields code
|
2019-09-28 10:55:09 +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
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Alexandre SPANGARO
|
e38bb89a2e
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-27 11:48:40 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
1c13a38ce9
|
Typo abscissa
|
2019-09-23 21:45:23 +02:00 |
|
Alexandre SPANGARO
|
1e49fd0d45
|
Translate
|
2019-09-20 15:07:58 +02:00 |
|
Alexandre SPANGARO
|
e32772fdc5
|
Translate
|
2019-09-20 09:44:49 +02:00 |
|
Alexandre SPANGARO
|
278312f38f
|
Translate
|
2019-09-20 07:02:14 +02:00 |
|
Alexandre SPANGARO
|
b3807bbb20
|
Merge branch 'develop' into 11.0_translation
|
2019-09-19 22:34:43 +02:00 |
|
Alexandre SPANGARO
|
4819414d3a
|
Translate and some fix
|
2019-09-19 22:33:26 +02:00 |
|
stickler-ci
|
8d8ded324d
|
Fixing style errors.
|
2019-09-17 11:56:16 +00:00 |
|
ptibogxiv
|
a295d57e0c
|
Update adherent_type.class.php
|
2019-09-17 13:54:17 +02:00 |
|
ptibogxiv
|
c01ab4ab53
|
Update adherent_type.class.php
|
2019-09-17 13:53:34 +02:00 |
|
ptibogxiv
|
cff6da34df
|
Create traduction.php
|
2019-09-17 13:53:06 +02:00 |
|
Frédéric FRANCE
|
ccaa4cc1f3
|
work on contact
|
2019-09-14 16:35:18 +02:00 |
|
Frédéric FRANCE
|
af63ac4051
|
work on contact
|
2019-09-14 13:31:26 +02:00 |
|
Frédéric FRANCE
|
1cd59cc16a
|
work on user
|
2019-09-14 11:26:31 +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
|
cd109d04cd
|
add function
|
2019-09-12 20:44:24 +02:00 |
|
Frédéric FRANCE
|
fa44af1df8
|
work on user
|
2019-09-12 20:03:28 +02:00 |
|
Frédéric FRANCE
|
e4a0de245a
|
work on user
|
2019-09-12 18:41:26 +02:00 |
|
Laurent Destailleur
|
84e197e48a
|
Clean code
|
2019-09-12 00:09:49 +02:00 |
|
Frédéric FRANCE
|
dc2ea3cef9
|
add socialnetworks dictionary
|
2019-09-11 23:00:14 +02:00 |
|
Frédéric FRANCE
|
3fddef0c9e
|
add socialnetworks dictionary
|
2019-09-11 22:27:09 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
c7bab8681a
|
Fix sql error #11845
|
2019-09-09 13:05:08 +02:00 |
|
Laurent Destailleur
|
1d74387125
|
Removed deprecated property ->numero (We must use ->num_payment)
|
2019-09-09 08:47:23 +02:00 |
|
ptibogxiv
|
a83c067081
|
Update card.php
|
2019-09-08 20:08:32 +02:00 |
|
ptibogxiv
|
2d3b0a7d43
|
Update adherent.class.php
|
2019-09-08 20:05:13 +02:00 |
|
Alexandre SPANGARO
|
3a8d8ee902
|
FIX #11401 Adherent unknown language key
|
2019-09-08 03:56:01 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Laurent Destailleur
|
7c3b0e98c4
|
Fix deprecated property
|
2019-09-02 13:53:16 +02:00 |
|
Laurent Destailleur
|
7438eecc64
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/type.php
|
2019-09-02 04:41:43 +02:00 |
|
Laurent Destailleur
|
42defc31bd
|
FIX Look and feel v10
|
2019-09-02 04:39:41 +02:00 |
|
Laurent Destailleur
|
dbdafb86f4
|
FIX Look and feel v10
|
2019-09-02 04:38:01 +02:00 |
|
Laurent Destailleur
|
ac7d0b5eb6
|
Fix scrutinizer
|
2019-09-02 04:12:48 +02:00 |
|
Laurent Destailleur
|
92799902b6
|
Fix var null
|
2019-09-02 03:44:34 +02:00 |
|
Laurent Destailleur
|
64ebbec966
|
Fix deprecated code
|
2019-09-02 03:43:24 +02:00 |
|
Laurent Destailleur
|
733c90956f
|
Fix phpunit
|
2019-09-02 03:40:09 +02:00 |
|
Laurent Destailleur
|
97a1a47266
|
Change deprecated properties with new name
|
2019-09-01 22:21:48 +02:00 |
|
Laurent Destailleur
|
f6c2fb77ae
|
Fix scrutinizer
|
2019-09-01 22:02:48 +02:00 |
|
Laurent Destailleur
|
26fb5d34c4
|
Fix scturinizer
|
2019-09-01 21:53:42 +02:00 |
|
Laurent Destailleur
|
e57b4a8bda
|
Fix cast
|
2019-08-31 13:22:02 +02:00 |
|
Laurent Destailleur
|
2f49fc6a7b
|
Fix scrutinizer
|
2019-08-31 02:49:54 +02:00 |
|
Laurent Destailleur
|
48db5c2a44
|
Replace deprecated actioncomm->note into actioncomm->note_private
|
2019-08-31 02:46:39 +02:00 |
|
Laurent Destailleur
|
d5328d1cec
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-27 15:43:19 +02:00 |
|
Laurent Destailleur
|
478b1fea25
|
FIX #11711
|
2019-08-27 15:06:50 +02:00 |
|
John Botella
|
b4c4e5a662
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-02 14:52:01 +02:00 |
|
Laurent Destailleur
|
0bc90d81c8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-02 12:05:12 +02:00 |
|
Laurent Destailleur
|
c01ac05aec
|
FIX Content of email for subscription
|
2019-08-02 12:04:06 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
5eb8f05061
|
FIX #11584
|
2019-08-01 12:23:02 +02:00 |
|
Laurent Destailleur
|
34f78c555d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-30 20:55:35 +02:00 |
|
Alexandre SPANGARO
|
cededd97d2
|
FIX Language key
|
2019-07-29 08:52:08 +02:00 |
|
Alexandre SPANGARO
|
7a9f2b43c5
|
FIX Language key
|
2019-07-29 07:05:18 +02:00 |
|
Laurent Destailleur
|
cf00ae971a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-15 22:45:29 +02:00 |
|
Laurent Destailleur
|
b0d46d492f
|
FIX #11509
|
2019-07-15 18:40:42 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
251d501c8e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-07-14 00:32:46 +02:00 |
|
Laurent Destailleur
|
2a05164bb1
|
FIX Better PHP compatibility
|
2019-07-14 00:31:28 +02:00 |
|
Laurent Destailleur
|
e0095871aa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
|
2019-07-14 00:19:56 +02:00 |
|
Laurent Destailleur
|
8090a8abb6
|
Fix param [] -> null
|
2019-07-14 00:07:27 +02:00 |
|
Regis Houssin
|
4dab57b494
|
FIX phpcs
|
2019-07-13 11:24:25 +02:00 |
|
Regis Houssin
|
b7df4a2cd0
|
FIX this function can not be private
|
2019-07-13 11:21:07 +02:00 |
|
Laurent Destailleur
|
0a7d70829f
|
Translation of some comments
|
2019-07-05 21:37:25 +02:00 |
|
Laurent Destailleur
|
06b3f6a62f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/subscription/list.php
|
2019-06-25 13:03:54 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
b6ad78fdd9
|
Fix sort
|
2019-06-25 11:25:36 +02:00 |
|
Laurent Destailleur
|
5031b6c06b
|
Fix bad id
|
2019-06-25 11:18:31 +02:00 |
|
Laurent Destailleur
|
5f17cfe462
|
Fix bad id
|
2019-06-25 11:09:13 +02:00 |
|
Laurent Destailleur
|
27be93f535
|
Fix bad id
|
2019-06-25 11:08:42 +02:00 |
|
Laurent Destailleur
|
4ed2db6d21
|
Fix bad id
|
2019-06-25 11:08:14 +02:00 |
|
Laurent Destailleur
|
e6b643e073
|
Fix syntax error
|
2019-06-25 11:07:14 +02:00 |
|
Laurent Destailleur
|
36f1527f76
|
Fix backward compatibility for type of members
|
2019-06-25 11:06:10 +02:00 |
|
Laurent Destailleur
|
ca3988ca73
|
Fix backward compatibility for type of members
|
2019-06-25 10:58:44 +02:00 |
|
Laurent Destailleur
|
732fd8a04b
|
Fix look and feel v10
|
2019-06-25 10:28:58 +02:00 |
|
Laurent Destailleur
|
74f61b3b9a
|
Fix status not loaded
|
2019-06-25 10:23:30 +02:00 |
|
Laurent Destailleur
|
7de0f5c0be
|
NEW Avoid wrap between picto and text on getNomUrl
|
2019-06-25 10:22:39 +02:00 |
|
Laurent Destailleur
|
6b8262bd8f
|
Fix status not loaded
|
2019-06-25 10:12:24 +02:00 |
|
Laurent Destailleur
|
366efff633
|
Merge pull request #11107 from gentooza/develop
NEW adding 'formObjectOptions' hooks loading at card.php of adherents module
|
2019-06-24 19:20:36 +02:00 |
|
Laurent Destailleur
|
c3a109d790
|
Update card.php
|
2019-06-24 19:20:27 +02:00 |
|
Laurent Destailleur
|
604633afd1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-24 18:45:15 +02:00 |
|
Laurent Destailleur
|
57140b79dc
|
Restore official text of licence
|
2019-06-24 18:30:07 +02:00 |
|
Laurent Destailleur
|
35c3eb0d7e
|
Fix conflict in a translation key
|
2019-06-24 17:59:00 +02:00 |
|
Laurent Destailleur
|
3c4956838e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
|
2019-06-24 15:44:44 +02:00 |
|
Philippe GRAND
|
72c8316eb0
|
all http addresses should be https now
|
2019-06-24 09:39:58 +02:00 |
|
Laurent Destailleur
|
efa09301b1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 20:19:14 +02:00 |
|
Laurent Destailleur
|
71b266b5a8
|
Code comment
|
2019-06-22 19:20:01 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
John Botella
|
ec7ebe9f39
|
redo backported fix and update adherent substitution methode
|
2019-06-21 15:32:38 +02:00 |
|
Laurent Destailleur
|
4308f48cad
|
Merge branch 'develop' into MissingHook
|
2019-06-20 03:04:32 +02:00 |
|
Laurent Destailleur
|
bf71731fc9
|
Fix phpcs
|
2019-06-19 22:28:33 +02:00 |
|
Nicolas ZABOURI
|
b6bd4119d9
|
FIX travis Public underscore in load_ldap_info
|
2019-06-19 09:12:01 +02:00 |
|
Nicolas ZABOURI
|
2e4db8c83c
|
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
|
2019-06-19 08:39:05 +02:00 |
|
Laurent Destailleur
|
525598f6aa
|
Fix scrutinizer warnings
|
2019-06-18 20:01:28 +02:00 |
|
Nicolas ZABOURI
|
492c3b5625
|
FIX hook
|
2019-06-18 15:13:08 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
florian HENRY
|
cab91e75c6
|
add missing column adherent list
|
2019-06-10 10:10:16 +02:00 |
|
ptibogxiv
|
63e205c23f
|
FIX term of lang for explicit date in subscription list
|
2019-06-07 15:15:05 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
e8ba312d2a
|
Fix phpcs
|
2019-05-23 14:25:16 +02:00 |
|
Laurent Destailleur
|
aa93e1c07b
|
Merge pull request #11221 from frederic34/patch-6
The method _load_ldap_dn() cannot be called...
|
2019-05-21 22:39:15 +02:00 |
|
Laurent Destailleur
|
c1a0e9385f
|
Merge pull request #11219 from frederic34/patch-2
dol_print_object_info return void
|
2019-05-21 22:38:39 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +02:00 |
|
Frédéric FRANCE
|
a368a6a43e
|
Update adherent_type.class.php
|
2019-05-19 11:52:34 +02:00 |
|
Frédéric FRANCE
|
a09584ae4b
|
The method _load_ldap_dn() cannot be called...
The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
|
2019-05-19 09:46:47 +02:00 |
|
Frédéric FRANCE
|
06421c200d
|
Update agenda.php
|
2019-05-19 09:13:46 +02:00 |
|
Laurent Destailleur
|
a9e96031de
|
Fix phpcs
|
2019-05-18 17:04:37 +02:00 |
|
Laurent Destailleur
|
1ad2c09800
|
Fix size of popup
|
2019-05-18 16:38:52 +02:00 |
|
Laurent Destailleur
|
5f598b1c3f
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-05-18 16:26:03 +02:00 |
|
Laurent Destailleur
|
b40eb92ce7
|
Mass action for closing members
|
2019-05-18 16:25:45 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
John BOTELLA
|
b0e780fab0
|
Fix travis
|
2019-05-13 09:39:45 +02:00 |
|
Laurent Destailleur
|
d789004782
|
Update adherent.class.php
|
2019-05-09 15:35:55 +02:00 |
|
ptibogxiv
|
3ddd5110ef
|
Update adherent.class.php
|
2019-05-09 13:42:32 +02:00 |
|
Joaquín
|
9c69c8acc7
|
trying to pass travis check
|
2019-05-04 12:08:28 +02:00 |
|
Joa
|
01ea4c28cf
|
adding hooks loading for form customization to card.php of adherents module
|
2019-05-03 11:02:37 +02:00 |
|
Laurent Destailleur
|
553d97d290
|
Merge pull request #11077 from ptibogxiv/patch-159
FIX: dolibarrize civility for fetch member
|
2019-05-02 12:40:51 +02:00 |
|
Laurent Destailleur
|
590c6fb91f
|
Update adherent.class.php
|
2019-05-02 12:40:34 +02:00 |
|
ptibogxiv
|
f33b7fc744
|
Update adherent.class.php
|
2019-04-27 15:19:39 +02:00 |
|
ptibogxiv
|
d8d462e36f
|
FIX: dolibarrize civility for fetch member
same code as contact or other object
|
2019-04-27 14:53:14 +02:00 |
|
ptibogxiv
|
423c5c3ac8
|
Update card.php
|
2019-04-26 14:26:50 +02:00 |
|