Commit Graph
6755 Commits
Author SHA1 Message Date
xia0ta0 ec53587f8c * fix bug : ajdust module related. 2013-08-01 16:50:08 +08:00
xia0ta0 cb6efc8eb3 * fix bug : ajdust module related. 2013-08-01 16:39:48 +08:00
xia0ta0 8ffd00eca6 * fix a bug : merge ajaxGetPlans function. 2013-08-01 15:15:52 +08:00
xia0ta0 a8de10fa94 * fix a bug : merge ajaxGetPlans function. 2013-08-01 15:14:18 +08:00
xia0ta0 842ba1cf4a * fix a bug : planID is undefined in create page. 2013-08-01 15:08:05 +08:00
xia0ta0 1de3a97b32 * code for task#1621. 2013-08-01 14:48:12 +08:00
xia0ta0 2ad98630b9 * code for task#1639. 2013-08-01 14:37:25 +08:00
xia0ta0 1a46c87363 Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-01 14:34:44 +08:00
xia0ta0 73daf4dc85 * code for task#1639. 2013-08-01 14:33:39 +08:00
xia0ta0 6612defc02 * code for task#1629. 2013-08-01 14:14:17 +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 8af0c01948 * code for task#1631. 2013-08-01 11:33:58 +08:00
xia0ta0 984e5efadb * code for task#1630. 2013-08-01 11:28:25 +08:00
xia0ta0 75e02e86cf * code for task#1657. 2013-08-01 11:14:30 +08:00
xia0ta0 a4964c6e01 * code for task#1657. 2013-08-01 11:12:02 +08:00
xia0ta0 40ea8cf4c1 * code for task#1657. 2013-08-01 11:09:58 +08:00
xia0ta0 affd044bb3 * code for task#1657. 2013-08-01 11:07:00 +08:00
xia0ta0 4d19ea6f10 * code for task#1657. 2013-08-01 10:57:12 +08:00
xia0ta0 2de48dceda * code for task#1657. 2013-08-01 10:53:33 +08:00
xia0ta0 49bc364c61 * code for task#1657. 2013-08-01 10:51:35 +08:00
xia0ta0 01be295d5a * code for task#1657. 2013-08-01 10:48:36 +08:00
xia0ta0 b6b4010892 * code for task#1657. 2013-08-01 10:44:08 +08:00
xia0ta0 d68ffad251 * code for task#1657. 2013-08-01 10:17:36 +08:00
xia0ta0 7a2df7dfcc * code for task#1657. 2013-08-01 10:16:40 +08:00
xia0ta0 5f6f9cae7d * code for task#1657. 2013-08-01 10:16:08 +08:00
xia0ta0 5115b5c7b2 * code for task#1657. 2013-08-01 10:14:56 +08:00
xia0ta0 9dc6bc2894 * code for task#1657. 2013-08-01 09:24:13 +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
wyd621 e259c31486 * finish task #1623. 2013-08-01 00:27:04 +08:00
xia0ta0 27d0d2b8ff * code for task#1657. 2013-07-31 17:50:52 +08:00
xia0ta0 ef15e5fdc6 * code for task#1657. 2013-07-31 17:48:07 +08:00
xia0ta0 1326035c57 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-31 17:42:32 +08:00
xia0ta0 4e787181d7 * code for task#1657. 2013-07-31 17:42:11 +08:00
xia0ta0 d4903c510a * code for task#1657. 2013-07-31 17:35:10 +08:00
xia0ta0 8fb44b81e3 * code for task#1657. 2013-07-31 17:33:04 +08:00
xia0ta0 f37afec4bb * code for task#1657. 2013-07-31 17:28:03 +08:00
xia0ta0 3053c2d248 * code for task#1657. 2013-07-31 17:07:51 +08:00
wyd621 49731b97ff Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-31 16:51:11 +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
xia0ta0 d2874f11f5 * code for task#1657. 2013-07-31 16:45:25 +08:00
azhi 4b28ede49a * finish task#1659.
* finish task#1661.
2013-07-31 16:38:11 +08:00
xia0ta0 51284d16aa * code for task#1657. 2013-07-31 16:37:59 +08:00
wyd621 4cc4158bdc * finish task #1617. 2013-07-31 16:35:40 +08:00
xia0ta0 e29bad9f08 * code for task#1657. 2013-07-31 15:59:31 +08:00
wyd621 92d6af50e3 * finish task #1618. 2013-07-31 15:50:45 +08:00
wyd621 e6c660af1b * finish task #1637. 2013-07-31 15:39:15 +08:00
wyd621 9fa49f4918 * adjust for link product use chosen. 2013-07-31 15:36:48 +08:00
xia0ta0 65b1d1b359 * code for task#1657. 2013-07-31 14:37:25 +08:00
azhi 9eb1223a8a * fix bug: correct validRate tips. 2013-07-31 14:23:37 +08:00