Commit Graph

2979 Commits

Author SHA1 Message Date
Laurent Destailleur
280be9b29f
Merge pull request #20163 from SteveATM/FIX_replace_divbutaction_by_dolgetbuttonaction
FIX: Replace User divbutaction by dolgetbuttonaction
2022-02-28 21:25:25 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
2022-02-28 20:12:28 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Laurent Destailleur
a0baea1e6b
Merge branch 'develop' into FIX_replace_divbutaction_by_dolgetbuttonaction 2022-02-25 14:20:24 +01:00
Laurent Destailleur
4973019630 Fix #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-24 09:59:16 +01:00
Steve
f70e97bafa fix: travis 2022-02-23 15:45:50 +01:00
Steve
bd6c547b4d fix: merge develop 2022-02-23 15:20:45 +01:00
Steve
6047e4e90b fix: travis + stickler 2022-02-23 15:06:58 +01:00
Steve
b99557e60c fix: feedback travis 2022-02-23 14:59:39 +01:00
Steve
c7077ef1d7 fix: send mail title 2022-02-23 14:49:12 +01:00
Steve
f6985ae546 merge develop 2022-02-23 12:25:44 +01:00
Steve
9a95fc7a00 wip: pull request feedback 2022-02-23 11:13:31 +01:00
Steve
c26b1e58a2 wip: pull request feedback 2022-02-23 11:09:59 +01:00
Steve
26e23219e6 feat: dolGetButtonAction 2022-02-23 10:34:54 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Steve
3fb0d307b1 wip: clean comments 2022-02-22 17:23:34 +01:00
steve
679665fb08 feat: dolGetButtonAction for Modify 2022-02-22 15:39:02 +01:00
steve
ad4a3c63da feat: dolGetButtonAction for Delete 2022-02-22 12:19:24 +01:00
steve
fefd4a407b feat: dolGetButtonAction for Enable and disable user 2022-02-22 09:43:09 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
steve
c78ec56c8f feat: dolGetButtonAction for sendmail 2022-02-21 14:43:00 +01:00
steve
0e3ec05028 wip: dolGetButtonAction Nomail 2022-02-21 11:12:06 +01:00
steve
3a2fcaae6c wip: SendMail dolGetButtonAction 2022-02-21 10:12:28 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Romain DESCHAMPS
5eb4d3408c Update param_ihm.php 2022-02-18 19:31:42 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-02-07 15:51:01 +01:00
Laurent Destailleur
31ca78acda Sync transifex.
Fix install.
2022-02-07 14:25:20 +01:00
Regis Houssin
5f376685c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_works_to_add_prefix_db_function 2022-01-30 11:28:29 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
2022-01-29 16:48:40 +01:00
stickler-ci
adac1d3dbb Fixing style errors. 2022-01-28 09:34:52 +00:00
Anthony Berton
8c38125e79
Update vcard.php 2022-01-28 10:30:41 +01:00
Regis Houssin
ed9346dfb9 Works on replace MAIN_DB_PREFIX by $db->prefix() 2022-01-27 10:00:26 +01:00
Laurent Destailleur
34e930d952
Merge pull request #19737 from aspangaro/16a6
NEW Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
2022-01-25 16:04:11 +01:00
Laurent Destailleur
05ff99f2e6
Update user.class.php 2022-01-25 16:03:30 +01:00
Laurent Destailleur
6677eccf45
Update user.class.php 2022-01-25 16:01:50 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Laurent Destailleur
d560483875 Fix permission from group not found 2022-01-24 18:32:29 +01:00
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
00eabded6d Fix phpunit 2022-01-24 12:43:42 +01:00
Laurent Destailleur
053b402202 Fix for notes standardization #19835 2022-01-23 19:20:13 +01:00
Laurent Destailleur
66d7271c94
Merge pull request #19904 from hregis/fix_use_new_function_prefix
NEW add modifications for new function "$db->prefix()"
2022-01-23 11:57:42 +01:00
Regis Houssin
a3a856d0be NEW add modifications for new function "$db->prefix()" 2022-01-21 16:57:57 +01:00
Laurent Destailleur
82305d7dd4 Fix bad position sorting of permission list 2022-01-21 16:34:09 +01:00
Laurent Destailleur
482efec536 Fix missing column 2022-01-21 15:40:37 +01:00
Laurent Destailleur
accc413596 Fix error management 2022-01-21 15:26:54 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00