Commit Graph
1182 Commits
Author SHA1 Message Date
chujilu fb1d75aa3e Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-13 21:50:59 +08:00
chujilu 05081f19ba * add postponed bug when task import bug 2014-08-13 21:49:39 +08:00
wangyidong 8501046c11 * finish task #1185. 2014-08-13 05:58:51 +00:00
wangyidong c49bc171fc * finish task #1393. 2014-07-25 05:53:25 +00:00
xia0ta0 6696901714 * code for task#1888. 2014-06-17 15:26:05 +08:00
wyd621 64b41bb092 * fix a bug for project burn. 2014-04-30 09:28:40 +00:00
Catouse 561f39afe8 * ajusted views.
* fixed iframe modal method in 'my.full.js'.
2014-03-28 11:06:06 +08:00
xia0ta0 285a010037 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/project/view/build.html.php
2014-03-27 16:38:54 +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 99c8a0554e * ajusted views. 2014-03-27 09:12:38 +08:00
wyd621 f9b210c075 * change for burn. 2014-03-25 02:43:02 +00:00
wyd621 82c7ada6a0 * change note. 2014-03-24 03:36:59 +00:00
wyd621 b22a14b5f9 * change lang->date->day => $lang->day for common lang. 2014-03-24 03:20:42 +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 d022e464cb * finish task #1804. 2014-03-14 03:27:53 +00:00
xia0ta0 375e2bdc41 + add PM. 2014-03-12 10:11:56 +08:00
wyd621 ea55339611 * finish task #1845. 2014-03-06 01:47:47 +00:00
xia0ta0 dcd20eee4a * code for task#1812. 2014-03-05 17:17:22 +08:00
xia0ta0 72bcbfb72a * code for task#1792. 2014-03-05 09:19:28 +08:00
wyd621 f195cea19c * fix a bug for lib module in search. 2014-01-02 09:43:50 +00:00
wyd621 759bacd4b3 * fix bug #536. 2013-10-31 08:38:26 +00:00
wyd621 9c3a12b11d * fix a bug for burn. 2013-09-22 09:51:27 +08:00
wyd621 5e26222608 * adjust code and fix bug. 2013-08-05 09:43:06 +08:00
wyd621 767c135303 * fix bug for waring. 2013-08-02 10:15:02 +08:00
wyd621 ff28f5e032 Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:

	module/productplan/control.php
2013-08-01 00:29:30 +08:00
azhi 68682101b5 * finish task#1645. 2013-08-01 16:52:24 +08:00
azhi 4b09288597 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-01 13:32:17 +08:00
azhi 633d26dc8a * finish task#1068. 2013-08-01 13:31:51 +08:00
xia0ta0 40ea8cf4c1 * code for task#1657. 2013-08-01 11:09:58 +08:00
wyd621 e259c31486 * finish task #1623. 2013-08-01 00:27:04 +08:00
xia0ta0 5e00f938e6 * code for task#1657. 2013-07-30 16:10:28 +08:00
xia0ta0 5709bd9b74 * code for task#1657. 2013-07-30 10:45:06 +08:00
xia0ta0 625831b766 * code for task#1613. 2013-07-25 10:03:27 +08:00
wyd621 fd4a36dc8c * finish task #1601. 2013-07-23 15:49:47 +08:00
wyd621 aae95743f9 * finish task #1571. 2013-07-18 16:48:06 +08:00
wyd621 ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
chencongzhi520@gmail.com 69083eb0c3 * code for task#1534. 2013-07-10 08:46:15 +00:00
chencongzhi520@gmail.com 33b345087b * move the createProductLink and createProjectLink to model from control.
* code for dropmenu.
2013-07-08 00:38:56 +00:00
wangyidong 2b38881864 * change the number of recPerPage for mobile. 2013-07-05 02:03:26 +00:00
wangyidong 2a7ebdbea9 * fix a bug for browse project and product in mobile. 2013-07-04 06:56:02 +00:00
wangyidong fa9b8ad2a6 * fix a bug for do not locate when no project and product in mobile. 2013-07-04 06:45:39 +00:00
chencongzhi520@gmail.com edf0f2da82 * code for task#1487. 2013-07-03 07:40:47 +00:00
chencongzhi520@gmail.com aad4354fdf * finish task#1458. 2013-07-02 02:11:41 +00:00
wangyidong 78a2f85b21 * change for my-story use ajax
* add title for project-index and product-index.
2013-06-28 02:27:23 +00:00
chencongzhi520@gmail.com dd03e4dd57 * code for task#1423. 2013-06-19 02:48:45 +00:00
chencongzhi520@gmail.com 79eae99f5c * finish task#1366. 2013-06-19 01:33:57 +00:00
chencongzhi520@gmail.com 17563eae27 * code for task#1377. 2013-06-18 08:26:45 +00:00
zhujinyong fbfa983537 * code for task#1375. 2013-06-14 06:48:54 +00:00