Commit Graph
271 Commits
Author SHA1 Message Date
xia0ta0 bdb2a4258c * merge branch zui. 2014-03-27 16:34:30 +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 aa96761a82 * changed css names.
* added method 'setSyncTrigger' in 'my.full.js'.
2014-03-26 15:44:57 +08:00
Catouse e94843f4e2 * changed css names to compatible with zui. 2014-03-26 11:01:19 +08:00
Catouse c1fd283142 * changed css names. 2014-03-25 11:25:30 +08: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 cffb3cd3c4 * adjust page that change td => th for commit. 2014-03-24 05:59:41 +00:00
wyd621 b66c834b43 * adjust for replace full webpath image to mail module. 2014-03-24 01:59:50 +00:00
wyd621 01d820accb * adjust position for the function of clear. 2014-03-24 01:15:44 +00:00
wyd621 1a29d43cb0 * code for task #1812. 2014-03-19 02:22:39 +00:00
wyd621 9230beaaa8 * fix bug. 2014-03-12 05:17:07 +00:00
wyd621 2f06f1b11f * finish task #1842. 2014-03-11 02:25:07 +00:00
xia0ta0 5d4d8239f1 * select users using chosen. 2014-03-04 10:58:40 +08:00
xia0ta0 e426a8131a * code for task#1784. 2014-03-03 09:29:07 +08:00
wyd621 5a403599f6 * fix a bug for sendmail no image. 2013-12-24 08:15:32 +00:00
wyd621 e053106f76 * fix a bug for bind the class of colorbox. 2013-12-19 01:25:19 +00:00
xia0ta0 4c0ce2c38c * fix bug#557. 2013-12-19 09:15:59 +08:00
xia0ta0 156d24e1ad * fix a bug : caseresult use runID, not caseID; 2013-11-14 15:21:36 +08:00
wyd621 0d4bab62e1 * fix bug fo #465. 2013-10-31 06:28:52 +00:00
wyd621 651d796606 * adjust the width of colorbox in testcase. 2013-10-30 05:44:22 +00:00
Catouse 777a9c0719 * ajust style of query link icon. 2013-10-29 09:35:18 +08:00
azhi 16092cad71 * fix bugs: new ui. 2013-09-28 10:35:10 +08:00
wyd621 6dbe327790 * fix bug 504. 2013-09-26 06:23:59 +00:00
wyd621 03dc6303ad * fix a bug #498. 2013-09-26 02:54:40 +00:00
Catouse f057603eb7 - rm useless style. 2013-09-22 14:52:45 +08:00
Catouse 057a42f834 * add style of icons and used correctly. 2013-09-18 16:55:33 +08:00
Catouse 8c6d3e42de * change wording of the delete icon. 2013-09-18 12:50:36 +08:00
Catouse c9b01af26c * ajust style of module menu and feature bar. 2013-09-17 09:53:56 +08:00
azhi 3b74f6ad70 * finish task#1686. 2013-08-08 11:39:58 +08:00
xia0ta0 af97dcb643 * isClickable is static function. 2013-08-07 10:08:07 +08:00
wyd621 69106a374d * change for new version. 2013-08-05 10:22:07 +08:00
xia0ta0 12c494e162 Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-02 15:55:48 +08:00
xia0ta0 1e563f2f3e * code for task#1636. 2013-08-02 15:55:13 +08:00
wyd621 1140dbe11f * finish task #1662. 2013-08-02 15:44:40 +08:00
xia0ta0 902f2a428f * code for task#1636. 2013-08-02 15:14:00 +08:00
azhi 68682101b5 * finish task#1645. 2013-08-01 16:52:24 +08:00
xia0ta0 49bc364c61 * code for task#1657. 2013-08-01 10:51:35 +08:00
xia0ta0 9dc6bc2894 * code for task#1657. 2013-08-01 09:24:13 +08:00
xia0ta0 27d0d2b8ff * code for task#1657. 2013-07-31 17:50:52 +08:00
xia0ta0 ef91b40279 * code for task#1657. 2013-07-31 14:18:45 +08:00
azhi 736f01df7b * finish task#1644. 2013-07-30 16:21:21 +08:00
wyd621 dc260d66f5 * finish task #1664. 2013-07-30 09:21:24 +08:00
xia0ta0 6258e8e6df Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-29 15:10:50 +08:00
xia0ta0 252b1d98d7 * code for task#1598. 2013-07-29 14:30:36 +08:00
azhi 3b9a69ee6c * code for task#1594. 2013-07-29 13:23:41 +08:00
xia0ta0 91fd958016 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-25 10:04:13 +08:00
xia0ta0 bf33420c03 * code for task#1598. 2013-07-25 09:09:36 +08:00
azhi c5e604816d * finish task#1441. 2013-07-24 16:03:15 +08:00