Commit Graph
243 Commits
Author SHA1 Message Date
wangyidong b34c1f5c6c * finish task #2320. 2015-08-26 14:54:54 +08:00
wangyidong d00f899b21 * finish task #2252. 2015-05-12 11:15:33 +08:00
wangyidong 9f6fb46686 * fix a bug #640. 2015-04-13 16:08:31 +08:00
wangyidong 30c1ab399a * adjust for paste image. 2015-02-04 17:35:09 +08:00
wangyidong c9f0b9f861 * change for zh-tw. 2015-02-04 15:43:19 +08:00
wangyidong 4d7feceb69 * fix bugs. 2015-01-30 15:27:51 +08:00
wangyidong 0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
xia0ta0 e421f17225 * code for task#2166. 2014-12-10 14:03:58 +08:00
wangyidong 1812e64c73 * fix a bug. 2014-12-04 05:44:58 +00:00
wangyidong c59e100611 * code for task #2939. 2014-11-25 05:46:57 +00:00
wangyidong 99892c6036 * fix a bug. 2014-11-07 09:07:08 +00:00
wangyidong 268435ebe5 * adjust for lang. 2014-11-07 02:35:49 +00:00
ChuJilu 5a36e6d25b * fix task #2102. 2014-11-06 18:09:27 +08:00
ChuJilu 460bc7864f * fix task #2109 2014-11-06 18:06:38 +08:00
wangyidong 96341b35c3 * fix file size. 2014-11-06 09:36:04 +00:00
wangyidong a8be1e9649 * fix bug and adjust code. 2014-11-06 09:06:34 +00:00
ChuJilu f1f4e8a48d * fix a bug. 2014-11-05 18:32:28 +08:00
wangyidong 144b057d95 * adjust width for files-list. 2014-11-05 08:46:42 +00:00
ChuJilu 81f0212df7 * finish task #2106. 2014-11-05 16:22:37 +08:00
ChuJilu 7433753e62 * finish task #2102. 2014-11-04 14:55:58 +08:00
wangyidong 7c96bd88ee * finish task #2878. 2014-11-03 05:51:43 +00:00
ChuJilu 449bc717ae * finish task 2109. 2014-11-03 09:33:42 +08:00
wangyidong 53f263f844 * finish task #2055. 2014-10-28 03:35:17 +00:00
wangyidong f4121083fb * fix bug. 2014-08-12 09:27:23 +00:00
wangyidong 01023e5fb2 * finish task #1793. 2014-08-12 08:14:52 +00:00
wangyidong 3230f9fca7 * fix a bug for parse csv. 2014-08-05 02:26:12 +00:00
wangyidong e1d1c354fb * finish task #1971,1961. 2014-07-23 09:36:03 +00:00
wangyidong 043ecf66d4 * finish task #1936. 2014-07-18 03:21:02 +00:00
wangyidong fb329c9502 * change for show file notice. 2014-06-27 03:37:49 +00:00
Catouse daf87b209f * fixed ui of file form. 2014-06-18 11:16:25 +08:00
Catouse a69a464d8d * fixed style for ie8. 2014-05-02 14:38:06 +08:00
Catouse c5a3cf0be7 * ajusted form padding of 'file/export'.
* fixed size of textarea for firefox.
 * removed unused code from common.css.
2014-05-02 13:39:32 +08:00
Catouse 6f83945eec * update zui resources.
* ajusted style of 'file/export'.
2014-04-29 15:43:57 +08:00
Catouse c10aa876e4 * fixed style for firefox, oprea 12 and ie 8. 2014-04-26 22:06:18 +08:00
Catouse d2decf65fc * fixed style. 2014-04-26 19:41:54 +08:00
Catouse 23cbb7c9f3 * ajusted views. 2014-04-15 16:19:33 +08:00
Catouse d425b767a6 * replaced 'colorbox' with 'modal' in zui. 2014-04-08 13:55:05 +08:00
wyd621 4744483c11 Merge branch 'master' of github.com:easysoft/zentaopms 2014-04-03 01:09:48 +00:00
wyd621 4c427d8c60 * fix errors. 2014-04-03 01:08:51 +00:00
Catouse 59bc3f6e65 * ajusted views. 2014-04-02 10:37:35 +08:00
wyd621 98efc661af * fix a bug. 2014-03-28 11:43:24 +00:00
Catouse 561f39afe8 * ajusted views.
* fixed iframe modal method in 'my.full.js'.
2014-03-28 11:06:06 +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 c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
wyd621 d39c50c082 * adjust file-edit in colorbox. 2014-03-24 02:49:03 +00:00
Catouse 19a43d2b4a * ajusted ui of file form. 2014-03-20 17:10:10 +08:00
wyd621 3ff07701f0 * finish task #1813. 2014-03-17 05:59:19 +00:00
wyd621 d16a723790 * adjust code for setImgSize. 2013-11-01 06:14:47 +00:00
Catouse 3ec6e8ebc9 * change delete file icon to plus sign. 2013-11-01 08:23:49 +08:00
wyd621 ddf7ba8352 * adjust icon for delete file. 2013-11-01 00:19:02 +00:00