lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107,076 Commits 43 Branches 150 Tags 886 MiB
bf9b6c05a2
Commit Graph

107076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stickler-ci
bf9b6c05a2 Fixing style errors. 2022-03-10 15:20:37 +00:00
kevin
2a09d4821b Resolve merge conflicts 2022-03-10 16:16:42 +01:00
kevin
896c79f27a Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_WYSIWYG_ON_PROJECT_TASKS 2022-03-10 16:13:02 +01:00
kevin
7b3d472fa2 Rework code to best match the standard 2022-03-10 16:10:34 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Laurent Destailleur
f6fb406562 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-10 15:55:59 +01:00
Laurent Destailleur
72099870c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-10 15:55:14 +01:00
Laurent Destailleur
10bfb76ae9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-03-10 15:54:39 +01:00
Laurent Destailleur
d27c0b31fc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-03-10 15:54:08 +01:00
Laurent Destailleur
a1534955a1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-03-10 15:52:50 +01:00
Laurent Destailleur
79371f66b0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-03-10 15:52:28 +01:00
Laurent Destailleur
4569cb82b2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2022-03-10 15:52:04 +01:00
Laurent Destailleur
04d33f4594 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2022-03-10 15:51:42 +01:00
Laurent Destailleur
af6e95aa79 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-03-10 15:49:51 +01:00
Laurent Destailleur
5d942c9d1a Fix infinit logs 2022-03-10 15:46:00 +01:00
Laurent Destailleur
0ec5595504 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:12:57 +01:00
Laurent Destailleur
aa80be975e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-03-10 14:10:18 +01:00
Laurent Destailleur
32a68995d6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-03-10 14:08:19 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:04:16 +01:00
Laurent Destailleur
eadd8da3d5 FIX exclusion of other backup files into backup file 2022-03-09 23:32:59 +01:00
Laurent Destailleur
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +01:00
Laurent Destailleur
2279674f01 Trans 2022-03-09 15:58:23 +01:00
stickler-ci
bb2f57a962 Fixing style errors. 2022-03-09 13:15:30 +00:00
kevin
22249d15c3 Add WYSIWYG Editor on project's tasks description field 2022-03-09 14:09:22 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
Laurent Destailleur
c7bb6c3c4c FIX Upload in the filemanager use the Dolibarr methods 2022-03-08 20:46:56 +01:00
Laurent Destailleur
2d93c6b678 Fix template 2022-03-08 19:00:21 +01:00
Laurent Destailleur
70810dfbab Doc 2022-03-08 02:26:04 +01:00
Laurent Destailleur
66f21fc1d0 Fix phpunit 2022-03-07 20:46:09 +01:00
Laurent Destailleur
af54274603 css 2022-03-07 20:09:14 +01:00
Laurent Destailleur
9dfb7b4328 Revert "CSS" 
This reverts commit 7847e04925.
 2022-03-07 19:46:24 +01:00
Laurent Destailleur
7847e04925 CSS 2022-03-07 19:45:00 +01:00
Laurent Destailleur
1d9a79e980 css 2022-03-07 19:42:57 +01:00
Laurent Destailleur
b339e1a883 Enhance phpunit on sql code testing 2022-03-07 19:37:53 +01:00
Laurent Destailleur
d6852c31b8 Clean code 2022-03-07 19:31:06 +01:00
Laurent Destailleur
6e298a2cb4 Fix phpunit 2022-03-07 19:18:32 +01:00
Laurent Destailleur
ec77b81d1a Prepare 15.0.1 2022-03-07 18:07:20 +01:00
Laurent Destailleur
492c198e46 Make conditions of some corn tasks dynamic. 2022-03-07 18:01:07 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump 
NEW -  Add util function send backup by mail
 2022-03-07 17:37:44 +01:00
Laurent Destailleur
cf0ef207b8
Update cron.lang 2022-03-07 17:37:32 +01:00
Laurent Destailleur
29e278ed36
Update modCron.class.php 2022-03-07 17:33:50 +01:00
Laurent Destailleur
fc139ba9e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 17:22:53 +01:00
Laurent Destailleur
fa46966b81 Fix insert must not include the rowid. 2022-03-07 17:22:29 +01:00
Laurent Destailleur
ce52f8a7ed
Merge pull request #20294 from bloxera/develop 
CLOSE #20292 Include German public holidays
 2022-03-07 17:15:22 +01:00
Laurent Destailleur
32711e5f1f
Merge pull request #20145 from atm-GregM/Fix_dolGetButtonAction 
FIX: function dolGetButtonAction change title if html not set
 2022-03-07 17:14:33 +01:00
Laurent Destailleur
dab0095224
Merge pull request #19990 from iouston/patch-3 
add attribute target on getNomurl()
 2022-03-07 17:12:19 +01:00
Laurent Destailleur
d38df4b8a0
Update societe.class.php 2022-03-07 17:11:32 +01:00
Laurent Destailleur
88b9123a93
Merge pull request #19989 from iouston/patch-2 
add target attribute on getNomUrl
 2022-03-07 17:10:39 +01:00
Laurent Destailleur
d0ca8af6ee
Update commande.class.php 2022-03-07 17:10:28 +01:00