Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 01:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
139,989 Commits 36 Branches 190 Tags
c403fc901b1918d747febe6fb5d3091b23c15600
Commit Graph

1278 Commits

Author SHA1 Message Date
HENRY Florian
770abb73f6 Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
e991c614d3 Debug v16 2022-06-14 14:48:15 +02:00
Laurent Destailleur
862ca7cf04 Debug v16 2022-06-14 14:39:32 +02:00
Frédéric FRANCE
38b18a68d7 Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
Laurent Destailleur
2ad7c0df74 Merge pull request #21178 from Quatadah/fix19860 
FIX  #19860
 2022-06-09 12:51:19 +02:00
stickler-ci
fb86cea3fc Fixing style errors. 2022-06-09 10:09:49 +00:00
NASDAMI Quatadah
8a48cd5989 Fixing bug 2022-06-09 12:05:23 +02:00
Laurent Destailleur
0bb7defa88 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/card.php
 2022-06-01 16:04:11 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/projet/tasks/task.php
 2022-05-31 14:33:19 +02:00
Laurent Destailleur
b43159db6d Merge branch 'develop' into dev_19763 2022-05-24 22:07:50 +02:00
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
lvessiller
0de33fccd8 NEW rename categoriesArr varibale 2022-05-23 12:23:16 +02:00
lvessiller
89af598c4f NEW MAIN_SEARCH_CATEGORY_CUSTOMER_ON_LISTS const to show category customer filter 2022-05-23 11:57:35 +02:00
lvessiller
75ff04b2fe NEW separate categories filters 2022-05-20 15:38:33 +02:00
lvessiller
3e09fb60c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-task-list-filter-category-customer 2022-05-20 15:36:26 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
04f64dd252 Look and feel v16 2022-05-16 18:54:50 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +02:00
Laurent Destailleur
23665c3f6b Tooltip 2022-05-11 10:02:59 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
Florian HENRY
112c8826b7 finish invoice per product line 2022-05-11 09:06:26 +02:00
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +02:00
Laurent Destailleur
30597d7f89 Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Florian HENRY
477aa4cc09 Merge branch 'dev_new_project_upgrade_external_user_perms_project' of github.com:FHenry/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:19:27 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
lvessiller
c4c4c91a77 NEW customer category filter on task list 2022-05-04 09:52:29 +02:00
Francis Appels
7e44227df2 Cleanup 'confirm_createbills' 2022-04-25 14:28:57 +02:00
Florian HENRY
7e1079c65c on going 2022-04-15 10:57:16 +02:00
Florian HENRY
5a8e5c4780 on going 2022-04-15 10:16:18 +02:00
Florian HENRY
902301659b finish invoice per product per line 2022-04-13 09:31:30 +02:00
Florian HENRY
c951e681c2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-04-13 09:31:07 +02:00
Laurent Destailleur
867883e9b1 Clean code for kanban view 2022-03-31 18:06:39 +02:00
kamel
e17bbdebcf NEW - Add hooks on project task time page 2022-03-29 10:16:06 +02:00
Florian HENRY
6c3ea310dc align css 2022-03-18 09:12:34 +01:00
Florian HENRY
93e8c57d78 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-03-18 08:42:19 +01:00
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
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
Florian HENRY
7880d8f040 fix double call 2022-03-04 10:04:41 +01:00
Florian HENRY
df5c427d0d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-03-04 08:41:04 +01:00
HENRY Florian
77d8025d86 Merge branch 'develop' into dev_new_project_upgrade_external_user_perms_project 2022-03-01 08:54:43 +01:00