lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82,102 Commits 43 Branches 150 Tags 886 MiB
dec64b45e8
Commit Graph

7504 Commits

Author SHA1 Message Date
Laurent Destailleur
027d94d41a Revert change that create not required new lines 2019-11-06 00:51:26 +01:00
Laurent Destailleur
e885345ef7 FIX Check on duplicate profid was not triggered. 2019-11-06 00:27:36 +01:00
Laurent Destailleur
4c01f33228 Fix removed a debug die 2019-11-05 15:57:22 +01:00
Laurent Destailleur
85ce5176b5 Fix textarea to enter a ticket 2019-11-05 13:41:01 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
4d84ee2041 Fix var not init 2019-11-05 10:15:00 +01:00
Laurent Destailleur
9499398f86 Code syntax 2019-11-05 10:11:28 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-04 18:52:29 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Laurent Destailleur
1f6a86e166 Fix look and feel v11 2019-11-04 13:32:34 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Frédéric FRANCE
877f40a1c8
price 2019-11-03 20:07:11 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module 2019-11-03 12:57:06 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module 2019-11-03 00:50:58 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer 2019-11-02 21:15:48 +01:00
Laurent Destailleur
2ee002fc80 Fix trans 2019-11-02 17:44:58 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793 Finish removing of ->attribute_label 2019-11-02 17:26:26 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop 
NEW Extrafields support in product supplier prices
 2019-11-02 16:19:13 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
906f30773d
Merge pull request #12269 from atm-ph/new_edit_comment 
New update comments is now available
 2019-11-02 13:09:21 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
f9031cdbfd Clean code 2019-11-02 11:36:48 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +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
Laurent Destailleur
8608c5db9c Fix color of task progression 2019-11-01 23:16:08 +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
f74833cfe1 Make modulebuilder more compatible with multicompany 2019-11-01 18:44:32 +01:00
Laurent Destailleur
012c5ef0c4 Can use substitution variables into filter of fields link 2019-11-01 18:35:48 +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
Philippe Grand
db9c490470
Update emailsenderprofile.class.php 2019-11-01 11:18:54 +01:00
Philippe Grand
74ae90f9da
Update commonobject.class.php 2019-11-01 11:18:12 +01:00
stickler-ci
0c6938aa2a Fixing style errors. 2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502 add some comment 2019-11-01 10:42:14 +01:00
Laurent Destailleur
f98df3c807 NEW Can edit link to the translation page in website module 2019-10-31 21:09:33 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
dcbe7fe8da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-31 14:06:36 +01:00
Laurent Destailleur
360b3a9550 NEW Ask the new label and new dates in confirm popup when cloning tax 2019-10-31 14:06:26 +01:00
Laurent Destailleur
b296f62671 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
atm-ph
2f68a73a2a New update comments is now available 2019-10-30 15:45:04 +01:00
Marc de Lima Lucio
85cef09e83 FIX: triggers: directories read with opendir() never closed 2019-10-30 14:46:46 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Laurent Destailleur
05fdddd15e
Merge pull request #12240 from frederic34/patch-19 
Update html.formmail.class.php
 2019-10-30 02:57:27 +01:00
Laurent Destailleur
f03bf149bd Fix autoselect of field with modulebuilder 2019-10-30 02:09:29 +01:00
Laurent Destailleur
bc3f088f50 Enhance modulebuilder 
Work on MO
 2019-10-30 01:35:41 +01:00
Frédéric FRANCE
a9447bc963
Update html.formmail.class.php 2019-10-27 18:08:21 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-27 17:03:50 +01:00
Frédéric FRANCE
e2afcfb999
clean indent 2019-10-27 11:53:20 +01:00
Frédéric FRANCE
e203f87c84
clean indent 2019-10-27 11:18:36 +01:00
Laurent Destailleur
5cb9434bb4 FIX Stock qty hidden without permission to see stock 2019-10-27 00:55:06 +02:00
Laurent Destailleur
e17cc5b2e5 Debug cloning of BOMs 2019-10-27 00:26:11 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Laurent Destailleur
8d21144521 Beautify select of products in vendor record 2019-10-24 20:33:16 +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
Laurent Destailleur
a8ca8c7a1f Fix edit of extrafields link when empty 2019-10-23 16:38:15 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Tim Otte
ad51e862e4 Merged 2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Destailleur
aa4afcfe8a NEW Can set a filter on object linked in modulebuilder. 2019-10-22 03:49:09 +02:00
Laurent Destailleur
6aa2ceac1a Fix phpcs 2019-10-22 02:53:29 +02:00
Laurent Destailleur
8e474701c1 Fix missing token 2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Laurent Destailleur
528ded58cf
Merge pull request #12187 from c3do/develop 
NEW Add API to get Country by code and iso
 2019-10-20 21:26:44 +02:00
