Commit Graph
5144 Commits
Author SHA1 Message Date
xia0ta0 bf33420c03 * code for task#1598. 2013-07-25 09:09:36 +08:00
xia0ta0 2d4a058478 * inLink has been changed to static function. 2013-07-24 15:37:07 +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
wyd621 3b01727bfe Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-23 17:07:29 +08:00
xia0ta0 aaec07eeca * code for task#1588. 2013-07-23 16:48:36 +08:00
wyd621 abad7c0939 * finish task #1595. 2013-07-23 16:46:36 +08:00
xia0ta0 f96a210385 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-23 16:45:01 +08:00
xia0ta0 b56e48890f * code for task#1592. 2013-07-23 16:40:59 +08:00
azhi 24d9c60deb Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-23 16:05:00 +08:00
azhi 2a9ba9fa98 * finish task#1599. 2013-07-23 16:04:01 +08:00
wyd621 fd4a36dc8c * finish task #1601. 2013-07-23 15:49:47 +08:00
wwccss 0cf27bc552 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-23 15:30:56 +08:00
wwccss 4249737b43 * upgrade wamp to the latest version. 2013-07-23 15:29:37 +08:00
wyd621 3e40581431 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-23 14:52:19 +08:00
wyd621 be31e48b7f * finish task #1600. 2013-07-23 14:50:08 +08:00
wwccss cdd474531b * upgrade the build program for zentaowamp. 2013-07-23 13:07:15 +08:00
wyd621 692fc5f9f4 * fix a bug for import icon. 2013-07-23 10:45:18 +08:00
wyd621 169626cc18 * finish task #1608. 2013-07-23 10:43:17 +08:00
wyd621 9469cb457d * finish task #1593. 2013-07-23 08:41:28 +08:00
wwccss 79374d1188 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-22 17:11:42 +08:00
wwccss 7009656f06 * change app->error to app->triggerError(). 2013-07-22 17:07:49 +08:00
xia0ta0 0e8c1ffe05 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-22 16:19:42 +08:00
xia0ta0 01f65195c3 * code for task#1552. 2013-07-22 16:18:27 +08:00
wwccss 2c3cb25107 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-22 15:50:22 +08:00
wwccss 7a2dcb0a31 * use app->triggerError(). 2013-07-22 15:45:17 +08:00
wwccss 77ffe65ec6 * adjust ignore. 2013-07-22 15:44:56 +08:00
azhi 20db39e034 * code for task#1612. 2013-07-22 15:42:04 +08:00
azhi ee593816d9 * code for task#1609. 2013-07-22 15:39:27 +08:00
wyd621 68608781c8 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-22 15:32:29 +08:00
azhi f02fec4cc2 * finish task#1612. 2013-07-22 15:29:34 +08:00
wyd621 d1c69f8217 * finish task #1586. 2013-07-22 15:25:09 +08:00
azhi 1e06b1b5f5 * finish task#1605. 2013-07-22 15:15:50 +08:00
azhi 6fa5deb13a * finish task#1609. 2013-07-22 14:46:47 +08:00
azhi f422ad7bb6 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-22 14:25:51 +08:00
azhi 9f8927de0c * finish task#1594. 2013-07-22 14:24:56 +08:00
wyd621 995d7a3088 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-22 14:17:48 +08:00