Commit Graph
5257 Commits
Author SHA1 Message Date
azhi 15749a6767 * code for task#1559. 2013-07-31 16:56:24 +08:00
azhi b9d2a319cc Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:

	module/project/view/task.html.php
	module/testcase/view/browse.html.php
2013-07-31 16:50:09 +08:00
azhi 4b28ede49a * finish task#1659.
* finish task#1661.
2013-07-31 16:38:11 +08:00
wyd621 e6c660af1b * finish task #1637. 2013-07-31 15:39:15 +08:00
wyd621 b970dcc33a * adjust for git. 2013-07-31 15:37:36 +08:00
wyd621 9fa49f4918 * adjust for link product use chosen. 2013-07-31 15:36:48 +08:00
azhi 9eb1223a8a * fix bug: correct validRate tips. 2013-07-31 14:23:37 +08:00
azhi 6ccf1be34b * fix bug: validRate must including closed bugs. 2013-07-31 14:16:18 +08:00
wyd621 caaae95b71 * finish task #1615. 2013-07-31 13:35:30 +08:00
wyd621 d460fad520 Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:

	module/my/view/todo.html.php
	module/my/view/todolist.html.php
2013-07-31 11:07:27 +08:00
wyd621 52df5c7003 * adjust setModal4List. 2013-07-31 10:49:27 +08:00
xia0ta0 8a7f3b5bcd * code for task#1657. 2013-07-31 10:29:00 +08:00
xia0ta0 44376ef1d1 * code for task#1657. 2013-07-31 10:28:37 +08:00
xia0ta0 00586a2b39 * code for task#1657. 2013-07-31 10:13:35 +08:00
xia0ta0 60efdc5174 * code for task#1657. 2013-07-31 09:40:02 +08:00
xia0ta0 bad90b1df3 * code for task#1657. 2013-07-31 09:00:40 +08:00
wyd621 5254926952 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-31 08:28:35 +08:00
wyd621 22de2ae12e * finish task #1616. 2013-07-30 17:10:45 +08:00
xia0ta0 29331ccb93 * code for task#1657. 2013-07-30 17:00:35 +08:00
xia0ta0 12b6de8187 * code for task#1657. 2013-07-30 16:59:38 +08:00
xia0ta0 bb0dac2191 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-30 16:37:40 +08:00
xia0ta0 aad33ebc2a * code for task#1657. 2013-07-30 16:35:27 +08:00
xia0ta0 32ee5bc346 * code for task#1657. 2013-07-30 16:34:41 +08:00
xia0ta0 c8e274ce03 * code for task#1657. 2013-07-30 16:33:27 +08:00
wyd621 88913cad8c Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-30 16:24:34 +08:00
wyd621 6191995428 * finish task #1626. 2013-07-30 16:23:32 +08:00
azhi 805927c500 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-30 16:22:09 +08:00
azhi 736f01df7b * finish task#1644. 2013-07-30 16:21:21 +08:00
xia0ta0 5e00f938e6 * code for task#1657. 2013-07-30 16:10:28 +08:00
xia0ta0 67df14b2f1 * code for task#1657. 2013-07-30 15:26:08 +08:00
wyd621 de0a6190a9 * finish task #1638. 2013-07-30 15:26:05 +08:00
wyd621 3a4e56ced5 * finish task #1641. 2013-07-30 15:13:41 +08:00
xia0ta0 fb2200d6b0 * code for task#1657. 2013-07-30 14:54:02 +08:00
xia0ta0 8f6c964b1a * code for task#1657. 2013-07-30 14:46:42 +08:00
wyd621 1a7d780ad5 * finish task #1650. 2013-07-30 14:02:51 +08:00
wyd621 d47e601cf9 * fix a bug. 2013-07-30 13:38:26 +08:00
xia0ta0 ff72b0462a Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-30 11:09:00 +08:00
xia0ta0 5709bd9b74 * code for task#1657. 2013-07-30 10:45:06 +08:00
wyd621 60d4a104a0 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-30 10:12:54 +08:00
wyd621 dd36fdd3a4 * finish task #1660. 2013-07-30 10:11:41 +08:00
azhi c998424270 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-30 09:50:40 +08:00
azhi 0d1188f737 * finish task#1649. 2013-07-30 09:49:58 +08:00
wyd621 6ff5e9aa1b Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-30 09:29:24 +08:00
azhi d49e026924 * code for task#1609. 2013-07-30 09:24:14 +08:00
wyd621 dc260d66f5 * finish task #1664. 2013-07-30 09:21:24 +08:00
azhi 7e618f3d91 * finish task#1625.
* finish task#1627.
2013-07-30 09:04:35 +08:00
azhi 9b13771253 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-30 08:40:02 +08:00
azhi 3bdb4f6cba * code for task#1514. 2013-07-30 08:39:33 +08:00
wyd621 609fb57c65 * fix a bug for no csv header. 2013-07-30 08:18:16 +08:00
wyd621 9ad07920aa Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-30 08:15:29 +08:00