Alfredo Altamirano
d921b08e5c Translate documentation of translate class 2019-10-20 11:44:07 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
c3do
4fb0d03500 NEW Add API to get Country by code and iso 2019-10-20 15:25:18 +02:00
Laurent Destailleur
49c101bb77 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Laurent Destailleur
8ce6197314
Update commondocgenerator.class.php 2019-10-20 14:37:15 +02:00
Laurent Destailleur
1b3d6d749a
Merge pull request #12175 from Shnoulle/develop 
Close #12098 : allow usage of AUTH LOGIN in smtp
 2019-10-20 13:48:24 +02:00
Laurent Destailleur
e95861c361
Update smtps.class.php 2019-10-20 13:48:01 +02:00
Laurent Destailleur
3b5e62947d
Update smtps.class.php 2019-10-20 13:44:28 +02:00
Laurent Destailleur
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop 
Translation of some function documentation
 2019-10-20 13:31:25 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Alfredo Altamirano
9d9961e936 Translate documentation 2019-10-19 16:55:27 -05:00
Alfredo Altamirano
1ede09c21a Fix typo 2019-10-19 11:17:53 -05:00
Denis Chenu
88100a53aa Close #12098 : allow usage of AUTH LOGIN in smtp 
Global variable MAIL_SMTP_AUTH_TYPE can be used to PLIAN to allow AUTH PLAIN authentification. Default still AUTH LOGIN.
 2019-10-18 17:35:52 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
c64a537bfd
Merge pull request #12155 from frederic34/patch-14 
Update html.formticket.class.php
 2019-10-17 17:42:30 +02:00
Laurent Destailleur
40a9b95696
Merge pull request #12148 from homer8173/patch-7 
use current local time on Now button
 2019-10-17 17:41:16 +02:00
Laurent Destailleur
084ab53b4b Fix translation 2019-10-17 12:14:38 +02:00
Frédéric FRANCE
46d2bf3317
Update html.formticket.class.php 2019-10-16 23:18:14 +02:00
Frédéric FRANCE
219a4b4374
Update html.formticket.class.php 2019-10-16 23:08:04 +02:00
Frédéric FRANCE
701afc99e9
Update html.formticket.class.php 2019-10-16 23:03:59 +02:00
Frédéric FRANCE
4bc0a6db2d
Update html.formticket.class.php 2019-10-16 22:56:29 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
8a7a0b80e2 Fix remove warnings 2019-10-16 19:08:31 +02:00
Laurent Destailleur
41dd53170e Code comment 2019-10-16 19:07:17 +02:00
stickler-ci
fce1f1991c Fixing style errors. 2019-10-16 12:34:42 +00:00
Norbert Penel
8d75e83e55
use current local time on Now button 
use current local time for feed the date according to locale settings
 2019-10-16 14:32:17 +02:00
stickler-ci
bba042c0c3 Fixing style errors. 2019-10-16 10:34:47 +00:00
Norbert Penel
8d49609549
Fix user time instead of server time 
it seems that we want to use a user time by clicking on now button.

IDEA : may i use client time ??? because if page is old, the now button insert an old time.
 2019-10-16 12:28:50 +02:00
Laurent Destailleur
b0355dd149 Module BOM have now status DRAFT, VALIDATED, DISABLED 2019-10-16 01:20:58 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Laurent Destailleur
a1c93cb2e6 MAIN_ACTIVATE_HTML5 is now always on now (so option removed). 
Look and feel v11
 2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c Removed warning 2019-10-15 00:44:22 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-14 19:02:46 +02:00
Laurent Destailleur
7973b03201 NEW Add estimated duration on the BOM module 2019-10-14 11:38:36 +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
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +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
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
Philippe Grand
bcb7365a5a
Update commondocgenerator.class.php 2019-10-11 10:13:21 +02:00
Philippe GRAND
af88f44fd9 fix some translations 2019-10-11 09:51:17 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-10 23:24:50 +02:00
Laurent Destailleur
a8676e63c8 CSS 2019-10-10 16:46:50 +02:00
Laurent Destailleur
e2113c2f33 Fix sort lost after uploading a file 2019-10-10 16:41:24 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-09 13:40:46 +02:00
Frédéric FRANCE
5ac8ba8c65
fix travis 2019-10-08 22:13:19 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
stickler-ci
7e841350db Fixing style errors. 2019-10-08 13:24:41 +00:00
Laurent Destailleur
06eedece26
Merge pull request #11371 from bafbes/abb90058 
New:Show labels of countries in modulebuilder
 2019-10-08 15:17:16 +02:00
