Commit Graph
584 Commits
Author SHA1 Message Date
sgm0422 bf1cdda8f5 * Add program to task and story. 2020-06-03 09:02:28 +08:00
leiyong dbd749908c * Adjust task module code. 2020-05-19 03:50:15 -07:00
leiyong b10b019168 * merger cmmi branch. 2020-05-19 03:05:38 -07:00
wangyidong 2372831886 * finish task #7075. 2020-04-28 16:31:18 +08:00
wangyidong 7ae499cf70 * finish task #7068. 2020-04-27 11:29:08 +08:00
wangyidong 1a0090189a * finish task #7064. 2020-04-27 10:13:30 +08:00
wangyidong 1e542ecbe5 * fix bug #2215. 2020-03-19 15:38:14 +08:00
wangyidong e2c02c246b Merge branch 'master' into zentaopms_12.0.1 2020-02-26 18:27:08 +08:00
Yagami 7b2949916b * Fix for sql injection attack. 2020-02-24 14:09:11 +08:00
leiyong e9e500efb2 fix bug #2939,#2912
Finish the task #6901
2020-02-18 14:43:31 +08:00
wangyidong 616d01b015 * fix bug. 2020-02-05 17:30:21 +08:00
wangyidong 80c7e0fa9b * finish task #6757. 2019-12-16 10:10:39 +08:00
wangyidong e619c68e58 * finish task #6705. 2019-12-11 11:31:48 +08:00
wangyidong c7f0afe423 * finish task #6613. 2019-12-04 10:32:42 +08:00
wangyidong 4c11de7833 * fix bug for update child task. 2019-11-27 14:23:01 +08:00
wangyidong 7c3655d11d * adjust code. 2019-11-26 11:30:03 +08:00
Yagami e91028bbb7 * Finish task #6518. 2019-11-19 09:32:12 +08:00
Yagami 499964122e * Code for task #1493. 2019-10-16 16:17:49 +08:00
Yagami 697a1122ba * Code for task #6410. 2019-10-14 15:55:30 +08:00
Yagami 31af090d1e * Finish task #6410. 2019-10-14 14:39:56 +08:00
Yagami 06738da7b7 * Fix activate parent task logic. 2019-10-14 09:27:21 +08:00
Yagami e1d405f16b * Fix bug. 2019-10-12 17:04:23 +08:00
Yagami 727c6f4fce * Finish task #6451. 2019-10-12 10:09:27 +08:00
Yagami 7116b062ea * Finish task #6403. 2019-10-11 13:29:19 +08:00
Yagami b16752383d * Finish task #6392. 2019-10-10 14:39:46 +08:00
Yagami fe47c0600a * Finish task #6381. 2019-10-09 16:49:09 +08:00
wangyidong 8dfe360c5c * adjust for computeHours4Multiple when update task. 2019-09-25 08:51:01 +08:00
wangyidong c3cd2b7af7 * fix bug #2722. 2019-09-24 10:07:45 +08:00
wangyidong 0a0ce92796 * fix bug. 2019-09-23 16:26:54 +08:00
wangyidong c16eeefa33 * replace ne() function to notIN(). 2019-09-05 16:00:04 +08:00
wangyidong e161871c4f * code for task #6289. 2019-09-02 15:38:05 +08:00
Yagami d206d13913 * Finish task #6316. 2019-09-02 10:49:43 +08:00
wangyidong 162887854f * finish task #6233. 2019-08-22 11:14:56 +08:00
wangyidong 253e0ab3a8 * finish task #6231. 2019-08-21 15:32:29 +08:00
wangyidong 97fc947913 * computeWorkingHours has in updateParentStatus method. 2019-08-14 15:34:43 +08:00
jinianlan 968390978c Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-12 08:25:42 +08:00
jinianlan c6cba5483e * finish task #6173,#6174,#6175,#6183,#6186,#6187. 2019-08-12 08:23:00 +08:00
wangyidong 7964ce412f * finish task #6190. 2019-08-07 15:27:39 +08:00
jinianlan fc2eda8fa6 * fix Bug 2671 2019-08-01 17:38:49 +08:00
liugang 1cc1daa794 * Use the function processStatus to get status of a record. 2019-07-30 15:41:13 +08:00
wyd621 f858660ceb Merge branch 'master' into zentaopms_workflow 2019-07-24 09:14:23 +08:00
jinianlan 77d1853878 * fix task #2651,#2642 2019-07-23 16:00:11 +08:00
jinianlan fbf7a7f073 * finish task #2651,#2642 2019-07-23 09:46:54 +08:00
wyd621 9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
Yagami c5a1c58168 * Finish task #8290. 2019-07-11 14:43:06 +08:00
wangyidong 47e23892c0 * finish task #5957. 2019-07-10 14:42:54 +08:00
Yagami f7d4f5ff71 * Code for task #5892. 2019-07-01 14:37:50 +08:00
Yagami 368775a796 * Finish task #5892. 2019-07-01 14:18:23 +08:00
Yagami 4296bd1291 * Finish task #5892. 2019-06-28 15:16:41 +08:00
Yagami 910ea1e96f * Fix details before release. 2019-06-25 09:33:56 +08:00