Commit Graph

623 Commits

Author SHA1 Message Date
Yagami
b909b26194 * Fix details. 2020-08-26 16:19:28 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
6cdef8d7d3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-18 14:11:53 +08:00
z
be28a89aea * fix bug for flow. 2020-08-18 14:09:30 +08:00
holan20180123
fb15224b42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-13 13:53:57 +08:00
tianshujie98
595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
holan20180123
29a2c25ef1 * Fix bug #3334. 2020-08-12 08:15:40 +08:00
holan20180123
5e9d47b062 * Finish task #7613. 2020-08-10 11:31:50 +08:00
holan20180123
28af4d63da * Finish task #7613. 2020-08-07 17:29:16 +08:00
tianshujie98
bb3658ecf8 * Fix bug #2504. 2020-08-05 17:58:17 +08:00
chenfei
893a672c5a * Finish task #7473. 2020-07-22 16:28:09 +08:00
sgm0422
9358aa343b * Finish task #1087. 2020-07-20 15:34:32 +08:00
holan20180123
fff031bfbb Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-16 13:07:58 +08:00
holan20180123
d0a458160f * Finish #7471. 2020-07-16 13:07:23 +08:00
sgm0422
725a550aff * Finish task #7428. 2020-07-15 15:06:22 +08:00
chenfei
41e862d5cb * Finish task #5104. 2020-07-14 16:16:47 +08:00
sgm0422
2e454b1415 * Finish task #7429. 2020-07-14 11:21:12 +08:00
tianshujie98
a4b52c7e87 Finish task #7413,7394,7391,7384,7381. 2020-07-13 14:21:29 +08:00
z
6bb5cf37ce * fix bug for batch edit task. 2020-07-09 15:25:03 +08:00
z
ac3e27aa04 * revert for recordZero. 2020-07-06 17:11:53 +08:00
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
sgm0422
bf1cdda8f5 * Add program to task and story. 2020-06-03 09:02:28 +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
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
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