Commit Graph

931 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
a2dea71b4d Merge pull request #20172 from Dolibarr/atm-maxime-patch-1
Fix #20171 permissiontoadd
2022-02-25 14:00:13 +01:00
priojk
c201ff211f Fix #20141 generation of intervention
When an intervention card was created from the times spent on tasks in a project, the task label was wrong in
the descriptions on the intervention card
2022-02-24 11:10:46 +01:00
Maxime Kohlhaas
a9ce98dfb0 Update document.php 2022-02-24 03:11:43 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
4ac62773ae Fix permissions on deletion on time spend line 2022-01-21 16:22:59 +01:00
Laurent Destailleur
8c22de6982 Comment 2022-01-21 16:15:38 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Florian HENRY
61fc81732c fix: #19749 2022-01-07 11:29:43 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
e4c4ef14ef Fix td balance 2021-12-21 23:52:01 +01:00
Laurent Destailleur
4855a97b21 Fix phpunit 2021-12-20 20:07:29 +01:00
Laurent Destailleur
02317f1d95 Fix nav lose filter 2021-12-20 18:12:08 +01:00
Laurent Destailleur
26d30be518 FIX list on time spent when no param provided was wrong. 2021-12-20 17:50:59 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
1122cd1e5e Merge pull request #19163 from Hystepik/develop#4
Fix: php 8.0 warnings project
2021-11-30 14:18:23 +01:00
Laurent Destailleur
78f94b1c76 Fix css and label for recurring invoices 2021-11-25 14:17:20 +01:00
Laurent Destailleur
4cfec658bc css 2021-11-25 14:11:18 +01:00
lmarcouiller
00369a5269 fix errors 2021-11-19 14:32:40 +01:00
Hystepik
63773bf36d Merge branch 'develop' into develop#4 2021-11-19 14:22:39 +01:00
Laurent Destailleur
6e01f1702e Fix css 2021-11-08 18:45:00 +01:00
Laurent Destailleur
ca53176b14 Merge pull request #19179 from frederic34/tasklist
fix warnings in task list
2021-10-31 17:52:31 +01:00
Laurent Destailleur
8f54143bfb Merge pull request #19178 from frederic34/patch-1
fix not defined
2021-10-31 17:47:34 +01:00
Frédéric FRANCE
42cd2ce868 Update list.php 2021-10-26 18:46:51 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Frédéric FRANCE
db44f4082b fix warnings in task list 2021-10-24 14:26:43 +02:00
Frédéric FRANCE
8cd4b0bc83 fix warnings in task list 2021-10-24 14:25:05 +02:00
Frédéric FRANCE
5f198c78a9 fix warnings in task list 2021-10-24 14:08:44 +02:00
Frédéric FRANCE
5ef5075f8f fix warnings in task list 2021-10-24 14:00:05 +02:00
Frédéric FRANCE
3765a89283 fix warnings in task list 2021-10-24 13:57:04 +02:00
Frédéric FRANCE
ede0c60e2e fix not defined 2021-10-24 13:50:22 +02:00
Laurent Destailleur
dcb433756d Merge pull request #19174 from frederic34/fixticketlist
fix warnings in ticket list
2021-10-24 12:31:57 +02:00
Frédéric FRANCE
cc374e9eb1 fix warnings in ticket list 2021-10-24 10:02:12 +02:00
Frédéric FRANCE
d240a9f774 fix warnings in ticket list 2021-10-24 09:59:30 +02:00