Commit Graph

112 Commits

Author SHA1 Message Date
滔哥
75fdcaa780 * Task #3386 && Bug #1264 2017-12-06 14:34:10 +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
34b3df57e2 * Remove category from module menu. 2017-10-31 16:33:58 +08:00
liugang
6dd2154233 * Add category to product. 2017-10-30 17:55:55 +08:00
wangyidong
f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
wangyidong
b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +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
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
b8c310e31c * change testlib to caselib. 2017-03-15 13:57:20 +08:00
wangyidong
a9d7f8d8c7 * code for task #2897. 2017-02-28 17:36:34 +08:00
chenfeiCF
a539be0c32 * adjust task #2731. 2016-12-04 13:35:40 +08:00
chenfeiCF
cefe16af35 * finish task #2782. 2016-11-24 14:18:15 +08:00
wangyidong
ff435621c3 * finish task #2800,2799. 2016-11-15 11:19:16 +08:00
wangyidong
80a2e16111 * adjust for doc menu. 2016-11-09 11:00:37 +08:00
wangyidong
0b4e00d77d * code for task #2672. 2016-10-26 14:28:55 +08:00
wangyidong
f246fbeba7 * finish task #2664. 2016-10-14 15:22:41 +08:00
wangyidong
c696a41d55 * fix bug #866. 2016-07-05 10:00:17 +08:00
wangyidong
a512350363 * adjust code. 2016-05-03 17:13:11 +08:00
wangyidong
2b5a458350 * adjust showmodule link position and fix error. 2016-04-29 13:45:28 +08:00
Catouse
1b4639d5f9 * change tree UI. 2016-04-27 11:39:13 +08:00
wangyidong
6cfe70895b * change it again. 2016-04-21 15:39:20 +08:00
wangyidong
58678c00fd * adjust for manage tree. 2016-04-19 14:15:45 +08:00
Catouse
35c45afc19 * task modules tree support product. 2016-04-18 13:08:20 +08:00
Catouse
e7a72856a0 * improve UI for manage modules, code for task #2549. 2016-04-12 16:59:30 +08:00
wangyidong
228b0aa59a * adjust js for task #1560. 2016-03-28 13:28:55 +08:00
wangyidong
e843e0004d * adjust code for ajaxGetSonModules. 2016-03-14 14:56:20 +08:00
wangyidong
052a1d7a7c * fix bug #783. 2016-01-05 15:21:25 +08:00
wangyidong
fd312662cc * finish task #2395. 2015-11-11 16:15:41 +08:00
wangyidong
ff210f304d * finish task #2377. 2015-11-10 11:11:48 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong
333b0be157 * finish task #2323,2340. 2015-10-22 09:03:37 +08:00
wangyidong
dca976c86a * code for task #2236. 2015-05-06 11:16:28 +08:00
wangyidong
06f1199112 * finish task #2236. 2015-05-05 15:50:34 +08:00
wangyidong
ab3c3a6fbf * fix a bug #689. 2015-04-14 11:07:48 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
60595ffa00 * fix a bug. 2014-08-21 01:43:03 +00:00
xia0ta0
41c3ffae4f Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/search/view/buildform.html.php
2014-08-20 10:54:50 +08:00
wangyidong
7d67d5da39 * finish task #1897. 2014-06-18 08:13:54 +00:00
xia0ta0
a954e09d53 Merge branch 'zui'
Conflicts:
	module/bug/view/activate.html.php
	module/bug/view/assignto.html.php
	module/bug/view/confirmbug.html.php
	module/bug/view/edit.html.php
	module/bug/view/resolve.html.php
	module/build/view/create.html.php
	module/build/view/edit.html.php
	module/common/model.php
	module/common/view/header.lite.html.php
	module/file/view/edit.html.php
	module/my/view/bug.html.php
	module/product/view/browse.html.php
	module/product/view/close.html.php
	module/product/view/edit.html.php
	module/productplan/view/edit.html.php
	module/project/view/activate.html.php
	module/project/view/batchedit.html.php
	module/project/view/burn.html.php
	module/project/view/close.html.php
	module/project/view/edit.html.php
	module/project/view/putoff.html.php
	module/project/view/start.html.php
	module/project/view/story.html.php
	module/project/view/suspend.html.php
	module/project/view/taskheader.html.php
	module/release/view/edit.html.php
	module/search/view/buildform.html.php
	module/story/view/batchclose.html.php
	module/story/view/change.html.php
	module/task/control.php
	module/task/css/batchcreate.css
	module/task/view/activate.html.php
	module/task/view/assignto.html.php
	module/task/view/batchcreate.html.php
	module/task/view/cancel.html.php
	module/task/view/close.html.php
	module/task/view/create.html.php
	module/task/view/edit.html.php
	module/task/view/finish.html.php
	module/task/view/start.html.php
	module/testtask/view/close.html.php
	module/testtask/view/edit.html.php
	module/testtask/view/start.html.php
	www/theme/default/style.css
2014-03-27 16:27:43 +08:00
Catouse
aa96761a82 * changed css names.
* added method 'setSyncTrigger' in 'my.full.js'.
2014-03-26 15:44:57 +08:00
wyd621
7ce1b3428d * fix a bug for http://www.zentao.net/thread-view-83210.html. 2014-03-18 07:14:27 +00:00
azhi
b74358ede4 * fix bug#469. 2013-08-21 10:43:22 +08:00
xia0ta0
0304d4ae97 * fix a bug : fix getTaskOptionMenu. 2013-08-12 14:47:17 +08:00
xia0ta0
d346820f65 * code for task#1665. 2013-08-02 08:58:02 +08:00