Commit Graph
6755 Commits
Author SHA1 Message Date
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
wyd621 91497edc0f * fix a bug for showImport. 2014-03-27 06:59:24 +00:00
Catouse ad3a1c29b8 * ajusted views.
* changed css names.
2014-03-27 14:40:55 +08:00
Catouse 99c8a0554e * ajusted views. 2014-03-27 09:12:38 +08:00
Catouse aa96761a82 * changed css names.
* added method 'setSyncTrigger' in 'my.full.js'.
2014-03-26 15:44:57 +08:00
Catouse 86b1296734 * ajusted views of module .product'. 2014-03-26 15:43:55 +08:00
Catouse e94843f4e2 * changed css names to compatible with zui. 2014-03-26 11:01:19 +08:00
Catouse 1ff011f641 * ajusted views of module 'project'. 2014-03-25 19:57:12 +08:00
Catouse 4fb25dbd77 * added language support to the chosen control.
* added some icons definitions.
2014-03-25 16:12:49 +08:00
wyd621 dd0f637ee3 * adjust code. 2014-03-25 06:39:36 +00:00
Catouse a1c3b8582e * ajusted views of module 'project'. 2014-03-25 14:07:37 +08:00
Catouse c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
wyd621 6b78cbc325 * change for zh-tw. 2014-03-25 02:43:14 +00:00
wyd621 f9b210c075 * change for burn. 2014-03-25 02:43:02 +00:00
wyd621 0ceae4a8b2 * fix for upgrade. 2014-03-25 02:42:27 +00:00
xia0ta0 870102ee0f Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 16:38:59 +08:00
xia0ta0 12dac1ce57 * code for task#1835. 2014-03-24 16:33:20 +08:00
wyd621 3c35abc8af * fix a bug. 2014-03-24 08:09:51 +00:00
wyd621 515467317b Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 07:29:17 +00:00
xia0ta0 689c758bdb * merge desc and goal. 2014-03-24 14:49:36 +08:00
xia0ta0 0d3c384895 Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 14:25:40 +08:00
xia0ta0 4f6181ef3f * adjust batchcreate of task. 2014-03-24 14:24:09 +08:00
wyd621 cffb3cd3c4 * adjust page that change td => th for commit. 2014-03-24 05:59:41 +00:00
wyd621 e2c1cf29aa * add assignedTo field for my-bug. 2014-03-24 05:30:51 +00:00
wyd621 0c3065d2b2 * adjust burn. 2014-03-24 05:24:32 +00:00
wyd621 82c7ada6a0 * change note. 2014-03-24 03:36:59 +00:00
wyd621 ff765b0cdc * adjust code. 2014-03-24 03:33:21 +00:00
wyd621 b22a14b5f9 * change lang->date->day => $lang->day for common lang. 2014-03-24 03:20:42 +00:00
xia0ta0 9aa6a9e7e9 * change str_replace to nl2br. 2014-03-24 10:55:53 +08:00
wyd621 d39c50c082 * adjust file-edit in colorbox. 2014-03-24 02:49:03 +00:00
wyd621 8086d79e70 * change getList to getByList
* add getByList in story module.
2014-03-24 02:24:56 +00:00
wyd621 b66c834b43 * adjust for replace full webpath image to mail module. 2014-03-24 01:59:50 +00:00
wyd621 37d7253961 * adjust page for bug-customfields. 2014-03-24 01:37:51 +00:00
wyd621 12374a02bc * adjust for output timeout from exportConfigVars. 2014-03-24 01:25:44 +00:00
wyd621 01d820accb * adjust position for the function of clear. 2014-03-24 01:15:44 +00:00
wyd621 aa7a270e68 * remove packageType field for build. 2014-03-24 01:02:26 +00:00
wyd621 dc6220e34f * remove export title. 2014-03-24 00:59:51 +00:00
Catouse 3c7f807288 * ajusted style of plan view and release view. 2014-03-23 14:57:28 +08:00
Catouse d4fae43791 * ajusted views 2014-03-22 11:12:59 +08:00
wyd621 73366a111f * add boarder for build and release. 2014-03-21 09:33:23 +00:00
wyd621 cd349cf78a * adjust extension. 2014-03-21 09:10:56 +00:00
wyd621 c5143a6e67 * remove useless plugin. 2014-03-21 09:08:16 +00:00
wyd621 63368d9c7d * fix a bug for export stage. 2014-03-21 07:21:36 +00:00
Catouse 1e4d342017 * ajusted views of module prodcut & doc. 2014-03-21 15:04:23 +08:00
Catouse b08e0446bf * ajusted views of module product. 2014-03-21 11:42:03 +08:00
wyd621 b1fbc91821 * adjust code format. 2014-03-21 02:48:50 +00:00
wyd621 7b5af08f66 * adjust code format. 2014-03-21 02:27:26 +00:00
wyd621 5dac9ab0eb * adjust code format. 2014-03-21 02:26:34 +00:00
wyd621 77a5345367 * remove the colorize plugin. 2014-03-21 02:25:53 +00:00
Catouse 9292b7eb01 * ajusted views of module 'story'. 2014-03-20 17:12:20 +08:00