Commit Graph

111629 Commits

Author SHA1 Message Date
This Charlène
2d8c629200
if we set another view list mode, we keep it
if we set another view list mode, we keep it (till we change one more time)
2022-08-11 09:01:55 +02:00
Laurent Destailleur
febc1b8600
Merge pull request #21470 from thomas-Ngr/develop_fix_formconfirm_send_as_post
send formconfirm as a POST
2022-08-11 02:09:15 +02:00
Laurent Destailleur
98b8c81104 Restore lost file 2022-08-11 01:42:58 +02:00
Laurent Destailleur
a5282af145
Merge pull request #21601 from FranckInfans/modifTicket
Module Tickets - modification select
2022-08-11 01:41:48 +02:00
Laurent Destailleur
49319cc0b5
Update .gitignore 2022-08-11 01:40:46 +02:00
Laurent Destailleur
f91cdf9cec
Update .gitignore 2022-08-11 01:39:33 +02:00
Laurent Destailleur
ee05dcb965
Merge pull request #21709 from Easya-Solutions/new-productlot-make-sell-or-eat-by-mandatory-sql
NEW make sell or eat by mandatory in product lot (SQL)
2022-08-11 01:35:36 +02:00
Laurent Destailleur
9ad1c845ef
Merge pull request #21706 from frederic34/patch-8
fix php8 warning
2022-08-11 01:30:17 +02:00
Laurent Destailleur
97e198c4ec
Merge pull request #21704 from frederic34/patch-5
fix php8 warning
2022-08-11 01:29:54 +02:00
Laurent Destailleur
93e29672d6
Merge pull request #21701 from dolibit-ut/patch-407
Update note.php
2022-08-11 01:29:44 +02:00
Laurent Destailleur
abfaefbe41
Merge pull request #21700 from frederic34/outh2forswiftmailer
add oauth2 for swiftmailer
2022-08-11 01:27:53 +02:00
Laurent Destailleur
aea4c1df08
Merge pull request #21702 from dolibit-ut/patch-408
Update index.php
2022-08-11 01:26:01 +02:00
Laurent Destailleur
f8266b643f
Merge pull request #21703 from frederic34/patch-4
remove duplicate
2022-08-11 01:25:48 +02:00
Laurent Destailleur
6eac066d50
Merge pull request #21705 from frederic34/patch-7
fix php8 warning
2022-08-11 01:25:37 +02:00
Laurent Destailleur
698c1ea493
Merge pull request #21707 from frederic34/patch-9
fix php8 warning
2022-08-11 01:25:18 +02:00
Laurent Destailleur
cc9c0ae115
Merge pull request #21708 from frederic34/patch-10
fix php8 warning
2022-08-11 01:24:59 +02:00
Laurent Destailleur
43fcb11500 Fix scrutninizer 2022-08-11 01:13:25 +02:00
Laurent Destailleur
d997dfc96e Fix scrutinizer 2022-08-11 01:09:56 +02:00
Laurent Destailleur
4fb3a2e296 Fix scrutinizer 2022-08-11 00:52:08 +02:00
Laurent Destailleur
796274ad65 Doc 2022-08-11 00:47:37 +02:00
Laurent Destailleur
c4a24197a7 Add phpunit for MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT 2022-08-10 23:03:42 +02:00
Laurent Destailleur
185980c9c6 Enhance protection on limit of external links 2022-08-10 22:55:09 +02:00
Laurent Destailleur
c1bea1b1e4 Add the anti-csrf-token into header 2022-08-10 22:24:45 +02:00
Laurent Destailleur
9b58b61d60 Enhance MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES #yogosha12008 2022-08-10 20:19:43 +02:00
Laurent Destailleur
dce27fa165 Clean code 2022-08-10 19:12:19 +02:00
Laurent Destailleur
6858b47542 FIX #yogosha12006 2022-08-10 18:47:33 +02:00
Laurent Destailleur
cee88c0a61 Fix missing header 2022-08-10 18:45:06 +02:00
Laurent Destailleur
6d12caae98 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-10 18:34:52 +02:00
lvessiller
8a910e6cef FIX resolve conflicts 2022-08-10 18:10:17 +02:00
Laurent Destailleur
bde596deb3 Upgrade to jquery-ui 1.13.2 #yogosha12015 2022-08-10 17:55:42 +02:00
lvessiller
d6494ae484 NEW make sell or eat by mandatory in product lot (SQL) 2022-08-10 17:35:39 +02:00
Frédéric FRANCE
3efcd5f618 fix log 2022-08-10 16:29:37 +02:00
Frédéric FRANCE
a465aa8f58
fix php8 warning 2022-08-10 14:47:04 +02:00
Laurent Destailleur
a0f5c69ccd Debug v16 2022-08-10 14:45:21 +02:00
Frédéric FRANCE
78c5521d80
fix php8 warning 2022-08-10 14:42:07 +02:00
Frédéric FRANCE
5377c6c055
fix php8 warning 2022-08-10 14:38:38 +02:00
Frédéric FRANCE
cded29f684
fix php8 warning 2022-08-10 14:36:29 +02:00
Laurent Destailleur
ec042b1701 css 2022-08-10 14:32:26 +02:00
Frédéric FRANCE
8465c08253
fix php8 warning 2022-08-10 14:29:13 +02:00
Laurent Destailleur
4c76223d63 Doc 2022-08-10 14:09:14 +02:00
Frédéric FRANCE
af8abecbd6 wip 2022-08-10 13:50:42 +02:00
Frédéric FRANCE
bf704ec360
remove duplicate 2022-08-10 13:41:30 +02:00
Frédéric FRANCE
917ab403ff wip 2022-08-10 13:38:18 +02:00
UT from dolibit
a8a107fb37
Update index.php
delete double entry:  $taskstatic = new Task($db);
2022-08-10 13:37:15 +02:00
UT from dolibit
6f6ced5b9c
Update note.php
$help_url 
+  DE:Modul_Produkte
+  DE:Modul_Leistungen
2022-08-10 13:31:44 +02:00
Frédéric FRANCE
f704d1feb2 Merge remote-tracking branch 'upstream/develop' into outh2forswiftmailer 2022-08-10 13:27:18 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Laurent Destailleur
9e55377f0a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-10 13:10:52 +02:00
Laurent Destailleur
f6ba33f81a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-10 13:08:11 +02:00
Laurent Destailleur
643f4c8bdc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-10 13:08:03 +02:00