Commit Graph
181 Commits
Author SHA1 Message Date
daitingting 7c33439d00 * Adjust plan link. 2018-07-02 14:13:27 +08:00
Catouse c6952e9a1a * change style of dashboard block panels. 2018-06-20 09:22:44 +08:00
liugang 35bcf01ff5 * Replace $this->config with $config in view files. 2018-06-14 14:34:41 +08:00
daitingting d581f97ec4 * Set nowrap for objectName. 2018-06-01 10:42:47 +08:00
滔哥 484dda26a0 * Finish task#4376. 2018-05-31 15:04:10 +08:00
daitingting e03ecf66f7 * Adjust major action. 2018-05-28 14:20:52 +08:00
wangyidong 244a261be4 * finish task #4217. 2018-05-23 16:25:50 +08:00
chenfeiCF f5f0e79ecb * Finish task #4286, #4287, #4288, #4289, #4290. 2018-05-22 15:05:16 +08:00
滔哥 ae39caedad * Task#4141. 2018-05-17 20:02:39 +08:00
daitingting 511e67f579 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	db/update9.8.1.sql
	module/doc/css/common.css
	module/doc/view/browse.html.php
2018-05-07 17:28:29 +08:00
daitingting 42c6502b0f * Rewrite allLibs, objectLibs and browse pages of doc. 2018-05-07 17:27:12 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
daitingting a06796c25b * Replace effort block to burn block.
* Check priviledge.
2018-05-03 15:59:30 +08:00
daitingting 46e8569973 * Rewrite view page of project. 2018-05-03 14:58:03 +08:00
wangyidong c5fd3d0af7 * adjust for back button in view page. 2018-05-02 10:13:20 +08:00
daitingting 6a3b7a11ee * Adjust it. 2018-04-24 09:39:05 +08:00
daitingting 4a709543d8 * Set actions of current user as primary. 2018-04-19 16:42:15 +08:00
daitingting c49baf1044 * Rewrite view file of project. 2018-04-19 13:36:56 +08:00
wangyidong 809c8d5eb2 * finish task #3727. 2018-03-16 15:51:14 +08:00
dajiao007 2a8146f6fb modify translations of admin module 2018-01-17 16:01:59 +08:00
dajiao007 87807110d5 modify tranlate and adjust column width 2018-01-11 16:46:08 +08:00
liugang d41c411bfd + Finish task #3244. 2017-10-26 18:36:41 +08:00
wangyidong 4626e4f0d1 * fix for error. 2017-10-26 08:56:01 +08:00
pengjiangxiu 41a2fc9a8f * Finish task #3210. 2017-09-19 13:56:39 +08:00
daitingting ef8be94f83 * Hidden product when working is task. 2017-05-19 10:07:48 +08:00
wangyidong 9fac0a464c * finish task #2710. 2016-12-01 10:31:47 +08:00
wangyidong 45c6658826 * finish task #2710. 2016-11-22 11:27:51 +08:00
chenfeiCF 8cd6978375 * finish task #2567. 2016-03-29 10:34:34 +08:00
chenfeiCF 86b96a9640 * finish task #2388. 2015-11-10 15:29:41 +08:00
wangyidong 015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong 5029ba6b23 * finish task #2344. 2015-10-26 13:12:00 +08:00
wangyidong 0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong 8aae94b51e * fix bugs for php notice. 2014-11-12 07:35:45 +00:00
wwccss c530038d9a * adjust code format. 2014-08-22 14:06:38 +08:00
chujilu 7b61d60845 * finish change task #2062 #2063 2014-08-21 13:53:19 +08:00
Catouse a84ef67f6d * ajusted grid layout.
* ajusted style of treeview.
2014-05-02 10:37:15 +08:00
Catouse 3485b105f0 * ajusted style of 'titlebar' & 'featurebar'.
* updated kindeditor & chosen.
2014-04-25 10:36:40 +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 1ff011f641 * ajusted views of module 'project'. 2014-03-25 19:57:12 +08:00
Catouse a1c3b8582e * ajusted views of module 'project'. 2014-03-25 14:07:37 +08:00
wyd621 7f9bff9190 * fix a bug. 2014-03-19 06:48:59 +00:00
wyd621 ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
wangyidong edf9a3490a * finish task #1175. 2013-03-13 06:16:02 +00:00
zhujinyong d654b08e66 + add type of project. 2013-01-21 02:06:26 +00:00
zhujinyong 7ea61a8c29 * change 'delay' to 'put off'. 2013-01-18 08:41:32 +00:00
wangchunsheng 8f0d651d9c * convert to unix format. 2013-01-18 01:58:14 +00:00
wangchunsheng 48d43cb5e1 * change copyright time. 2013-01-18 01:18:58 +00:00
wangyidong be1ccca5e5 * adjust the code logic of view page for isClickable function. 2013-01-17 01:31:59 +00:00
zhujinyong 68e0c85aaa * add actions of project. 2013-01-16 02:35:13 +00:00
wangyidong 3f41b340a0 * refactory action-trash. 2013-01-08 05:39:51 +00:00