Commit Graph
434 Commits
Author SHA1 Message Date
liugang 12bff7a96d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-03 17:03:25 +08:00
liugang 00a69cdbf8 * Optimize codes. 2018-07-03 17:03:09 +08:00
daitingting 7c3c36c0d7 * Adjust computeHours4Multiple function to fix bug #1921. 2018-07-03 13:47:04 +08:00
chenfeiCF 58704d5c48 * Finish task #4616. 2018-07-02 13:23:57 +08:00
daitingting 6ec03cae6f * Adjust align for some fields. 2018-05-31 13:34:52 +08:00
Catouse 98bdda1043 * change buttons style in table. 2018-05-21 14:38:22 +08:00
liugang a51a4c48f1 * Remove $mode == 'table'. 2018-05-18 14:27:01 +08:00
daitingting 71d60671f8 * Remove contactListMenu when submit form. 2018-05-18 14:12:19 +08:00
Catouse 35fb655e86 * refactor codes. 2018-05-15 14:56:42 +08:00
wangyidong 52799cf5b8 * finish task #3978. 2018-05-10 11:18:09 +08:00
wangyidong aede4506ce * finish task #3973. 2018-05-10 10:00:05 +08:00
Catouse d67a6ca6b1 * improve UI of task list views. 2018-05-08 19:25:05 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
liugang 1b645f9055 * Refact batch create task page. 2018-04-28 17:56:36 +08:00
estellbright eb75fcc2ea * Fix Bug #1525. 2018-04-26 14:08:59 +08:00
liugang 52e0a63267 * Refact detail view of todo.
* Optimize codes.
2018-04-20 14:15:21 +08:00
liugang d8560cefed * Refact task page of project. 2018-04-17 11:25:26 +08:00
liugang 8c731dc75a * Adjust task list page of project. 2018-04-16 17:47:24 +08:00
daitingting bb6e8790b5 * Only assignedTo can start,transfer,recordEstimate,finshed multiple task. 2018-04-10 13:57:03 +08:00
daitingting e9f20b5946 * Format codes. 2018-04-04 16:14:21 +08:00
daitingting ba57271489 * Adjust order for call computeWorkingHours function. 2018-04-04 15:38:52 +08:00
daitingting c43943b73d * Adjust codes for compute hours for multiple tasks. 2018-04-04 15:25:51 +08:00
daitingting 321005e8ad * Compute hours for multiple tasks. 2018-04-04 14:38:57 +08:00
daitingting f4b783f0ca * Optimize the order for condition of 'where'. 2018-04-03 13:52:28 +08:00
wumo 0930835923 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-30 14:38:39 +08:00
wumo 69255bb181 * Update the status of parent tasks after batch create tasks. 2018-03-30 14:35:20 +08:00
daitingting 959dfe94b8 * Optimize codes. 2018-03-30 11:20:48 +08:00
daitingting dc06156360 * Adjust condition for taskonlyCondition. 2018-03-28 15:57:31 +08:00
daitingting 4058c58ca9 * Update time of task when edit team time or record estimate. 2018-03-28 13:19:36 +08:00
wumo 07fa914150 * Differentiate batch creation tasks and subtasks. 2018-03-26 09:00:31 +08:00
wangyidong d02f8b2ee2 * fix for update parent task status. 2018-03-23 13:33:54 +08:00
wangyidong 5bb0c038f2 * code for task #3752. 2018-03-23 11:13:16 +08:00
wangyidong 96aef84f2c * adjust for update parent task status. 2018-03-23 10:08:44 +08:00
wangyidong 6dd688f3b7 * adjust for batch create. 2018-03-21 15:01:57 +08:00
wangyidong 9e6348b10e * code for child task. 2018-03-21 09:49:00 +08:00
wangyidong 7ad7e91147 * finish task #3747. 2018-03-21 08:56:26 +08:00
daitingting 4b938be75f Merge branch 'zentaopms_9.8' into origin/zentaopms_9.8 2018-03-19 18:33:51 +08:00
daitingting 7ff7bfd435 * Adjust task page for chilrenTask. 2018-03-19 16:54:29 +08:00
Catouse a28fbfca27 * finish task #3752 and fix bug #1339. 2018-03-19 16:30:23 +08:00
wumo b2c3df0829 * Differentiate batch creation tasks and subtasks. 2018-03-19 09:44:41 +08:00
daitingting ccc8cbf47c * Update children task when close parent task. 2018-03-15 11:02:23 +08:00
wangyidong e5981e9643 * finish task #3680. 2018-03-14 09:58:24 +08:00
wangyidong c8393b9e08 * finish task #3664. 2018-03-13 16:40:07 +08:00
wangyidong 8d64b4c9eb * change for 9.8.1 version. 2018-03-13 11:29:28 +08:00
wangyidong a623b9016b * change for upgrade. 2018-02-06 10:42:51 +08:00
wangyidong e92a36c947 * fix bug #1363. 2018-01-16 16:01:43 +08:00
滔哥 2d13064e7e * Fix Bug#1388. 2018-01-16 11:09:39 +08:00
滔哥 e55e97d7ff * Fix Bug#1373,1374. 2018-01-16 10:28:39 +08:00
滔哥 53ed09473e * Fix Bug#1386 2018-01-15 14:58:11 +08:00
wangyidong bd1ea46a9c * finish task #3560. 2018-01-11 11:05:50 +08:00