Commit Graph
3996 Commits
Author SHA1 Message Date
xia0ta0 29673c244a * code for task#1598. 2013-07-29 15:59:37 +08:00
xia0ta0 09e8e02236 * code for task#1587. 2013-07-29 15:57:15 +08:00
xia0ta0 6258e8e6df Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-29 15:10:50 +08:00
xia0ta0 8734221200 * code for task#1589. 2013-07-29 15:10:06 +08:00
wyd621 779b0d9bad * add lastRunResult lang. 2013-07-29 15:08:26 +08:00
wyd621 f7119600f5 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-29 14:57:52 +08:00
wyd621 fa8937eff4 * fix the error of pcre.backtrack_limit for preg_match. 2013-07-29 14:56:38 +08:00
azhi 3e1a529e6d * code for task#1599. 2013-07-29 14:42:45 +08:00
xia0ta0 b4d7729478 * code for task#1589. 2013-07-29 14:31:18 +08:00
xia0ta0 252b1d98d7 * code for task#1598. 2013-07-29 14:30:36 +08:00
xia0ta0 cbb533f0b8 * code for task#1598. 2013-07-29 14:20:59 +08:00
azhi d1e150b5dd * code for task#1614. 2013-07-29 14:15:58 +08:00
azhi f7c5fdcc41 * add server tablesorter for productplan list.
*  code for task#1609.
2013-07-29 14:07:35 +08:00
wyd621 fb1b8520a3 * fix app->error to app->triggerError. 2013-07-29 14:05:29 +08:00
wyd621 90966238f5 * remove deleted case. 2013-07-29 14:04:09 +08:00
wyd621 e372173a70 * change for upgrade. 2013-07-29 14:03:31 +08:00
xia0ta0 43d88caed4 * code for task#1589. 2013-07-29 13:54:38 +08:00
azhi be00ccf5d5 * code for task#1602. 2013-07-29 13:41:50 +08:00
azhi 5f07d2072d Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-29 13:24:47 +08:00
azhi 3b9a69ee6c * code for task#1594. 2013-07-29 13:23:41 +08:00
wyd621 882a119c7c * code for task #1607. 2013-07-26 12:41:10 +08:00
wyd621 e20ef0e1c0 * code for task #1607. 2013-07-26 09:57:19 +08:00
wyd621 fa39edb4bc * finish task #1607. 2013-07-25 17:05:46 +08:00
wyd621 f700350e83 * code for task #1591. 2013-07-25 15:21:04 +08:00
wyd621 778c835bbc Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-25 13:47:32 +08:00
wyd621 4c3ebc9cc7 * finish task #1591 1590. 2013-07-25 13:46:02 +08:00
xia0ta0 507863a09d * fix a bug in task#1592. 2013-07-25 10:31:17 +08:00
xia0ta0 91fd958016 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-25 10:04:13 +08:00
xia0ta0 625831b766 * code for task#1613. 2013-07-25 10:03:27 +08:00
xia0ta0 bf33420c03 * code for task#1598. 2013-07-25 09:09:36 +08:00
azhi bcd14731a3 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-24 16:04:25 +08:00
azhi c5e604816d * finish task#1441. 2013-07-24 16:03:15 +08:00
xia0ta0 2d4a058478 * inLink has been changed to static function. 2013-07-24 15:37:07 +08:00
azhi 44be4dc462 * code for task#1604. 2013-07-24 15:21:04 +08:00
azhi a87d5832e2 * finish task#1604. 2013-07-24 15:15:44 +08:00
xia0ta0 edbced0619 * fix a bug. 2013-07-24 15:04:49 +08:00
xia0ta0 4206d6b89e * code for task#1589. 2013-07-24 15:02:02 +08:00
xia0ta0 85fd31912a * fix a bug: inlink, not $this->inlink. 2013-07-24 14:48:57 +08:00
xia0ta0 a249068a58 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-24 14:44:41 +08:00
xia0ta0 f543d606f1 * fix a bug : printRPN is a static method. 2013-07-24 14:43:35 +08:00
azhi a3a214318c * finish task#1602. 2013-07-24 14:41:02 +08:00
xia0ta0 75eafe41d9 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-24 14:20:53 +08:00
xia0ta0 0e16e462b5 * code for task#1589. 2013-07-24 14:19:24 +08:00
xia0ta0 0d1a23a526 * code for task#1589. 2013-07-24 14:16:23 +08:00
azhi 3ba16ae13a Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-24 14:06:20 +08:00
azhi 901d6f326d * finish task#1614. 2013-07-24 14:05:30 +08:00
xia0ta0 d6db1adbbd Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-24 10:53:19 +08:00
xia0ta0 ac1b8095b2 * compatible with that of model::delete(). 2013-07-24 10:50:11 +08:00
xia0ta0 922c7edf3f * compatible with that of model::delete(). 2013-07-24 10:49:34 +08:00
xia0ta0 ce358e310c * compatible with that of model::delete(). 2013-07-24 10:48:14 +08:00