Commit Graph

211 Commits

Author SHA1 Message Date
Yagami
e29d9990aa * Fix module orderBy. 2018-11-12 15:55:47 +08:00
Yagami
9a2a2b234d * Fix module orderBy. 2018-11-12 15:52:20 +08:00
Yagami
9dc991fc16 * Fix task module display. 2018-11-12 10:11:49 +08:00
wangyidong
d64306aa90 * adjust code. 2018-10-23 16:18:30 +08:00
Yagami
8754aa0dc1 * Adjust doc orderby. 2018-10-11 17:02:51 +08:00
Yagami
5375f74140 * Finish task #4953. 2018-10-11 09:40:15 +08:00
wangyidong
a242759f78 * adjust code for tree checkUnique. 2018-09-18 08:56:57 +08:00
滔哥
52b22fa382 * Finished task#4658 2018-09-11 17:14:21 +08:00
wangyidong
fb9e21ffa4 * adjust code. 2018-09-07 14:10:14 +08:00
Yagami
cf1db510cc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-04 17:09:39 +08:00
Yagami
a29f81bd2d * Finish task #4798,#4797. 2018-09-04 17:09:02 +08:00
wangyidong
24c982f0a7 * finish task #4821. 2018-09-04 16:27:19 +08:00
wangyidong
1bcbddf649 * finish task #4659. 2018-08-07 16:30:00 +08:00
wangyidong
56256fb190 * fix bug. 2018-06-08 09:54:32 +08:00
chenfeiCF
90fd88fb7e * Finish task #4415, #4418, #4419. 2018-05-30 15:29:05 +08:00
daitingting
5b97fbdc0b * Adjust modulesTree. 2018-05-17 16:12:12 +08:00
滔哥
a16a48a323 * Task#3942 2018-05-08 23:12:49 +08:00
wangyidong
56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
daitingting
4cac9a423b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-28 09:16:15 +08:00
daitingting
7d79b7b5db * Add getDocStructure function. 2018-04-28 09:15:37 +08:00
liugang
827b31d89e * Refact link story page and story page of project. 2018-04-27 13:36:09 +08:00
liugang
093898d482 * Finish task #3834. 2018-04-19 10:12:12 +08:00
wumo
ef8e72fc0e * Set the value of deleted product line to 0. 2018-03-23 04:10:50 +08:00
wangyidong
d35e51a15a * merge new change. 2018-03-13 12:26:20 +08:00
wangyidong
f228dcf456 * fix bug for check unique module. 2018-02-28 10:54:46 +08:00
wangyidong
2c545e7ef1 * fix bug #1382. 2018-01-16 16:28:19 +08:00
wangyidong
b387a55a3d * finish task #3572. 2018-01-15 09:38:46 +08:00
wangyidong
5c7ff9a216 * fix bug #1283. 2017-12-19 17:21:19 +08:00
wangyidong
ab4f445f19 * finish task #3475. 2017-12-19 14:00:08 +08:00
滔哥
a2672a6c44 * Task #3446 2017-12-12 17:42:42 +08:00
滔哥
27c6eabab9 * Format code 2017-12-11 16:58:31 +08:00
滔哥
4286138053 * Format code 2017-12-11 16:42:24 +08:00
滔哥
a12fefb2a6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-17 15:02:35 +08:00
滔哥
bda8f7434f * Fix bug in php7.1 2017-11-17 15:02:26 +08:00
wangyidong
ec88c8c85a * fix bug #1287,1288. 2017-11-17 13:18:11 +08:00
wangyidong
ed078b58c3 * change datatable for pro. 2017-11-14 16:33:59 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
liugang
e8cdfe2bff + Add en lang files.
* Finish task 3292,3293,3294,3305,3306,3307,3308,3309.
2017-11-02 11:35:52 +08:00
liugang
fc8e08698f * Browse products by category. 2017-10-31 14:08:02 +08:00
liugang
6dd2154233 * Add category to product. 2017-10-30 17:55:55 +08:00
wangyidong
87d230dd2a * fix bug for report. 2017-10-24 17:21:39 +08:00
pengjiangxiu
202d76db45 * Adjust code. 2017-08-23 13:08:06 +08:00
pengjiangxiu
61b5f77f91 * Finish task #3201. 2017-08-22 13:05:13 +08:00
pengjiangxiu
547355168d * Finish task #3195. 2017-08-21 13:29:51 +08:00
wangyidong
5b558cb825 * adjust for show module tree in branch browse. 2017-05-12 16:14:33 +08:00
wangyidong
457ffb3f61 Finish task#3015 重复修改模块所属的产品时,列出的模块列表有重复,cost:1 left:0 2017-05-03 10:34:49 +08:00
daitingting
17ee8168e7 * Display public module for multi branch. 2017-04-28 10:06:32 +08:00
chenfeiCF
bd6e02b35c * finish task #2996. 2017-04-27 15:45:33 +08:00
wangyidong
dc812fd161 * adjust code. 2017-03-21 15:06:38 +08:00
wangyidong
7648bfd46e * change field name fromLib to fromCaseID. 2017-03-17 13:24:43 +08:00