Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-31 14:12:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,034 Commits 37 Branches 191 Tags
bc353c19a95a449586d2f32bcd6ec5bbe75148df
Commit Graph

2873 Commits

Author SHA1 Message Date
Laurent Destailleur
81882f8243 Merge pull request #19065 from javieralapps4up/develop 
Access forbidden when the password of other users is changed
 2021-10-22 22:52:55 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Laurent Destailleur
e4a757ff9e Merge pull request #19086 from FHenry/14_fix_various_warning 
fix: fix various php warning
 2021-10-22 11:39:48 +02:00
Florian HENRY
9a9ed8989e fix various warning 2021-10-22 10:50:54 +02:00
Florian HENRY
444f7703a6 fix various warning 2021-10-22 10:50:24 +02:00
Florian HENRY
64bb2e6ece fix various warning 2021-10-22 10:49:47 +02:00
javieralapps4up
0020a5c61c Update card.php 
When you edit a user (with read others and change password others), the form allows the civility_code to be changed but the changes are not saved. I will propose a change in the user card to avoid this
 2021-10-22 02:53:37 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Alexandre SPANGARO
e9ecb2e1ee Translation 2021-10-17 08:11:34 +02:00
Alexandre SPANGARO
102c8a5772 FIX User salary card - translation problem 2021-10-17 08:02:28 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Laurent Destailleur
ff56415c00 Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
123c047e29 Fix look and feel v14 2021-10-05 13:34:25 +02:00
Gauthier PC portable 024
bea17e8d78 FIX : travis + User::hasRight() function modification to take care of hrm specific rights 2021-10-05 12:42:42 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
e6e224f33c Better translation 2021-09-28 11:53:00 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Anthony Berton
35707d1f4f Update list.php 2021-09-21 09:13:01 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
0ae8403fb4 Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right 
CLOSE #18689 REST API module: add api key generate / modify right.
 2021-09-17 12:10:03 +02:00
Laurent Destailleur
1a705adf6e Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Florian HENRY
d464922d71 fix: LDAP Search LIMIT must be after ORDER BY 2021-09-13 09:44:54 +02:00
lainwir3d
2fe85f2a86 CLOSE #18689 REST API module: add api key generate / modify right. 2021-09-12 15:47:56 +04:00
Laurent Destailleur
43684f26c9 Merge pull request #18628 from lainwir3d/fix_rest_api_fix_self_user_info_read 
FIX #18627 REST API: Allow users with self read / modify rights to get own info
 2021-09-10 13:34:56 +02:00
Laurent Destailleur
b1c23b9a93 Update api_users.class.php 2021-09-10 13:31:17 +02:00
Laurent Destailleur
d4bfbc69a4 Update api_users.class.php 2021-09-10 13:30:28 +02:00
Laurent Destailleur
999ad7629f Update api_users.class.php 2021-09-10 13:29:19 +02:00
Laurent Destailleur
17b9957197 Update api_users.class.php 2021-09-10 13:20:49 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
lainwir3d
ad7a5eaf70 Merge remote-tracking branch 'origin/develop' into fix_rest_api_fix_self_user_info_read 2021-09-09 17:44:22 +04:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
 2021-09-09 15:15:26 +02:00
Regis Houssin
303b0e7f31 FIX better sql request 2021-09-09 09:21:30 +02:00
Regis Houssin
8c95ada9fd FIX wrong users count in multicompany transverse mode 2021-09-08 10:25:27 +02:00
stickler-ci
f535a44921 Fixing style errors. 2021-09-06 13:58:23 +00:00
lainwir3d
09d1680ea0 FIX #18627 Allow users with self read / modify rights to get own info. 2021-09-06 17:52:41 +04:00
Regis Houssin
1c97393a69 FIX increase maxlength of password input 2021-09-05 15:35:06 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00