Commit Graph
5338 Commits
Author SHA1 Message Date
azhi c80ef1e1fd * adjust align. 2013-08-05 10:38:30 +08:00
azhi 62fae468b0 * code for task#1648. 2013-08-02 15:18:32 +08:00
azhi 6593516075 * code for task#1648. 2013-08-02 15:12:41 +08:00
azhi f9a6f9a276 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-02 10:42:58 +08:00
azhi 472ad802ad * code for task#1648. 2013-08-02 10:42:16 +08:00
wyd621 dafd297f6a Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-02 10:17:34 +08:00
wyd621 3d0e2ba9c6 * fix a bug for set flow to full. 2013-08-02 10:17:06 +08:00
azhi 16ff3a0c12 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-02 10:15:38 +08:00
wyd621 767c135303 * fix bug for waring. 2013-08-02 10:15:02 +08:00
azhi 79dfd7851b * code for task#1648.
* add dropmenu to common/view jquery/dropmenu.
2013-08-02 10:13:49 +08:00
xia0ta0 87a7c2b9a5 * code for task#1622. 2013-08-02 10:10:45 +08:00
xia0ta0 a215237c50 Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-02 09:57:34 +08:00
xia0ta0 9d2679c05c * code for task#1654. 2013-08-02 09:57:04 +08:00
xia0ta0 175c5982c6 * code for task#1654. 2013-08-02 09:52:58 +08:00
xia0ta0 f91ebb211a * code for task#1654. 2013-08-02 09:33:15 +08:00
xia0ta0 2e338cd1eb * code for task#1665. 2013-08-02 08:58:37 +08:00
xia0ta0 d346820f65 * code for task#1665. 2013-08-02 08:58:02 +08:00
xia0ta0 c97dd391ac * code for task#1665. 2013-08-02 08:57:23 +08:00
azhi 42827590d1 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-02 08:51:13 +08:00
azhi ce08eaed8d * adjust the placeholder of chosen. 2013-08-02 08:50:36 +08:00
wyd621 48ba3c94c6 * adjust code for task #1660. 2013-08-02 08:45:29 +08:00
wyd621 40f30c489a * adjust code for task #1626. 2013-08-02 08:42:51 +08:00
wyd621 0a3be4a998 * fix a bug for error encode when import csv. 2013-08-02 08:26:27 +08:00
xia0ta0 7ed9556bda Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-02 08:19:20 +08:00
xia0ta0 858d1b3d7f * code for task#1665. 2013-08-02 08:18:14 +08:00
xia0ta0 cb8f96a348 * code for task#1665. 2013-08-02 08:16:30 +08:00
azhi ad54b16e64 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-01 16:53:10 +08:00
azhi 68682101b5 * finish task#1645. 2013-08-01 16:52:24 +08:00
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 17ee8cdabd * code for task#1659. 2013-08-01 13:53:57 +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