Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
121,841 Commits 36 Branches 189 Tags
89e378bc78f175cdf3f6fdf6b51a453e2e181b90
Commit Graph

274 Commits

Author SHA1 Message Date
Laurent Destailleur
89e378bc78 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 19:07:04 +02:00
Laurent Destailleur
60b5280d85 FIX #24918 2023-06-04 15:26:52 +02:00
Laurent Destailleur
fe9521b6b2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-21 17:34:34 +02:00
Laurent Destailleur
421f7ecff4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-21 11:36:42 +02:00
Laurent Destailleur
6350df54e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-21 11:22:36 +02:00
Noé Courtier
07bec30c32 FIX: Task events not displayed 2023-05-11 11:10:33 +02:00
hystepik
f497f4d6e9 Fix : php 8.0 warnings 2023-03-03 16:45:21 +01:00
Laurent Destailleur
36cf05318b Debug v17 2023-01-31 21:17:06 +01:00
Laurent Destailleur
1934db2dd1 Debug v17 2022-12-31 14:37:33 +01:00
Laurent Destailleur
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
1d21d73400 NEW Add date event (!= date project) and location on event organization 2022-10-21 13:19:21 +02:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
d65ea8c333 Debug v16 2022-07-26 11:05:00 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Laurent Destailleur
5e4eb58a43 FIX phpv8 2022-07-21 11:09:35 +02:00
Laurent Destailleur
3079ab2737 FIX phpv8 2022-07-21 10:59:15 +02:00
Laurent Destailleur
f1ffb56f4a Merge pull request #21334 from Quatadah/dolicloud-qnasdami-clone-button-on-task 
clone button on tasks
 2022-07-19 03:14:13 +02:00
Quatadah Nasdami
2f6e9ea839 done 2022-07-11 16:28:28 +02:00
Christian Foellmann
4c5e05e411 fix page titles 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
 2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06 Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Quatadah Nasdami
629ece0473 adding clone button on task 2 2022-06-21 13:33:55 +02:00
Quatadah Nasdami
aebdb0eaa1 adding clone button 2022-06-21 13:22:59 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +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
kamel
192f273e27 FIX: Fix show errors in card 2022-05-24 15:02:35 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +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
7b3d472fa2 Rework code to best match the standard 2022-03-10 16:10:34 +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
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Florian HENRY
61fc81732c fix: #19749 2022-01-07 11:29:43 +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
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Frédéric FRANCE
cc374e9eb1 fix warnings in ticket list 2021-10-24 10:02:12 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
6c870bb3d1 Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
3bdec20364 fix scrutinzer 2021-10-21 19:09:13 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
2acb84b432 FIX unprivileged user can see task associated with a not allowed project 2021-09-19 01:30:39 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00