Commit Graph
167 Commits
Author SHA1 Message Date
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
wyd621 a84f66c1b9 * fix for the image of comment. 2013-10-31 08:39:46 +00:00
azhi 8f9e75ffbc * adjust the ui. 2013-09-28 15:35:25 +08:00
Catouse 891a3d2dd9 * ajust style. 2013-09-27 16:49:13 +08:00
Catouse bac96871d2 * ajust style. 2013-09-27 12:21:08 +08:00
Catouse b3b0d74d8c * change icons:.icon-add,.icon-delete. 2013-09-24 08:45:14 +08:00
wyd621 7b7fdc7ac5 * fix a bug. 2013-09-04 15:19:18 +08:00
wyd621 de0a6190a9 * finish task #1638. 2013-07-30 15:26:05 +08:00
wyd621 fa8937eff4 * fix the error of pcre.backtrack_limit for preg_match. 2013-07-29 14:56:38 +08:00
wyd621 fb1b8520a3 * fix app->error to app->triggerError. 2013-07-29 14:05:29 +08:00
wyd621 fa39edb4bc * finish task #1607. 2013-07-25 17:05:46 +08:00
wwccss c20261cb20 * init ext directory again. 2013-07-18 09:17:31 +08:00
wyd621 ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
wangyidong 5f8bfb7743 * finish task #1483. 2013-07-02 08:15:31 +00:00
wangchunsheng 9a205f6de0 * convert the tw language. 2013-05-05 02:34:43 +00:00
chencongzhi520@gmail.com 6f71f86181 * set the charset of export same as mail configuration. 2013-05-05 00:29:24 +00:00
chencongzhi520@gmail.com b8a6dd275f * finish task#1324.
* set transition=none for colorbox of file-edit.
2013-04-10 05:54:08 +00:00
wangyidong 35767f1c6f * change for show max upload filesize. 2013-03-27 02:26:38 +00:00
wangyidong 16056e12ef * zh-cn to zh-tw for lang. 2013-02-28 00:52:05 +00:00
wangchunsheng 589d3f0db5 * adjust the file export page. 2013-02-25 01:45:03 +00:00
wangchunsheng 0e0887fb5a - remove the file icon and title. 2013-01-20 06:38:12 +00:00
wangyidong 6e0513ad62 * refactory the logic: hasPriv then html::a instead common::printLink. 2013-01-18 07:01:06 +00:00
wangyidong 740e82af5c * fix bug: show the max upload size of php setting. 2013-01-18 02:31:42 +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 cc02b2ef8d * adjust the lang define of max size of upload. 2013-01-09 06:14:10 +00:00
chencongzhi520@gmail.com a1b6828dc2 * finish task#1065. 2013-01-04 06:45:27 +00:00