Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.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/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
3895142772
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2021-04-10 12:06:11 +02:00
Laurent Destailleur
52213d0ac7
Fix duplicate permissions
2021-04-09 21:15:43 +02:00
Laurent Destailleur
aef164a7ee
Fix bad permission
2021-04-08 02:05:36 +02:00
Laurent Destailleur
489cff46a3
FIX #yogosha5828
2021-04-08 00:37:17 +02:00
Laurent Destailleur
6c521073ea
Fix perm id and sort of modules by id.
2021-04-05 13:52:19 +02:00
Laurent Destailleur
e048d73487
Show text of permission in tooltip
2021-04-05 11:18:24 +02:00
Laurent Destailleur
fd82776f67
Fix
2021-04-04 18:00:07 +02:00
Laurent Destailleur
be6bb3a756
FIX #yogosha5746 - next step (work in progress)
2021-03-30 19:12:07 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
22da450a96
FIX #yogosha5755
2021-03-29 15:49:34 +02:00
Laurent Destailleur
cd88c7ad74
Position of permission
2021-03-26 12:17:18 +01:00
Laurent Destailleur
c30c6bcf43
css
2021-03-25 08:37:59 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
047471c220
Remove $_POST war
2021-03-24 19:06:44 +01:00
Laurent Destailleur
e79284ea29
FIX Vulnerability: Idor leading to lock admin users.
2021-03-22 13:56:19 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4
Fix #ygosha5698
2021-03-22 12:47:23 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Laurent Destailleur
0008e916ac
Fix sql error
2021-03-20 21:36:42 +01:00
Laurent Destailleur
8df083c955
Look and feel v14
2021-03-20 18:43:44 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment
...
uniformise comments to remove nested comments
2021-03-20 11:24:39 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
ed341197ea
fix nested comments
2021-03-20 09:30:09 +01:00
Laurent Destailleur
3414511d7f
Code position
2021-03-19 15:09:06 +01:00
Laurent Destailleur
7056cf7614
FIX #yogosha5675
2021-03-19 15:05:28 +01:00
Laurent Destailleur
d83d005284
FIX #yogosha5674
2021-03-19 12:44:59 +01:00
Laurent Destailleur
31478d5ac0
Look and feel v14
2021-03-17 22:01:25 +01:00
Frédéric FRANCE
6cbb400d0c
fix php8 warnings
2021-03-16 21:28:56 +01:00
Laurent Destailleur
1f4a3dee5f
Merge pull request #16696 from dolibit-ut/patch-80
...
Update list.php
2021-03-16 10:40:13 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25
...
Translation "Generated documents"
2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
6960f0dc25
Uniformize translation
2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197
Uniformize translation
2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855
Translation "Generated documents"
2021-03-16 04:04:18 +01:00
UT from dolibit
b34982866f
Update list.php
...
$help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:Módulo_Usuarios|DE:Modul_Benutzer';
2021-03-15 16:58:59 +01:00
Laurent Destailleur
8cd8bd5936
Merge pull request #16675 from frederic34/patch-29
...
fix php8 warning
2021-03-15 10:55:24 +01:00
Frédéric FRANCE
531f02c1e9
fix php8 warning
2021-03-15 00:59:07 +01:00
Frédéric FRANCE
7b99c1e8e9
fix php8 warning
2021-03-15 00:32:05 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
af5db0f5fa
Look and feel v14
2021-03-12 15:34:31 +01:00
Givriz
6e46396b17
Ajout de picto pour le genre et la civilité
2021-03-10 16:31:50 +01:00
stickler-ci
5294e10ecf
Fixing style errors.
2021-03-08 18:07:15 +00:00
Givriz
fb54f6912c
feature #16570
...
Ajout de picto pour le genre et la civilité
2021-03-08 18:37:03 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex
2021-03-08 16:34:05 +01:00
Gauthier PC portable 024
dd83363392
FIX : several bugs on salaries + id salary in payments list
2021-03-05 10:15:35 +01:00
Laurent Destailleur
d5e0a8be56
Fix phpcs
2021-03-04 17:24:13 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Frédéric FRANCE
6c30eca11d
user home
2021-03-02 22:41:20 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 20:41:01 +01:00
Laurent Destailleur
7f1d61f8a8
Fix phpcs
2021-03-02 15:34:43 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
...
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
2021-03-02 14:45:05 +01:00
Laurent Destailleur
3a00952cd1
Update user.class.php
2021-03-02 14:44:31 +01:00
stickler-ci
54d35fa59f
Fixing style errors.
2021-03-01 20:00:32 +00:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5
set Default values as CURD classes
2021-03-01 20:36:42 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-01 12:55:45 +01:00
Gauthier PC portable 024
e598b49545
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 15:33:36 +01:00
Frédéric FRANCE
b970f4eca6
code syntax user directory
2021-02-26 13:18:40 +01:00
Gauthier PC portable 024
e16bb70922
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:31:12 +01:00
Gauthier PC portable 024
79e878c26b
FIX : salary date
2021-02-23 15:30:42 +01:00
Gauthier PC portable 024
4f767c0823
Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a
FIX : correction of payment salaries list on employee tab of user card
2021-02-23 15:08:27 +01:00
Gauthier PC portable 024
939d406ab1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:10:24 +01:00
Laurent Destailleur
2be6992916
Fix include_once into include for inc.php file. See comment in #16338
2021-02-19 16:10:19 +01:00
Anthony Berton
ae9582286d
Update user.class.php
2021-02-17 16:39:03 +01:00
Anthony Berton
060bfde082
20200217
2021-02-17 15:26:56 +01:00
Gauthier PC portable 024
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +01:00
Laurent Destailleur
84a4d8f8f1
Merge pull request #16201 from frederic34/patch-1
...
fix html
2021-02-07 19:56:56 +01:00
Frédéric FRANCE
c3d1f3de3c
fix html
2021-02-07 19:12:26 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html
2021-02-07 18:49:46 +01:00
Frédéric FRANCE
05c7bcf70f
Update perms.php
2021-02-07 18:45:34 +01:00
Frédéric FRANCE
b4e6a49930
Update card.php
2021-02-07 18:35:03 +01:00
Frédéric FRANCE
b74ea17dd2
fix html
2021-02-07 18:14:50 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Laurent Destailleur
726ef265f2
Look and feel v14
2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Laurent Destailleur
a4c0459c1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Laurent Destailleur
b50728d4fb
FIX #16076
2021-01-27 21:04:48 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-26 20:19:49 +01:00
Laurent Destailleur
13378897a8
FIX Report by Ricardo Matias
...
Conflicts:
test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f
FIX Report by Ricardo Matias
2021-01-25 22:46:09 +01:00
Laurent Destailleur
0f5fc7353e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/admin/mailing.php
htdocs/admin/paymentbybanktransfer.php
htdocs/admin/prelevement.php
htdocs/modulebuilder/template/admin/setup.php
2021-01-24 15:29:53 +01:00
Laurent Destailleur
b4783f69d6
Show if permission is an advanced permission
2021-01-23 18:13:50 +01:00
Laurent Destailleur
113ef1a02b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-19 11:36:59 +01:00
Laurent Destailleur
934070f14e
Backport FIx #15970
2021-01-19 10:56:46 +01:00
Laurent Destailleur
8cd8f21fde
Update user.class.php
2021-01-19 10:53:47 +01:00
lmarcouiller
73eee33f8a
redo of pull request with sql updated
2021-01-19 09:24:15 +01:00
stickler-ci
7e0f83d97e
Fixing style errors.
2021-01-18 16:06:06 +00:00
lmarcouiller
7c7f80fb59
update pull request with sql in simple quotes
2021-01-18 17:05:15 +01:00
lmarcouiller
841736df87
Fix #15970 user.class.php
2021-01-18 14:20:30 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 21:06:12 +01:00
Laurent Destailleur
b4be544350
Merge pull request #15978 from bb2a/tel_on_list_users
...
NEW Add column "Office phone" and "User mobile" in user list
2021-01-16 18:06:19 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 13:58:27 +01:00
Laurent Destailleur
aaddda9a6e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/accountancy/class/accountancyexport.class.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
16d98d2691
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/projet/graph_opportunities.inc.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:09:09 +01:00
Laurent Destailleur
446e3b9a9d
css
2021-01-14 13:26:54 +01:00
Anthony Berton
6726d5781d
Update list.php
2021-01-14 08:41:04 +01:00
Anthony Berton
2c31e0989d
Update list.php
2021-01-14 08:25:57 +01:00
Anthony Berton
b143fb6b9e
Update list.php
2021-01-13 18:52:27 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-12 23:47:24 +01:00
Florian HENRY
77f213832e
fix: update group name
2021-01-11 19:40:44 +01:00
Laurent Destailleur
f411b29b28
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/accountancy.lang
2021-01-09 02:34:43 +01:00
Alexandre SPANGARO
4077565de9
Merge branch '13.0' into 13b5
2021-01-07 05:27:43 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-06 21:05:59 +01:00
Laurent Destailleur
ed25b252b9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:14 +01:00
Laurent Destailleur
f8fe7b5a0e
FIX #15851
2021-01-04 16:38:09 +01:00
Alexandre SPANGARO
9300951c6e
Add language file
2021-01-03 14:54:35 +01:00
Frédéric FRANCE
5dd0b3b1c6
can add box on user home page
2021-01-02 20:20:22 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Laurent Destailleur
87a452c6f4
Fix warning
2020-12-30 12:16:01 +01:00
Laurent Destailleur
af41c06822
Fix warnings
2020-12-29 04:27:16 +01:00
Florian HENRY
d3bdb72cc8
finish
2020-12-24 15:03:12 +01:00
Florian HENRY
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Laurent Destailleur
11a122176d
Clean code
2020-12-24 02:33:11 +01:00
Laurent Destailleur
11b15557eb
Clean code
2020-12-24 02:09:11 +01:00
Florian HENRY
055a2b6fec
on goung
2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227
on going
2020-12-23 23:32:50 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
681dc88188
Merge pull request #15731 from hregis/fix_add_passwordforgotten_hook
...
NEW add doAction hook in passwordforgotten page
2020-12-12 19:51:38 +01:00
Regis Houssin
4d0ce326c4
NEW add doAction hook in passwordforgotten page
2020-12-11 13:31:50 +01:00
Laurent Destailleur
6b1ce7c050
Fix management of photo of users
2020-12-10 18:58:11 +01:00
Laurent Destailleur
2c9eb5417a
Look and feel v13
2020-12-10 00:20:22 +01:00
Laurent Destailleur
3fcfcb3e88
Fix field declaration
2020-12-09 23:38:24 +01:00
Laurent Destailleur
64e2ddbd80
Merge pull request #15666 from Zebedeu/develop
...
New #8472 personal and professional titles added
2020-12-07 22:40:01 +01:00
Laurent Destailleur
9be184aa49
Merge pull request #15677 from NicolasStr/patch-1
...
Fix #15676 Hide Password when importing from LDAP
2020-12-07 22:33:42 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
f21fc43e7e
Fix label of field
2020-12-07 14:25:49 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
stickler-ci
e078d3005f
Fixing style errors.
2020-12-05 20:13:54 +00:00
Nicolas Streng
f6eb10f6e5
Fix #15676 Hide Password when importing from LDAP
...
Refers to Issue #15676
2020-12-05 21:10:57 +01:00
stickler-ci
1c221302cd
Fixing style errors.
2020-12-05 11:09:16 +00:00
Zebedeu
f035bd774d
New | personal and professional titles added for employee users in vcard
...
personal and professional titles added for employee users in vcard
2020-12-05 11:59:30 +01:00
Zebedeu
6d2159e8f0
New #8472 personal and professional titles added
...
personal and professional titles added for employee users
2020-12-05 11:30:18 +01:00
Laurent Destailleur
613ed8bcfa
FIX No use of $_SESSION into master.inc.php
2020-12-04 23:50:55 +01:00
Laurent Destailleur
1343fb48db
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-12-03 00:40:56 +01:00
Laurent Destailleur
9137713056
Debug v13
2020-12-03 00:40:41 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Stephane Lesage
7fbf5482fc
missing db->escape
2020-11-30 11:30:42 +01:00
Stephane Lesage
c0c8aef7aa
fix Users list filter by gender
2020-11-30 11:30:42 +01:00
Stephane Lesage
0046bfc53f
Fix Users list filter by gender
2020-11-29 23:42:47 +01:00
Laurent Destailleur
6a8ddacb33
Prepare database to allow to disconnect other session after a password
...
change
2020-11-29 21:01:57 +01:00
stickler-ci
0b408b8012
Fixing style errors.
2020-11-28 09:32:02 +00:00
ptibogxiv
34894c15e0
New get permissions for connected user by API
2020-11-28 10:28:23 +01:00
Laurent Destailleur
57d34bc543
Fix link
2020-11-24 17:03:02 +01:00
Laurent Destailleur
a7347b89d1
Look and feel v13
2020-11-24 16:54:13 +01:00
Laurent Destailleur
551f82ef6a
Fix label
2020-11-24 14:15:43 +01:00
Laurent Destailleur
ccd7ff9a01
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-23 21:56:48 +01:00
Laurent Destailleur
fabed34a99
FIX #15481
2020-11-23 21:47:51 +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
986f918436
Fix image edition when gravatar module is on
2020-11-22 01:47:17 +01:00
Laurent Destailleur
a3faa12753
Fix responsive
2020-11-22 01:28:56 +01:00
Laurent Destailleur
e5e320fd90
Fix null
2020-11-22 01:26:58 +01:00
Laurent Destailleur
6ac1f98ed0
Better responsive
2020-11-22 01:16:32 +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
Laurent Destailleur
83eaf16a22
Fix css
2020-11-18 16:23:08 +01:00
Laurent Destailleur
a64d907b2d
Merge pull request #15393 from frederic34/patch-14
...
doxygen
2020-11-14 00:49:46 +01:00
Frédéric FRANCE
5c159c6344
Update card.php
2020-11-13 21:57:46 +01:00
Frédéric FRANCE
c4b13b154e
doxygen
2020-11-13 21:00:23 +01:00
Laurent Destailleur
1f69f4ed5d
Fix deprecated
2020-11-13 19:39:59 +01:00
Laurent Destailleur
283a42c086
Fix bad key
2020-11-13 19:38:44 +01:00
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
Laurent Destailleur
bf8de86091
Merge pull request #15354 from frederic34/patch-14
...
Update adherent.class.php
2020-11-12 12:38:39 +01:00
Frédéric FRANCE
05410ebbb3
Update user.class.php
2020-11-11 09:26:13 +01:00
Frédéric FRANCE
36cd4a8d4d
Update user.class.php
2020-11-11 07:39:09 +01:00
Frédéric FRANCE
d28249d568
Update user.class.php
2020-11-11 07:35:33 +01:00
Frédéric FRANCE
b783a8775d
Update user.class.php
2020-11-11 07:31:10 +01:00
Frédéric FRANCE
0f8fc7ef2b
Update user.class.php
2020-11-10 21:46:51 +01:00
Frédéric FRANCE
fd078ef713
Update user.class.php
2020-11-10 21:43:45 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
924923ec41
Fix warning
2020-11-07 19:48:42 +01:00
Laurent Destailleur
95c35b2dc3
Fix warning
2020-11-07 19:25:04 +01:00
Laurent Destailleur
a71d50db9e
Clean code
2020-11-07 15:57:38 +01:00
Laurent Destailleur
bb2c35ae18
Fix warning
2020-11-07 15:28:10 +01:00
Laurent Destailleur
eba73101b9
Merge pull request #15210 from frederic34/zapieruser
...
work on zapier
2020-11-06 18:49:23 +01:00
Laurent Destailleur
47d0b1cd0e
Merge pull request #15312 from frederic34/patch-8
...
doxygen
2020-11-06 18:45:46 +01:00
Laurent Destailleur
28cedd3229
Fix permission to edit bank account
2020-11-06 17:31:24 +01:00
Laurent Destailleur
b8f6e7f214
Fix var not defined
2020-11-06 16:28:26 +01:00
Laurent Destailleur
ed8a0093ff
Debug v13
2020-11-05 22:25:14 +01:00
Frédéric FRANCE
cbf5332f04
doxygen
2020-11-05 20:18:27 +01:00
Frédéric FRANCE
545f39aacf
add work
2020-11-05 19:00:45 +01:00
Frédéric FRANCE
5d90611795
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-05 14:42:37 +01:00
Laurent Destailleur
f27508cf2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/class/project.class.php
2020-11-05 09:42:07 +01:00
Laurent Destailleur
72e94edae4
Fix permission on project for external user that are external contact
2020-11-05 09:40:37 +01:00
Frédéric FRANCE
32391d211a
doxygen
2020-11-05 08:55:04 +01:00
Frédéric FRANCE
b534dd57d9
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-05 08:29:35 +01:00
Frédéric FRANCE
6e7448a1d0
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-04 19:00:10 +01:00
Laurent Destailleur
40e18741b3
Fix look and feel v13
2020-11-04 18:05:48 +01:00
Laurent Destailleur
7294a47ef5
Fix generation of user from member, contact, applications for job
2020-11-04 13:33:52 +01:00
Laurent Destailleur
5f290e0de1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-02 11:41:19 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
02fb63ac96
Merge pull request #15253 from frederic34/patch-6
...
Update user.class.php
2020-11-02 09:30:23 +01:00
Laurent Destailleur
20c70691e4
Better compatibility php8
2020-11-01 21:37:04 +01:00
Frédéric FRANCE
497e5902d6
Update user.class.php
...
The variable $num does not seem to be defined for all execution paths leading up to this point.
The variable $rd does not seem to be defined for all execution paths leading up to this point.
2020-11-01 20:54:36 +01:00
Frédéric FRANCE
e52b79d586
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-01 14:19:06 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs
2020-10-31 21:04:38 +01:00
Frédéric FRANCE
49390a596c
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-31 20:33:59 +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
Frédéric FRANCE
be4a4cb54b
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-31 16:10:16 +01:00
Frédéric FRANCE
8bf2b1797c
tabs
2020-10-31 15:59:33 +01: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
Frédéric FRANCE
2cbbf86a5b
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-30 17:48:00 +01:00
Frédéric FRANCE
a317d71413
Update api_users.class.php
2020-10-30 15:23:05 +01:00
Frédéric FRANCE
29faf681e6
work on members
2020-10-30 14:30:25 +01:00
Frédéric FRANCE
e4af61a587
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-30 08:17:53 +01:00
Frédéric FRANCE
e049eb960d
add trigger user create
2020-10-29 20:53:28 +01:00
Frédéric FRANCE
317ffc65c9
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-29 18:41:22 +01:00
Frédéric FRANCE
9e70d7ca65
fix undefined variable
2020-10-29 18:37:52 +01:00
Frédéric FRANCE
5d0ac98c34
work on zapier
2020-10-29 00:34:41 +01:00
Frédéric FRANCE
7ef2aaf8af
Update user.class.php
2020-10-28 20:57:36 +01:00
Frédéric FRANCE
19ff2ef19e
Update user.class.php
2020-10-27 20:52:37 +01:00
Frédéric FRANCE
584373af55
Update user.class.php
2020-10-27 20:15:46 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
7a85f5a9ab
Merge pull request #15118 from hregis/develop_bug2
...
FIX avoid warning
2020-10-25 14:49:06 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Regis Houssin
3fbeea15c0
FIX avoid warning
2020-10-23 15:43:48 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Francis Appels
89f00b9114
Fix user list when user module has extrafields
2020-10-22 17:54:33 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
a0b17635fd
NEW When creating a user from a member linked to a thirdparty, you can
...
decide if it is an internal or external (default) user.
2020-10-14 14:02:07 +02:00
Laurent Destailleur
925f240340
Fix user
2020-10-08 17:13:51 +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
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
03226ad2a5
Merge pull request #14810 from TobiasSekan/FixAdminCanRemoveAllHisUserRights
...
FIX that a admin can remove all his user rights
2020-10-05 17:18:24 +02:00
Anthony Berton
533fdda848
Update vcard.php
2020-10-02 15:11:02 +02:00
Laurent Destailleur
8bfc2bed3e
Fix navigation into user list
2020-10-01 16:27:17 +02:00
Laurent Destailleur
b258a848e2
NEW Can enable/disable users in bulk actions
2020-10-01 16:21:07 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
e495d0459e
Look and feel v13
2020-09-27 17:53:17 +02:00
stickler-ci
a88c0b97a8
Fixing style errors.
2020-09-23 11:31:17 +00:00
Sekan, Tobias
815d0c2589
Fix that a admin can remove all his user rights
2020-09-23 13:18:09 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Laurent Destailleur
aee6bc173f
WIP Add start/end date of validity for user/logins
2020-09-21 18:44:20 +02:00
Laurent Destailleur
718497915c
Enhance the IK module
2020-09-21 16:31:51 +02:00
Laurent Destailleur
b4137392ea
Merge pull request #14789 from bafbes/abb120144
...
fix:remove deleted user params
2020-09-20 17:12:15 +02:00
Laurent Destailleur
233aa58161
Fix sanitizing
2020-09-20 03:36:02 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
14aa9c01da
Neutral message if login / email exists #yohosha4542
2020-09-19 18:40:00 +02:00
bahfir abbes
09f23c1d84
fix:remove deleted user params
2020-09-19 13:14:46 +01:00
Laurent Destailleur
4a5ee7f04d
Better testSqlAndScriptInject (deal htmlentities encoded signatures)
...
More phpunits on GETPOST
2020-09-19 03:25:25 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19
merge variable declaration
2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7
Make button visiblity identical on most lists
2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad
Add function to all list that support $socid
2020-09-18 10:36:40 +02:00