ptibogxiv
|
789e751e4a
|
Update type.php
|
2019-11-20 10:55:58 +01:00 |
|
stickler-ci
|
54e528d659
|
Fixing style errors.
|
2019-11-20 09:38:32 +00:00 |
|
ptibogxiv
|
a3e7c4467a
|
NEW add WYSiWYG on member type's description
|
2019-11-20 10:36:26 +01:00 |
|
altairis
|
8522faea7f
|
add conf
|
2019-11-20 10:15:46 +01:00 |
|
Laurent Léonard
|
dbbcda9e99
|
Add WYSIWYG editor to description field of projects
|
2019-11-20 06:38:28 +01:00 |
|
Frédéric FRANCE
|
d182eee4bf
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-19 23:26:00 +01:00 |
|
Laurent Destailleur
|
fb70893229
|
Fix missing class reposition
|
2019-11-19 21:29:49 +01:00 |
|
Laurent Destailleur
|
1b53375371
|
Look and feel v11
|
2019-11-19 21:21:15 +01:00 |
|
Laurent Destailleur
|
07c01a821e
|
FIx #12466 manually (conflict pb)
|
2019-11-19 19:43:02 +01:00 |
|
Laurent Destailleur
|
5d7a1f1265
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
|
2019-11-19 19:02:14 +01:00 |
|
Laurent Destailleur
|
7dba9ecdf4
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-19 18:56:22 +01:00 |
|
Laurent Destailleur
|
2f3b4d239b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-19 18:56:12 +01:00 |
|
John Botella
|
8f5c8c63df
|
Fix dom and showOptionals call
|
2019-11-19 16:35:31 +01:00 |
|
stickler-ci
|
c33506b4cc
|
Fixing style errors.
|
2019-11-19 13:41:30 +00:00 |
|
Cédric
|
8fbf853b94
|
Display attributes infos when get product variants
|
2019-11-19 14:40:50 +01:00 |
|
Laurent Destailleur
|
6bfb76d40d
|
Merge pull request #12464 from bb2a/patch-6
Update getfullname
|
2019-11-19 10:55:47 +01:00 |
|
Laurent Destailleur
|
ebd1f74b3b
|
Merge pull request #12469 from frederic34/patch-6
Update bookkeeping.class.php
|
2019-11-19 10:55:11 +01:00 |
|
Laurent Destailleur
|
3c09bbf739
|
Merge pull request #12468 from atm-florian/10.0
fix title page linked files user
|
2019-11-19 10:54:41 +01:00 |
|
Laurent Destailleur
|
49aa6ef9fa
|
Merge pull request #12467 from atm-greg/Fix_ContactCardCivility
fix bad getpost for civility_code in edit mode
|
2019-11-19 10:54:17 +01:00 |
|
Laurent Destailleur
|
66aa367851
|
Merge pull request #12465 from aspangaro/10.0_p9
Missing language key
|
2019-11-19 10:53:47 +01:00 |
|
Laurent Destailleur
|
6bee8b32f9
|
Merge pull request #12470 from Dolibarr/scrutinizer-patch-11
Scrutinizer Auto-Fixes
|
2019-11-19 10:53:27 +01:00 |
|
Scrutinizer Auto-Fixer
|
cd7523318d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-19 08:30:26 +00:00 |
|
Laurent Destailleur
|
5b6f0cb101
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/extrafields.class.php
|
2019-11-18 21:19:10 +01:00 |
|
Frédéric FRANCE
|
b61a3f1ba9
|
Update bookkeeping.class.php
|
2019-11-18 19:59:21 +01:00 |
|
florian HENRY
|
010219bf09
|
fix title pasge linked files user
|
2019-11-18 19:47:34 +01:00 |
|
Laurent Destailleur
|
f696998093
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-11-18 19:02:25 +01:00 |
|
Laurent Destailleur
|
918f476c2b
|
Fix backport fix not checking mandatory extrafields of type select
|
2019-11-18 19:02:12 +01:00 |
|
Laurent Destailleur
|
fffc242484
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-18 18:09:25 +01:00 |
|
Laurent Destailleur
|
74c85b742e
|
Fix ref must be null until the generation of ref is ok
|
2019-11-18 18:09:12 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Laurent Destailleur
|
8fd327adbb
|
css
|
2019-11-18 14:59:55 +01:00 |
|
atm-greg
|
99f93dbbf5
|
fix bad getpost
|
2019-11-18 14:33:01 +01:00 |
|
Laurent Destailleur
|
3300446cbf
|
Fix td colspan
|
2019-11-18 14:13:51 +01:00 |
|
Laurent Destailleur
|
ae0fdf014f
|
Debug email collector. Missing unique key. Fix initial setup.
|
2019-11-18 11:55:22 +01:00 |
|
Alexandre SPANGARO
|
79ee2b8c4d
|
Missing language key
|
2019-11-18 11:48:44 +01:00 |
|
Alexandre SPANGARO
|
b3e09e050c
|
fix missing param
|
2019-11-18 11:36:12 +01:00 |
|
Alexandre SPANGARO
|
b11579c1bd
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a1
|
2019-11-18 09:26:40 +01:00 |
|
Alexandre SPANGARO
|
cd018b2b65
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a4
|
2019-11-18 06:08:49 +01:00 |
|
Alexandre SPANGARO
|
1e2fd1f25a
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a5
|
2019-11-17 21:55:25 +01:00 |
|
Alexandre SPANGARO
|
556bdd35d9
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a6
|
2019-11-17 21:11:41 +01:00 |
|
Laurent Destailleur
|
b69a7f9709
|
css
|
2019-11-17 20:25:39 +01:00 |
|
Laurent Destailleur
|
20b07529cb
|
css
|
2019-11-17 17:45:00 +01:00 |
|
Laurent Destailleur
|
16d67a1a8e
|
Fix several trouble with some types in modulebuilder
Fix difference between null and 0
|
2019-11-17 17:36:36 +01:00 |
|
Anthony Berton
|
7a5883588c
|
Update commonobject.class.php
|
2019-11-17 14:07:01 +01:00 |
|
Anthony Berton
|
fe3c921152
|
Merge branch 'develop' into patch-4
|
2019-11-17 10:17:47 +01:00 |
|
Cédric
|
398f0e00f7
|
inject $user for createProductCombination
|
2019-11-17 01:27:23 +01:00 |
|
Cédric
|
a7f42b3fdf
|
Inject $user for createProductCombination
|
2019-11-17 01:25:44 +01:00 |
|
Cédric
|
40e4af234d
|
Inject $user instead of global var
|
2019-11-17 01:24:07 +01:00 |
|
Laurent Destailleur
|
502626156e
|
Work on MRP module
|
2019-11-17 01:23:19 +01:00 |
|
stickler-ci
|
a17e183da9
|
Fixing style errors.
|
2019-11-17 00:18:43 +00:00 |
|