chenfeiCF
|
0927768631
|
* add english lang item for 'list'.
|
2016-04-21 17:13:21 +08:00 |
|
chenfeiCF
|
9fba47c584
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-21 16:36:20 +08:00 |
|
chenfeiCF
|
ae05ed236d
|
* fix bug #827.
|
2016-04-21 16:35:00 +08:00 |
|
Catouse
|
077f52214a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-21 16:27:21 +08:00 |
|
Catouse
|
a64adf09c8
|
* ajust code.
|
2016-04-21 16:22:47 +08:00 |
|
wangyidong
|
c64b48ebad
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-21 16:11:20 +08:00 |
|
wangyidong
|
30464151ce
|
* fix bug and adjust code for product-tree.
|
2016-04-21 16:10:38 +08:00 |
|
Catouse
|
dd3b0bbb5e
|
* fix an error on display user account information.
|
2016-04-21 16:03:36 +08:00 |
|
Catouse
|
05c5c2e50a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
module/project/model.php
|
2016-04-21 15:45:08 +08:00 |
|
Catouse
|
3663f341e9
|
* refactor code.
|
2016-04-21 15:43:36 +08:00 |
|
wangyidong
|
6cfe70895b
|
* change it again.
|
2016-04-21 15:39:20 +08:00 |
|
Catouse
|
9f2e4e99ea
|
* fix product tasks tree view.
|
2016-04-21 15:12:54 +08:00 |
|
Catouse
|
70abc0efab
|
* fix error for build menu config.
|
2016-04-21 13:48:40 +08:00 |
|
Catouse
|
825350f421
|
* improve custom menu UI.
|
2016-04-21 12:07:15 +08:00 |
|
Catouse
|
ceb8e4fe67
|
* ajust code.
|
2016-04-21 12:06:52 +08:00 |
|
Catouse
|
597300de46
|
Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms
|
2016-04-21 08:45:55 +08:00 |
|
Catouse
|
27676eeb4b
|
* add menu custom UI.
|
2016-04-21 08:45:43 +08:00 |
|
chenfeiCF
|
5d449563ca
|
* fix bug: should not get moduleOptionMenu of product whose id equal project when project links no product.
|
2016-04-20 16:27:53 +08:00 |
|
Catouse
|
0d727fc3d8
|
* change menu method.
|
2016-04-20 15:39:47 +08:00 |
|
Catouse
|
06f3fe23b1
|
* change menu method.
|
2016-04-20 15:35:44 +08:00 |
|
Catouse
|
42a26d17de
|
* fix feature menu.
|
2016-04-20 15:29:12 +08:00 |
|
Catouse
|
149e26071f
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
module/bug/view/browse.html.php
module/product/view/browse.html.php
module/project/lang/zh-cn.php
module/project/view/taskheader.html.php
module/testcase/view/caseheader.html.php
module/testtask/view/caseheader.html.php
|
2016-04-20 15:14:39 +08:00 |
|
wangyidong
|
d89d674cdd
|
* code for task #2522,2579.
|
2016-04-20 14:51:05 +08:00 |
|
Catouse
|
9f6b172442
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-20 14:12:48 +08:00 |
|
Catouse
|
0733b9f177
|
* fix UI for feature menu.
|
2016-04-20 14:06:23 +08:00 |
|
chenfeiCF
|
164f7630d3
|
* fix error for task #2559: not merge product module pairs when type is 'task';
|
2016-04-20 11:21:17 +08:00 |
|
Catouse
|
c4c5f942e8
|
* change model motheds for menus.
|
2016-04-20 08:41:42 +08:00 |
|
Catouse
|
b52947ed27
|
* code for task #2518.
|
2016-04-19 17:50:02 +08:00 |
|
Catouse
|
a184f23c81
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-19 17:49:36 +08:00 |
|
Catouse
|
3a6d5cf29c
|
* add method to refresh all panels in dashboard.
|
2016-04-19 17:49:19 +08:00 |
|
chenfeiCF
|
156c55cb70
|
* add lang itme for files of story and task module.
|
2016-04-19 17:30:08 +08:00 |
|
chenfeiCF
|
d9f12f6562
|
fix bug: fill 'admin' in last input tags automatically when batch edit users.
|
2016-04-19 17:05:53 +08:00 |
|
chenfeiCF
|
ff5dac7887
|
* fix bug: can not get builds belong to all branch when activating a bug in one branch.
|
2016-04-19 17:00:34 +08:00 |
|
chenfeiCF
|
fc385aa25d
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-19 14:19:43 +08:00 |
|
wangyidong
|
afef5eedbd
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-19 14:16:11 +08:00 |
|
wangyidong
|
58678c00fd
|
* adjust for manage tree.
|
2016-04-19 14:15:45 +08:00 |
|
chenfeiCF
|
3bd8e72a9d
|
* fix error for export method of bug module: not set os and browser list.
|
2016-04-19 14:15:00 +08:00 |
|
chenfeiCF
|
d1bcb26a7a
|
* fix error for task #2554 when browseType is 'byproduct'.
|
2016-04-19 13:31:14 +08:00 |
|
wangyidong
|
25ada3e7e3
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-19 11:13:49 +08:00 |
|
wangyidong
|
a20f6c9ce0
|
* fix bug and adjust code for get story version when batch create case.
|
2016-04-19 11:12:56 +08:00 |
|
Catouse
|
3322a58d91
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-19 10:48:12 +08:00 |
|
Catouse
|
95c09a8425
|
* improve project tree UI.
|
2016-04-19 10:48:05 +08:00 |
|
chenfeiCF
|
0d832ade74
|
* fix error for featurebar of bug module browse menu.
|
2016-04-19 09:41:26 +08:00 |
|
Catouse
|
0f986db031
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2016-04-18 18:46:23 +08:00 |
|
Catouse
|
b356e65732
|
* finish task #2552.
|
2016-04-18 18:45:58 +08:00 |
|
chenfeiCF
|
f75c032c4d
|
* add lang item for setPublic.
|
2016-04-18 16:47:27 +08:00 |
|
Catouse
|
62f35f1a18
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
module/project/view/taskheader.html.php
|
2016-04-18 16:38:37 +08:00 |
|
Catouse
|
ba2eff3f57
|
* code for task #2552.
|
2016-04-18 16:35:50 +08:00 |
|
wangyidong
|
8ea70725cd
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2016-04-18 16:29:49 +08:00 |
|
wangyidong
|
d22230a546
|
* change for custom menu.
|
2016-04-18 16:27:15 +08:00 |
|