Laurent Destailleur
|
75570cc984
|
Merge pull request #15743 from frederic34/mycompanysocialnetworks
Mycompany social networks separate tab
|
2020-12-12 19:21:29 +01:00 |
|
Laurent Destailleur
|
a5d2e04dea
|
Debug v13
|
2020-12-12 19:09:07 +01:00 |
|
Laurent Destailleur
|
d19cdae980
|
Merge pull request #15727 from frederic34/patch-8
add option hide topmenu in Config/Display
|
2020-12-12 18:48:11 +01:00 |
|
Frédéric FRANCE
|
818af46b86
|
clean
|
2020-12-12 18:37:09 +01:00 |
|
Frédéric FRANCE
|
b8a01b4d2d
|
my company social networks in a separate tab
|
2020-12-12 18:31:26 +01:00 |
|
Frédéric FRANCE
|
621f246d58
|
my company social networks in a separate tab
|
2020-12-12 18:26:54 +01:00 |
|
Frédéric FRANCE
|
0b3a5dc796
|
fix style
|
2020-12-11 18:09:37 +01:00 |
|
Frédéric FRANCE
|
e9288ce0da
|
fix translation
|
2020-12-11 17:58:43 +01:00 |
|
Frédéric FRANCE
|
8882759e7a
|
hide topmenu option in config/display
|
2020-12-11 17:55:08 +01:00 |
|
Laurent Destailleur
|
1f6f434a9c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export_files.php
test/phpunit/SecurityTest.php
|
2020-12-11 15:56:19 +01:00 |
|
Laurent Destailleur
|
4fcd3fe493
|
Fix disallow -- string into filename for security purpose. Vulnerability
reported by Yılmaz Değirmenci
|
2020-12-11 15:12:42 +01:00 |
|
Laurent Destailleur
|
2adbd29b49
|
Debug generation of doc from modulebuilder
|
2020-12-11 14:22:36 +01:00 |
|
Laurent Destailleur
|
c2124479c7
|
Fix missing test on IMAP
|
2020-12-10 16:05:43 +01:00 |
|
Laurent Destailleur
|
c850f4c918
|
Fix fatal error
|
2020-12-10 16:01:06 +01:00 |
|
Laurent Destailleur
|
abe8d25a9a
|
Merge pull request #15711 from hregis/fix_regenerate_mycompany_thumbs
FIX regenerate mycompany logos thumbs if not exists
|
2020-12-09 22:06:19 +01:00 |
|
Laurent Destailleur
|
075cacb8cf
|
Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF
|
2020-12-09 17:40:28 +01:00 |
|
Regis Houssin
|
c18e8ac317
|
FIX regenerate mycompany logos thumbs if not exists
|
2020-12-09 09:28:46 +01:00 |
|
Laurent Destailleur
|
6e479af5b6
|
Merge pull request #15661 from frederic34/adminsms
fix trans removing html
|
2020-12-07 22:45:14 +01:00 |
|
Laurent Destailleur
|
ff1e6ec371
|
Merge pull request #15665 from frederic34/admin_boxes
fix style
|
2020-12-07 22:40:51 +01:00 |
|
Laurent Destailleur
|
d9ba821411
|
Merge pull request #15669 from frederic34/template
typo ortho
|
2020-12-07 22:35:45 +01:00 |
|
Laurent Destailleur
|
3fb63e6a4b
|
Look and feel v13
|
2020-12-07 15:51:22 +01:00 |
|
Frédéric FRANCE
|
d1204e5e9b
|
typo ortho
|
2020-12-05 15:35:52 +01:00 |
|
Laurent Destailleur
|
991cfde0a2
|
Fix css
|
2020-12-05 14:46:29 +01:00 |
|
Frédéric FRANCE
|
8996dd9803
|
fix style
|
2020-12-05 10:28:40 +01:00 |
|
Frédéric FRANCE
|
cccc670c05
|
fix trans removing html
|
2020-12-05 08:45:58 +01:00 |
|
Laurent Destailleur
|
bb0c33a49e
|
Merge pull request #15654 from frederic34/commonkanban
keep common if wanted
|
2020-12-04 22:25:51 +01:00 |
|
Frédéric FRANCE
|
4039ca269f
|
fix translation removing html
|
2020-12-04 21:08:51 +01:00 |
|
stickler-ci
|
d89970ddd1
|
Fixing style errors.
|
2020-12-04 19:31:53 +00:00 |
|
Frédéric FRANCE
|
c8407b2f91
|
keep common if wanted
|
2020-12-04 20:28:05 +01:00 |
|
Laurent Destailleur
|
e7306625f0
|
Fix look and feel v13
|
2020-12-04 15:28:12 +01:00 |
|
Laurent Destailleur
|
56d56929ec
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/dolibarr.php
|
2020-12-03 16:39:22 +01:00 |
|
Laurent Destailleur
|
ac29db92cb
|
FIX #15618
|
2020-12-03 16:35:42 +01:00 |
|
Laurent Destailleur
|
1ec3d4cfdf
|
CSS
|
2020-12-03 13:19:35 +01:00 |
|
Laurent Destailleur
|
bfe4eb7309
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/emailcollector_card.php
htdocs/core/modules/modProduct.class.php
|
2020-12-03 11:26:53 +01:00 |
|
Laurent Destailleur
|
b324425db8
|
code comment
|
2020-12-03 11:19:41 +01:00 |
|
Laurent Destailleur
|
0fd865d8af
|
FIX Better error message with IMAP when connection fails
|
2020-12-03 11:16:02 +01:00 |
|
Laurent Destailleur
|
748630eb25
|
FIX Better error message when IMAP connection fails
|
2020-12-03 11:15:06 +01:00 |
|
Laurent Destailleur
|
cf2dd28a21
|
Fix warning when setup not complete.
|
2020-11-30 19:40:53 +01:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
150dd71774
|
Look and feel v13
|
2020-11-29 16:02:39 +01:00 |
|
Laurent Destailleur
|
6c65ebef0d
|
Look and feel v13
|
2020-11-29 15:16:53 +01:00 |
|
Laurent Destailleur
|
df17c2f26a
|
Removed dead code generating warning.
CSS
|
2020-11-28 16:48:32 +01:00 |
|
Laurent Destailleur
|
41984f9934
|
Clean code
|
2020-11-28 14:00:35 +01:00 |
|
Laurent Destailleur
|
7e6af6a54f
|
FIX translation not loaded for error message of numbering modules
|
2020-11-28 02:09:27 +01:00 |
|
Frédéric FRANCE
|
12dce9cd75
|
avoid large screen for code
|
2020-11-26 23:53:10 +01:00 |
|
Frédéric FRANCE
|
f03930e55e
|
doxygen
|
2020-11-26 23:49:42 +01:00 |
|
Laurent Destailleur
|
4da4499569
|
FIX Param joinfiles not sanitized
Conflicts:
htdocs/admin/mails_templates.php
|
2020-11-26 23:07:52 +01:00 |
|
Laurent Destailleur
|
4114201da9
|
FIX Param joinfiles not sanitized
|
2020-11-26 23:05:49 +01:00 |
|
Laurent Destailleur
|
61c0c7f0a6
|
Fix GETPOST second param
|
2020-11-26 22:59:05 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Laurent Destailleur
|
2f6f242d99
|
CSS
|
2020-11-23 12:29:38 +01:00 |
|
Laurent Destailleur
|
60bfbe2e57
|
Merge pull request #15448 from Givriz/dev
Feature : creation of a "button-save" class
|
2020-11-21 23:44:30 +01:00 |
|
Laurent Destailleur
|
f39ad2359a
|
Debug
|
2020-11-21 17:01:17 +01:00 |
|
Laurent Destailleur
|
bf94ce6aad
|
Fix warnings
|
2020-11-21 16:49:54 +01:00 |
|
Laurent Destailleur
|
95b79094df
|
Fix warning.
Module cron is more clear.
|
2020-11-21 16:27:50 +01:00 |
|
Laurent Destailleur
|
3534555909
|
Fix setup of scheduled jobs
|
2020-11-21 14:14:53 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Frédéric FRANCE
|
f92b5e87dc
|
doxygen
|
2020-11-13 14:35:04 +01:00 |
|
Laurent Destailleur
|
a98d025f5a
|
Clean option for replenishment on real stock.
|
2020-11-13 11:06:51 +01:00 |
|
Laurent Destailleur
|
56bc788d16
|
Merge pull request #15375 from frederic34/patch-6
doxygen
|
2020-11-13 09:33:36 +01:00 |
|
Laurent Destailleur
|
350d694181
|
Fix security page
|
2020-11-12 19:15:44 +01:00 |
|
Frédéric FRANCE
|
64c48a246a
|
The method PrestaShopWebservice::... is not static, but was called statically
|
2020-11-12 18:53:26 +01:00 |
|
Frédéric FRANCE
|
caa82a1e2f
|
Update PSWebServiceLibrary.class.php
|
2020-11-12 18:43:52 +01:00 |
|
Frédéric FRANCE
|
9c7d698cc7
|
Create index.html
|
2020-11-12 18:40:34 +01:00 |
|
Frédéric FRANCE
|
9e59a9aa8c
|
Create index.html
|
2020-11-12 18:39:50 +01:00 |
|
Laurent Destailleur
|
754a9778ea
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/modUser.class.php
|
2020-11-12 14:17:10 +01:00 |
|
Laurent Destailleur
|
0764cb2abd
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-11-12 14:13:19 +01:00 |
|
Laurent Destailleur
|
a168c3fbb1
|
Remove warnings
|
2020-11-12 12:33:29 +01:00 |
|
Frédéric FRANCE
|
ad05451427
|
Fix missing getpost for scandir odt path
|
2020-11-12 11:23:03 +01:00 |
|
Laurent Destailleur
|
a804ad4914
|
css
|
2020-11-11 16:15:06 +01:00 |
|
Laurent Destailleur
|
741806f47e
|
Clean code
|
2020-11-11 16:08:00 +01:00 |
|
Laurent Destailleur
|
ad04646c05
|
Fix must use json_encode/decode instead of dol_json_encode/decode
|
2020-11-11 15:56:19 +01:00 |
|
Laurent Destailleur
|
e221e19212
|
Update doc
|
2020-11-11 13:20:17 +01:00 |
|
Laurent Destailleur
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Laurent Destailleur
|
779566ef30
|
Clean page with security summary
|
2020-11-05 10:03:53 +01:00 |
|
Laurent Destailleur
|
60f55c81bf
|
Fix error if module xml not loaded
|
2020-11-04 17:45:10 +01:00 |
|
Laurent Destailleur
|
38d88ced0b
|
Debug the security page
|
2020-11-04 16:07:59 +01:00 |
|
Laurent Destailleur
|
0dce2c45d9
|
Trans
|
2020-11-02 10:15:33 +01:00 |
|
Frédéric FRANCE
|
fcddf03164
|
fix
|
2020-11-01 14:13:39 +01:00 |
|
Frédéric FRANCE
|
f0d6029d60
|
Merge remote-tracking branch 'upstream/develop' into emailsubscription
|
2020-11-01 14:02:18 +01:00 |
|
Frédéric FRANCE
|
cdc0b8a7d7
|
add models
|
2020-11-01 13:59:43 +01:00 |
|
Frédéric FRANCE
|
c2202e10eb
|
add missing pictos
|
2020-11-01 13:48:32 +01:00 |
|
Frédéric FRANCE
|
d9bf49c5dc
|
phpcs
|
2020-10-31 21:04:38 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
stickler-ci
|
284c9bc6a8
|
Fixing style errors.
|
2020-10-31 13:34:01 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Laurent Destailleur
|
8d6fa350b9
|
Clean code
|
2020-10-31 12:41:26 +01:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Scrutinizer Auto-Fixer
|
208740c9c4
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-28 16:49:52 +00:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Laurent Destailleur
|
1b939ab8f4
|
Merge pull request #15183 from frederic34/dol_fiche_end
end of dol_fiche_end
|
2020-10-27 19:00:32 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
80d13e711c
|
More secured getURLContent method. Add PHPUnit on getURLContent
|
2020-10-27 18:02:05 +01:00 |
|
Laurent Destailleur
|
d750dc48a1
|
More secured getURLContent method. Add PHPUnit on getURLContent
|
2020-10-27 15:06:16 +01:00 |
|
Laurent Destailleur
|
4adaf67d47
|
Hide setup we don't need if email are disabled globally
CSS
|
2020-10-27 11:40:30 +01:00 |
|
Laurent Destailleur
|
8578a7cd7c
|
Fix regressions
|
2020-10-25 17:02:25 +01:00 |
|
Laurent Destailleur
|
cd4d738a56
|
Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
|
2020-10-25 16:01:18 +01:00 |
|
Laurent Destailleur
|
4d9c8e2225
|
Merge pull request #15124 from frederic34/retrieve
retrieve the spelling
|
2020-10-25 14:48:51 +01:00 |
|
Laurent Destailleur
|
335d1db3a6
|
Update dict.php
|
2020-10-25 14:43:33 +01:00 |
|
bahfir abbes
|
3f03b678e9
|
fix:rowid is string in currencies table
|
2020-10-24 03:47:10 +01:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Laurent Destailleur
|
e22760e8d5
|
Merge pull request #15113 from frederic34/patch-8
code field for product nature must be numeric
|
2020-10-23 04:08:39 +02:00 |
|
Frédéric FRANCE
|
78ec68e2cf
|
code field for product nature must be numeric
|
2020-10-23 00:04:55 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
0616b9bc9b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-10-22 17:55:38 +02:00 |
|
Laurent Destailleur
|
b45c99faec
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-22 15:03:34 +02:00 |
|
Laurent Destailleur
|
92c6152ad5
|
FIX #14995
|
2020-10-22 15:03:12 +02:00 |
|
Laurent Destailleur
|
7605cb1871
|
Update facture_situation.php
|
2020-10-21 19:54:28 +02:00 |
|
John Botella
|
d9074e70e1
|
FIX admin conf selected
|
2020-10-21 13:27:37 +02:00 |
|
Laurent Destailleur
|
4ec4801c77
|
FIX Only template of enabled modules visible
|
2020-10-20 15:54:08 +02:00 |
|
Laurent Destailleur
|
8432a2a0dd
|
Fix phpcs
|
2020-10-17 19:05:08 +02:00 |
|
Laurent Destailleur
|
27698ab5c7
|
Protect page for module management with token even for GET action
|
2020-10-17 14:01:09 +02:00 |
|
Laurent Destailleur
|
20b6d3828e
|
NEW Show image of user in the combo select of users
|
2020-10-17 13:27:39 +02:00 |
|
Laurent Destailleur
|
5df1218d9f
|
Enhance page to setup email templates
|
2020-10-17 12:59:22 +02:00 |
|
Laurent Destailleur
|
e3552e7e02
|
Clean code
|
2020-10-16 20:17:54 +02:00 |
|
Laurent Destailleur
|
67785887fd
|
Merge pull request #15035 from andreubisquerra/master
Change the tag char for security reasons in 'Receipt Printer' module
|
2020-10-16 17:20:04 +02:00 |
|
Laurent Destailleur
|
7504f92a41
|
Standardize code and look and feel
|
2020-10-16 13:30:20 +02:00 |
|
jove@bisquerra.com
|
f90b236e0f
|
Change the tag char for security reasons in 'Receipt Printer' module
|
2020-10-15 23:44:13 +02:00 |
|
Laurent Destailleur
|
64b1a31e45
|
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
NEW : Nature of product is now a dictionay
|
2020-10-15 21:07:42 +02:00 |
|
Laurent Destailleur
|
844c4dec4d
|
css
|
2020-10-15 13:16:17 +02:00 |
|
Florian HENRY
|
bcb98d1d67
|
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
|
2020-10-14 18:16:34 +02:00 |
|
Laurent Destailleur
|
bb367a4489
|
Update dict.php
|
2020-10-14 17:40:27 +02:00 |
|
Laurent Destailleur
|
bfe760ffcb
|
Merge pull request #15012 from bafbes/abb120349
fix:two fields with same ids
|
2020-10-14 17:15:24 +02:00 |
|
Florian HENRY
|
fd1fa1c777
|
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
|
2020-10-14 16:39:54 +02:00 |
|
Florian HENRY
|
7d09f22afa
|
add correct import and dict edition
|
2020-10-14 16:39:42 +02:00 |
|
Laurent Destailleur
|
fe19eea540
|
Merge pull request #15007 from hregis/develop_bug2
FIX avoid spaces in file name
|
2020-10-14 14:45:40 +02:00 |
|
Laurent Destailleur
|
02fcee5d94
|
Fix make the default sender email mandatory into setup (if not defined,
no emails can be sent).
|
2020-10-14 12:21:31 +02:00 |
|
bahfir abbes
|
8b0a6d7f40
|
fix:two fields with same ids is incorrect html
|
2020-10-14 00:21:12 +01:00 |
|
Laurent Destailleur
|
85825a0104
|
Init page for security info
|
2020-10-14 00:57:39 +02:00 |
|
Regis Houssin
|
00ee1a7433
|
FIX compatibility with LF (Line Feed)
|
2020-10-13 15:08:43 +02:00 |
|
Regis Houssin
|
1348c03ca0
|
FIX avoid spaces in file name
|
2020-10-13 14:46:17 +02:00 |
|
Laurent Destailleur
|
75997bb8f5
|
Minor fixes
|
2020-10-12 14:01:15 +02:00 |
|
Laurent Destailleur
|
726fd1b631
|
Merge pull request #11227 from aspangaro/10.0_intracommreport
NEW module Intracomm report
|
2020-10-12 13:35:58 +02:00 |
|
Laurent Destailleur
|
920b31140b
|
Fix exclude of backup files when path are for Windows
|
2020-10-11 13:32:50 +02:00 |
|
Laurent Destailleur
|
86c46bbb97
|
Fix backup - Exclude existing backup when path is uppercase.
|
2020-10-11 13:18:16 +02:00 |
|
Laurent Destailleur
|
ced91d049d
|
Show admin star on audit page list
|
2020-10-10 16:43:15 +02:00 |
|
Alexandre SPANGARO
|
ca7ad35342
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2020-10-09 06:39:42 +02:00 |
|
Laurent Destailleur
|
66744658a2
|
Merge pull request #14966 from hregis/12_bug
FIX Multicompany compatibility (missing entity value)
|
2020-10-08 19:26:49 +02:00 |
|
Aurélien
|
b6283c1a5d
|
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
|
2020-10-08 16:19:10 +02:00 |
|
Regis Houssin
|
09e7420936
|
FIX missing entity in href
|
2020-10-08 15:51:46 +02:00 |
|
Regis Houssin
|
aa84b76b6a
|
FIX Multicompany compatibility (missing entity value)
|
2020-10-08 11:43:12 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Laurent Destailleur
|
f16a58a62c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modSocialNetworks.class.php
|
2020-10-06 23:36:15 +02:00 |
|
Laurent Destailleur
|
b0d20f92dc
|
FIX autofocus on first setup
|
2020-10-06 17:32:55 +02:00 |
|
AurelienBinard
|
39d538befc
|
Merge branch 'develop' into translateModLivraison2ModDelivery
|
2020-10-06 16:20:25 +02:00 |
|
Aurélien
|
1af42b313c
|
rename livraison pdf and dependencies #14697
|
2020-10-06 13:32:02 +02:00 |
|
Aurélien
|
af7c23b2ac
|
rename folder admin/livraison.php and dependencies #14697
|
2020-10-06 12:05:24 +02:00 |
|
Aurélien
|
5571a166c6
|
change variable #14697
|
2020-10-06 11:37:55 +02:00 |
|
stickler-ci
|
0e7d429991
|
Fixing style errors.
|
2020-10-05 13:24:17 +00:00 |
|