Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 07:51:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

8406 Commits

Author SHA1 Message Date
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +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
6c37836b3e Show value of MAIN_SECURITY_CSRF_WITH_TOKEN in setup page 2021-09-18 18:28:02 +02:00
Gauthier PC portable 024
e6c9627195 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-17 15:47:23 +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
fd3418d91d NEW Can edit the translation key of an overwrote translation key. 2021-09-16 15:13:15 +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
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
f859967c24 Fix look and feel v14 2021-09-15 20:28:47 +02:00
Laurent Destailleur
21462d0b82 Fix can reset filter in setup 2021-09-14 17:24:53 +02:00
Laurent Destailleur
aeead15a62 css 2021-09-14 17:07:29 +02:00
Laurent Destailleur
f3fcb7a48a Fix insertion of email templates 2021-09-14 16:59:49 +02:00
Laurent Destailleur
ce9a10bd90 Fix description of some options 2021-09-13 03:43:25 +02:00
Laurent Destailleur
5869975ed1 Fix phpcs 2021-09-13 02:59:09 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
7efd810d57 Clean code 2021-09-13 01:18:24 +02:00
Frédéric FRANCE
88cba08475 doxygen 2021-09-11 09:52:21 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00
Laurent Destailleur
6a296bf6c2 Debug setup 2021-09-10 10:18:46 +02:00
Laurent Destailleur
d382e8d8c9 Clean setup and translation 2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2 Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +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
Anthony Berton
6ea3daf9f3 Update pdf.php 2021-09-09 08:31:16 +02:00
stickler-ci
03ff75bccd Fixing style errors. 2021-09-09 06:29:33 +00:00
Anthony Berton
ecea9c13ad Merge branch 'develop' into add_option_pdf_global_sales_rep 2021-09-09 08:27:04 +02:00
Anthony Berton
657c325868 Merge branch 'develop' into add_option_pdf_global_thirdparty_alias 2021-09-09 08:24:08 +02:00
Laurent Destailleur
e5b71a1a89 Merge pull request #18598 from henrynopo/patch-2 
Increase the width of column for General Set-ups - Update dolibarr.php
 2021-09-09 05:12:06 +02:00
Laurent Destailleur
de97b248f2 Update dolibarr.php 2021-09-09 05:11:56 +02:00
Laurent Destailleur
ea9a07fb3d Update dolibarr.php 2021-09-09 05:11:31 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
 2021-09-07 17:47:00 +02:00
Laurent Destailleur
02f21d478a Fix trans 2021-09-06 19:06:46 +02:00
Laurent Destailleur
f5f0b9debc Fix label for selection 2021-09-06 18:41:04 +02:00
Gauthier PC portable 024
d121544810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-06 16:08:39 +02:00
Laurent Destailleur
ed3919da13 Look and feel 2021-09-05 02:25:32 +02:00
Laurent Destailleur
2928c3dc9b NEW Add a PDF document template for Manufacturing Orders 2021-09-05 02:18:53 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Henry
b13fc30a0a Update dolibarr.php 2021-09-04 12:25:40 +08:00
Laurent Destailleur
87b33c09e0 Merge pull request #18595 from FHenry/14_eventorg 
NEW : Can register an attendees on project global (and also on conférence)
 2021-09-03 20:50:21 +02:00
Florian HENRY
628c715878 ok for prod 2021-09-03 16:39:10 +02:00
Laurent Destailleur
e965d6d6f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/api/class/api_access.class.php
 2021-09-03 11:02:21 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
ksar
260049c917 FIX #18565 2021-09-02 17:15:57 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Alexandre SPANGARO
dbe6861f79 Merge remote-tracking branch 'upstream/develop' into 15a8 2021-09-01 14:09:02 +02:00
Laurent Destailleur
239599d1b1 Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default 
NEW can enable/disable external calendar by default
 2021-09-01 13:44:12 +02:00