Commit Graph

600 Commits

Author SHA1 Message Date
z
9b80f4d9de * code for task #7302. 2020-07-06 09:08:09 +08:00
tianshujie98
a2cd825d1f Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-01 17:51:06 +08:00
z
36dfb8eb36 * adjust code. 2020-07-01 17:47:54 +08:00
tianshujie98
97429381e8 * Fix bug #3258. 2020-07-01 17:46:52 +08:00
z
ee3597a4e5 * finish task #7290. 2020-06-19 13:06:18 +08:00
z
4fce5f0720 * fix bug. 2020-06-08 16:39:14 +08:00
wangyidong
af6a2f26bc * code for batchcreate and batchedit with flow. 2020-05-29 13:45:41 +08:00
wangyidong
c9be3210cd * change for return error. 2020-05-29 10:09:25 +08:00
wangyidong
fd0da30d09 * fix bug. 2020-05-26 09:14:31 +08:00
wangyidong
1c6aefeb9d * finish task #7194. 2020-05-13 11:18:19 +08:00
leiyong
d0f61602a8 Merge branch 'master' of github.com:easysoft/zentaopms 2020-05-05 23:31:36 -07:00
leiyong
5c25b21c55 * Fix bug#3073. 2020-05-05 23:30:49 -07:00
wangyidong
9b61cfcd07 Merge branch 'master' of github.com:easysoft/zentaopms 2020-05-06 10:42:55 +08:00
wangyidong
026cc68970 * finish task #7095. 2020-05-06 10:42:26 +08:00
leiyong
5870c95ec4 Finish task#7109. 2020-05-05 18:34:50 -07:00
wangyidong
d369ccdab6 * adjust for php error. 2020-05-05 09:28:23 +08:00
leiyong
14e489b812 * Fix bug#7109. 2020-04-29 02:54:46 -07:00
leiyong
ad0c86afde Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-29 00:44:59 -07:00
leiyong
85a55e41bd * Finish task#7109. 2020-04-28 02:29:20 -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