Laurent Destailleur
c724eef85c
Update ccountry.class.php 2019-10-08 15:16:56 +02:00
Laurent Destailleur
bd867f5e80
Update ccountry.class.php 2019-10-08 15:16:23 +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
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
a9c844460b Debug use of widget on Accounting home page 2019-10-07 14:39:29 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal 
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
 2019-10-07 14:24:22 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon 
Fix Fa-icon
 2019-10-07 13:03:27 +02:00
Laurent Destailleur
f4b752ee81 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/expedition/card.php
 2019-10-07 12:33:13 +02:00
VESSILLER
219b0d8925 FIX Import of product using units 2019-10-07 12:26:02 +02:00
atm-lena
8c024b3786 FIX : missing "$this->id" in "fetch" function 2019-10-07 11:26:10 +02:00
Laurent Destailleur
fc90638b2b Code comment 2019-10-07 10:42:18 +02:00
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-07 07:57:05 +02:00
Laurent Destailleur
80c1a92872 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:11:29 +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
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
Laurent Destailleur
e90234c2bc FIX escape email alias 2019-10-05 14:27:37 +02:00
Laurent Destailleur
c36d49a8c3 FIX escape email alias 2019-10-05 14:15:14 +02:00
Laurent Destailleur
827b1fe5d2 Use small image instead of mini for preview on document list 2019-10-05 11:17:09 +02:00
Laurent Destailleur
8bf9afb7ca FIX Attachement of linked files on ticket when sending a message 2019-10-04 19:41:35 +02:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Alexandre SPANGARO
ddadff5731 Add globe fa-icon 2019-10-03 21:32:55 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 18:37:14 +02:00
Laurent Destailleur
e9163015e5
Merge pull request #12029 from altatof/limitlang 
NEW : add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed
 2019-10-03 18:08:35 +02:00
Laurent Destailleur
b787e53020 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/card.php
 2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
altairis
699a3391c9 FCKeditor setup for tickets 2019-10-03 16:51:05 +02:00
stickler-ci
3168ad404c Fixing style errors. 2019-10-03 13:56:33 +00:00
altairis
153121b95d add MAIN_LANGUAGES_ALLOWED constant 2019-10-03 15:48:24 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php 2019-10-03 00:22:14 +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
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
320e9bbeec Text on tooltip can also be clickable 2019-10-02 15:54:42 +02:00
Laurent Destailleur
c6d38227b6 NEW Use a dedicated css for the pencil to edit a field 2019-10-02 14:44:38 +02:00
Laurent Destailleur
66829aa615 Use span instead of div by default for the tooltip picto. 2019-10-02 14:33:31 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency 
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
 2019-10-02 11:12:30 +02:00
Alexandre SPANGARO
94179f712d Update areacode 2019-10-02 08:58:25 +02:00
Alexandre SPANGARO
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Laurent Destailleur
68055e579f Check array is array 2019-10-01 16:26:55 +02:00
Laurent Destailleur
8ad81a092a Clean code 2019-10-01 16:19:54 +02:00
Laurent Destailleur
1ff8b879a8 Fix phpcs 2019-10-01 16:10:35 +02:00
Laurent Destailleur
29a2601b9d
Merge pull request #11567 from inoveaconseil/ContextDashboard 
WIP: Context dashboard
 2019-10-01 15:21:35 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
52b0a0d609
The variable $out seems to be never defined. 2019-10-01 13:45:18 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1 Fix bad name of trigger 2019-10-01 11:28:10 +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
Alexandre SPANGARO
8dea427f58 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-30 21:23:27 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
a5fce6cca8
Update CMailFile.class.php 2019-09-30 18:25:54 +02:00
Laurent Destailleur
b390cff172 Fix css 2019-09-30 17:22:22 +02:00
Laurent Destailleur
d65af06d20
Merge pull request #11869 from atm-john/new_ticket_messaging_page 
New ticket messaging page design
 2019-09-30 15:34:35 +02:00
Laurent Destailleur
d8de78dca9
Merge pull request #11984 from fuhraih/develop 
Fix 11554 and 7533
 2019-09-30 15:31:41 +02:00
Laurent Destailleur
5b582d1117 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 15:18:28 +02:00
Laurent Destailleur
bc1e59ee23
Merge pull request #11982 from frederic34/patch-13 
Add sendcontext to notification emails
 2019-09-30 15:18:12 +02:00
Laurent Destailleur
7dd4a829a5 Comment 2019-09-30 15:18:05 +02:00
Laurent Destailleur
d2881eb85b FIX CSS 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
 2019-09-29 19:26:37 +02:00
Laurent Destailleur
8acf7298b2 FIX CSS 2019-09-29 19:22:01 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-29 11:28:54 +02:00
stickler-ci
103efbbe5b Fixing style errors. 2019-09-28 20:55:58 +00:00
Alexandre SPANGARO
8e42ac8cd0 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-28 22:31:08 +02:00
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00