Commit Graph

379 Commits

Author SHA1 Message Date
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
滔哥
507a436704 * Fix bug#1275 2017-12-18 13:57:20 +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
滔哥
e081bad9f1 * Task#3438 2017-12-06 15:47:42 +08:00
滔哥
75fdcaa780 * Task #3386 && Bug #1264 2017-12-06 14:34:10 +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
wangyidong
fbc5b38585 * change for zh-tw lang. 2017-11-06 10:13:16 +08:00
liugang
1485cad751 * Don't display parent when edit a product line.
* Don't display child page when browse a product line.
2017-11-02 17:27:05 +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
34b3df57e2 * Remove category from module menu. 2017-10-31 16:33:58 +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
滔哥
984f3940c9 change .gitignore 2017-10-20 14:31:55 +08:00
wangyidong
f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
pengjiangxiu
ea306d3f3b * change lang file. 2017-08-24 14:03:58 +08:00
wangyidong
9dce33c3df Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-23 14:56:32 +08:00
wangyidong
094c960bf4 * finish task #3088. 2017-08-23 14:55:49 +08:00
pengjiangxiu
202d76db45 * Adjust code. 2017-08-23 13:08:06 +08:00
Catouse
22ed90761e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-22 15:33:51 +08:00
Catouse
caf304be98 * finish task #3155 and fix bug #1093. 2017-08-22 14:36:33 +08:00
Catouse
c0237c0648 * remove console.log. 2017-08-22 14:35:54 +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
fc3f537836 * finish task #3159. 2017-08-15 16:25:25 +08:00
wangyidong
b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
wangyidong
12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
wangyidong
fcbc6b2d23 Merge branch 'master' of github.com:easysoft/zentaopms 2017-05-12 16:15:32 +08:00
wangyidong
5b558cb825 * adjust for show module tree in branch browse. 2017-05-12 16:14:33 +08:00
daitingting
b378b53307 * Adjust menu for onlyTest. 2017-05-12 14:45:57 +08:00
daitingting
ce174f973c * Set as working as only test. 2017-05-05 12:09:19 +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
daitingting
6ac47102e8 * Edit branch for story when batch edit them. 2017-04-26 18:03:35 +08:00
wangyidong
a8110589a4 * adjust for web and fix bugs. 2017-04-07 10:10:24 +08:00
wangyidong
0ee005e965 * adjust for zh-tw lang. 2017-03-23 13:17:22 +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
wangyidong
b8c310e31c * change testlib to caselib. 2017-03-15 13:57:20 +08:00
wangyidong
93d5a18f57 * change for en lang. 2017-03-10 15:34:10 +08:00
wangyidong
b3ee0204b5 * finish task #2898. 2017-03-02 10:37:13 +08:00
wangyidong
a9d7f8d8c7 * code for task #2897. 2017-02-28 17:36:34 +08:00