Commit Graph

119 Commits

Author SHA1 Message Date
chenfeiCF
7388d561c3 * Adjust contact list box. 2018-05-23 14:51:09 +08:00
滔哥
a11b0f9a9f * Task#4180. 2018-05-22 10:50:14 +08:00
Catouse
d27fb779c3 * refactor codes. 2018-05-21 09:08:08 +08:00
滔哥
7d1dc5a5e9 * Format code. 2018-05-18 09:38:35 +08:00
滔哥
eafa14bdca * Task#4159. 2018-05-18 09:28:19 +08:00
Catouse
582d1b1a2c * refactor codes. 2018-05-17 18:14:46 +08:00
chenfeiCF
dd94a715b8 * Adjust style for team of task. 2018-05-17 14:54:56 +08:00
wangyidong
6e6c82be2b * adjust for page. 2018-05-17 14:43:35 +08:00
liugang
e9ecb1fd9e * Optimize codes. 2018-05-16 10:42:42 +08:00
wangyidong
56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
wangyidong
e36f46ca0a * adjust for task edit page. 2018-04-28 17:53:20 +08:00
daitingting
321005e8ad * Compute hours for multiple tasks. 2018-04-04 14:38:57 +08:00
wangyidong
e7189afaaf * finish task #3705. 2018-03-15 15:00:23 +08:00
滔哥
1a00522c13 * Fix Bug#1388. 2018-01-16 10:39:59 +08:00
滔哥
e55e97d7ff * Fix Bug#1373,1374. 2018-01-16 10:28:39 +08:00
wangyidong
607076205e * finish task #3579. 2018-01-04 17:28:51 +08:00
wangyidong
271b52a889 * fix bug #1330. 2017-12-20 11:17:05 +08:00
滔哥
ef31488fa0 * Task #3458 2017-12-05 22:52:18 +08:00
滔哥
2f2c99f346 * Fix bug 2017-11-09 10:51:03 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
滔哥
8dc523cdf3 * fix task bug 2017-11-03 16:28:15 +08:00
滔哥
0dc610f36b * fix score and child task bug 2017-11-03 00:27:58 +08:00
滔哥
4a7c7c7402 * Task Status change 2017-10-23 21:13:35 +08:00
滔哥
129834b30f * childTask and multiTask 2017-10-20 13:50:48 +08:00
pengjiangxiu
202d76db45 * Adjust code. 2017-08-23 13:08:06 +08:00
pengjiangxiu
547355168d * Finish task #3195. 2017-08-21 13:29:51 +08:00
pengjiangxiu
c6165b16d5 * Finish task #1202. 2017-08-16 15:47:57 +08:00
daitingting
e8b8b67471 * Adjust codes. 2017-05-16 16:06:02 +08:00
wangyidong
12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
chenfeiCF
61db347702 * finish task #2880. 2017-01-10 14:13:31 +08:00
chenfeiCF
087e5aed22 * finish task #2867. 2017-01-09 13:47:12 +08:00
Catouse
6b5f1228c8 * finish task #2576. 2016-04-12 13:32:54 +08:00
chenfeiCF
9f99387a7e * finish task #2457. 2016-02-18 21:38:54 +08:00
wangyidong
e8bb9aa1ee * finish task #1295. 2016-02-15 17:29:23 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
Catouse
c58c386c59 * fix duplicate references of chosen. 2014-12-09 17:12:30 +08:00
wangyidong
e1d1c354fb * finish task #1971,1961. 2014-07-23 09:36:03 +00:00
wangyidong
080ea27752 * code for task #1971,1961. 2014-07-22 09:10:00 +00:00
xia0ta0
78ea03f55c * code for task #1894. 2014-06-18 15:40:15 +08:00
Catouse
a84ef67f6d * ajusted grid layout.
* ajusted style of treeview.
2014-05-02 10:37:15 +08:00
Catouse
fde4ff5610 * remove default text from chosen.
* fixed css class of some tables.
 * ajusted style of form.
 * ajusted ui of searchbox.
2014-04-25 16:20:36 +08:00
Catouse
3485b105f0 * ajusted style of 'titlebar' & 'featurebar'.
* updated kindeditor & chosen.
2014-04-25 10:36:40 +08:00
Catouse
98afc277a3 * ajusted views of module 'bug'. 2014-03-31 11:38:43 +08: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
ad3a1c29b8 * ajusted views.
* changed css names.
2014-03-27 14:40:55 +08:00
Catouse
1ff011f641 * ajusted views of module 'project'. 2014-03-25 19:57:12 +08:00
Catouse
c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
xia0ta0
12dac1ce57 * code for task#1835. 2014-03-24 16:33:20 +08:00
xia0ta0
b88842b4c0 * code for task#1830. 2014-03-12 16:35:57 +08:00