Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,248 Commits 36 Branches 190 Tags
40f10588e3d377fb71996fb58f6f91003eb6f35c
Commit Graph

366 Commits

Author SHA1 Message Date
Laurent Destailleur
40f10588e3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:31 +02:00
Laurent Destailleur
9bd3bb0594 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/lib/security.lib.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 12:43:03 +02:00
Laurent Destailleur
6e18d1b7ab Start to introduce dolibarr_main_dolcrypt_key 2023-10-03 02:00:00 +02:00
Laurent Destailleur
4fe2c674f1 Set log as a warning 2023-10-03 00:52:26 +02:00
Laurent Destailleur
669386d45c Fix error message 2023-10-02 12:53:50 +02:00
Laurent Destailleur
7f0eb701d7 Fix decrypt 2023-10-02 11:48:28 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Laurent Destailleur
e1217a8911 Fix phpcs 2023-09-26 21:11:23 +02:00
Quentin VIAL-GOUTEYRON
f4c6beac74 FIX rights paymentsc paiementcharge 2023-09-26 14:54:15 +02:00
TuxGasy
42c457a6a5 Return uncrypted chain if key is empty 2023-09-20 11:36:43 +02:00
TuxGasy
1e64a9c067 Fix #25860 not allow encrypt data if key and instance_unique_id are empty 2023-09-18 22:36:32 +02:00
Laurent Destailleur
b265dd0548 NEW extrafields password accepts 'dolcrypt' algorithm (reversible algo) 2023-09-10 19:29:49 +02:00
Laurent Destailleur
e9787451a8 Disallow more use of parenthesis into dol_eval 2023-09-08 05:51:06 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
Laurent Destailleur
f43ef55b26 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
	htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/modulebuilder/template/myobject_agenda.php
	htdocs/modulebuilder/template/myobject_list.php
 2023-09-05 19:38:45 +02:00
Laurent Destailleur
e2de78d9b4 Fix permission on recurring invoice 2023-09-05 19:13:51 +02:00
Laurent Destailleur
6459c862b8 Comment 2023-09-05 16:50:23 +02:00
Laurent Destailleur
4f63273e28 Clean code 2023-08-09 16:02:27 +02:00
Laurent Destailleur
e9273d6183 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/receipt.php
 2023-07-19 04:19:15 +02:00
Lucas Marcouiller
f202bc62f3 Fix : modulebuilder security check (#25354) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-07-13 17:13:43 +02:00
Laurent Destailleur
b6d16d28d7 Debug v18 2023-07-12 17:03:15 +02:00
onhairech
e5e9f914e5 qodana fix 3 : missing returns (#25332) 
* qodana fix 3 : missing returns

* removing a duplicated line
 2023-07-12 16:32:50 +02:00
Laurent Destailleur
31bd3d6045 Debug v18 2023-07-03 20:00:55 +02:00
Laurent Destailleur
b1e0b317c9 Debug v18 2023-06-29 13:16:44 +02:00
Laurent Destailleur
5fd7bcaae9 Debug v18 2023-06-29 12:10:31 +02:00
Laurent Destailleur
b5cdb1b88c Debug v18 2023-06-28 15:15:37 +02:00
Frédéric France
ebf83fdab6 use user hasRight 2023-06-19 23:18:13 +02:00
Frédéric France
5b3313220f use user hasRight 2023-06-19 20:54:08 +02:00
Frédéric France
68855ce672 use user hasRight 2023-06-19 20:08:27 +02:00
Laurent Destailleur
1c582aeb5f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-19 03:22:40 +02:00
Laurent Destailleur
bbc66299ba FIX Delete of bank of a thirdparty must need the edit thirdparty perm 2023-06-17 01:04:15 +02:00
Laurent Destailleur
6b94d60d9a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-16 01:36:46 +02:00
Laurent Destailleur
814da787b0 Merge pull request #25102 from frederic34/20230614 
use user hasRight
 2023-06-16 00:30:34 +02:00
Frédéric FRANCE
5715f3f01b add @since doc 2023-06-15 13:37:42 +02:00
Hystepik
6607dda4a7 Fix : bug with object id -1 in security check 2023-06-15 11:29:14 +02:00
Frédéric FRANCE
0118b4ac89 use user hasRgiht 2023-06-14 20:23:21 +02:00
Laurent Destailleur
0a8e7e3208 Debug v18 - drag drop bank 2023-06-11 01:07:21 +02:00
Frédéric France
fd4c24e000 use user hasRight 2023-06-05 23:49:13 +02:00
Laurent Destailleur
89e378bc78 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 19:07:04 +02:00
Laurent Destailleur
8d7e53a98c Clean code 2023-06-03 13:56:06 +02:00
atm-florian
cb9eac9047 FIX: dol_trunc may not have the desired behaviour for truncating a cryptographic initialiszation vector, for instance when MAIN_DISABLE_TRUNC is used 2023-05-31 12:13:50 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
Laurent Destailleur
48275b04cf Merge pull request #24770 from atm-jpb/fix-chargesociales 
FIX : add charchesociales in security.lib.php
 2023-05-15 23:49:08 +02:00
hystepik
325c75db54 Fix #24769 : External user cannot access card 2023-05-15 14:03:37 +02:00
stickler-ci
76e7195dd0 Fixing style errors. 2023-05-15 09:16:23 +00:00
jpb
a8cfea083e add charchesociales in security.lib.php 2023-05-15 11:09:35 +02:00
Laurent Destailleur
c3c162441f Debug v18 2023-05-10 04:11:41 +02:00
Laurent Destailleur
a77b7ca395 Merge pull request #24674 from frederic34/instance_unique_id 
use $conf->file->instance_unique_id instead of $dolibarr_main_instance_unique_id
 2023-05-05 01:46:14 +02:00
Laurent Destailleur
f61f425231 NEW upload a file by drag and drop on social contribution and salary 2023-05-04 17:28:42 +02:00
Frédéric FRANCE
e4ec6f0b63 use instance_unique_id 2023-05-03 12:01:36 +02:00