Anthony Berton
|
e1f36ae107
|
Update functions.lib.php
|
2019-11-16 17:37:18 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
Laurent Destailleur
|
411e9c87e3
|
Debug feature to set sender profiles
|
2019-11-14 11:53:28 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +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 |
|
Laurent Destailleur
|
771f304c79
|
Fix typo
|
2019-11-09 18:40:08 +01:00 |
|
Anthony Berton
|
4449c6d2a7
|
Update functions.lib.php
|
2019-11-08 16:34:20 +01:00 |
|
Laurent Destailleur
|
747113551b
|
Debug pagination of bookmark list
|
2019-11-05 09:52:33 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
d9f333d828
|
Merge pull request #12289 from frederic34/datetime
php is > 5.4
|
2019-11-02 11:46:34 +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 |
|
Laurent Destailleur
|
135e65c4aa
|
Look and feel v11
Enhance the progress bar of tasks
|
2019-11-01 15:53:57 +01:00 |
|
Frédéric FRANCE
|
da238e94e1
|
php is > 5.4
|
2019-11-01 15:21:21 +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 |
|
Laurent Destailleur
|
5b5a2e9804
|
Clean code
|
2019-11-01 03:25:09 +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
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Laurent Destailleur
|
f4545a2068
|
Debug method MAIN_STATUS_USES_CSS
|
2019-10-23 17:31:54 +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
|
8242281ef8
|
Close #12096
|
2019-10-22 14:39:33 +02:00 |
|
Laurent Destailleur
|
b2bbee55f1
|
Fix phpcs
|
2019-10-22 12:37:36 +02:00 |
|
Anthony Berton
|
5e7d615250
|
Update functions.lib.php
|
2019-10-21 21:06:48 +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
|
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
|
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
|
33c35780e0
|
wip
|
2019-10-20 11:17:54 +02:00 |
|
Alfredo Altamirano
|
71f9b4f36b
|
Translation of parameter documentation
|
2019-10-18 12:55:21 -05: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 |
|
Laurent Destailleur
|
6d05d42c50
|
Look and feel v11
|
2019-10-16 11:26:20 +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
|
c869cbe193
|
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
Unlock title button feature
|
2019-10-14 23:55:10 +02:00 |
|
Frédéric FRANCE
|
c143584af4
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 21:16:54 +02:00 |
|
Laurent Destailleur
|
c338db6c36
|
Fix unlink picto
|
2019-10-12 19:16:36 +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
|
cc73877e03
|
Merge branch 'develop' into patch-18
|
2019-10-11 16:32:48 +02:00 |
|
John Botella
|
9194eb4bec
|
Fix block title height if no button
|
2019-10-11 09:14:10 +02:00 |
|
John Botella
|
724999f1ce
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-11 08:40:43 +02:00 |
|
Frédéric FRANCE
|
03bbfc6ad9
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-10 23:24:50 +02:00 |
|
Frédéric FRANCE
|
be00576717
|
Update functions.lib.php
|
2019-10-10 08:22:14 +02:00 |
|
Frédéric FRANCE
|
d4757a0b5b
|
globe fontawesome
|
2019-10-09 23:20:15 +02:00 |
|
Laurent Destailleur
|
072a0a26d6
|
Use a font awesome icon to show "shippable" flag on orders.
|
2019-10-09 18:07:00 +02:00 |
|
Laurent Destailleur
|
db651a607d
|
Use fontawesome for img_warning
|
2019-10-09 17:33:46 +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
|
f55a4d77e4
|
css
|
2019-10-08 16:41:03 +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
|
1060ac4608
|
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
Fix : LibStatut missing dolgetstatus usage
|
2019-10-07 13:08:33 +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
|
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
|
503973cec9
|
FIX Edit of ticket module parameters erased others
|
2019-10-04 14:04:31 +02:00 |
|
ATM john
|
027c8224b0
|
Fix dolGetStatus unused
|
2019-10-03 21:34:01 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
ATM john
|
77f666a236
|
Fix dolGetStatus param
|
2019-10-03 21:28:11 +02:00 |
|
Alexandre SPANGARO
|
8668e7157a
|
Add bookmark fa-icon
|
2019-10-03 21:00:59 +02:00 |
|
Alexandre SPANGARO
|
d0840b038f
|
Remove constant MAIN_DISABLE_FONT_AWESOME_5
|
2019-10-03 20:42:02 +02:00 |
|
Alexandre SPANGARO
|
14381927c7
|
Fix Bank Fa-icon
|
2019-10-03 20:32:15 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
Laurent Destailleur
|
b60ee4c18c
|
css
|
2019-10-03 09:58:49 +02:00 |
|
Frédéric FRANCE
|
37bb548d21
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 20:56:32 +02:00 |
|
Laurent Destailleur
|
b6a95b4be5
|
Look and feel v11
|
2019-10-02 19:04:24 +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
|
f89701b4d4
|
Fix technical id align on left
|
2019-10-02 18:55:18 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
ATM john
|
4d5ffbb5c4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-01 20:45:04 +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
|
3b9bf2b06a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 12:25:34 +02:00 |
|
Laurent Destailleur
|
11e01f5c86
|
Use correct style for table header
|
2019-10-01 12:02:28 +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 |
|
ATM john
|
b01bd979b5
|
Unlock title button feature
|
2019-09-30 21:10:16 +02:00 |
|
Frédéric FRANCE
|
f32f528bc2
|
fix merge
|
2019-09-30 19:36:57 +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
|
ecc2e8df67
|
Fix restore lost images
|
2019-09-30 17:58:31 +02:00 |
|
Laurent Destailleur
|
dc7ad61940
|
Add class reposition on button that switch the view mode
|
2019-09-30 17:46:53 +02:00 |
|
Laurent Destailleur
|
ce7e8c83a3
|
Use a dedicated css imgforviewmode for button used to switch view
|
2019-09-30 17:08:57 +02:00 |
|
Laurent Destailleur
|
bbc98c19bc
|
Update functions.lib.php
|
2019-09-30 15:25:55 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +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
|
981c5c877a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-27 20:02:08 +02:00 |
|
Laurent Destailleur
|
24ad67e0e1
|
Fix missing $conf
|
2019-09-27 20:01:57 +02:00 |
|
Laurent Destailleur
|
d0d884742f
|
FIX #11861 Not consistent code to manage measuring units
|
2019-09-27 19:45:33 +02:00 |
|
Laurent Destailleur
|
66cbb4020b
|
Merge branch 'develop' into patch-4
|
2019-09-27 14:46:39 +02:00 |
|
Alexandre SPANGARO
|
4b73e09c60
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-27 14:20:53 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
f96c9c3bb5
|
FIX #11931 #11963
|
2019-09-27 11:51:34 +02:00 |
|
Alexandre SPANGARO
|
e38bb89a2e
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-27 11:48:40 +02:00 |
|
Frédéric FRANCE
|
03086026b8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-27 08:06:13 +02:00 |
|
Laurent Destailleur
|
aa5f35f14f
|
Fix image on ticket
|
2019-09-26 14:28:34 +02:00 |
|