Commit Graph
6755 Commits
Author SHA1 Message Date
xia0ta0 00f604ec3d * fix table width. 2013-08-06 15:15:41 +08:00
xia0ta0 afa00d0be1 * adjust bug confirm. 2013-08-06 15:13:54 +08:00
wwccss d93b4c7262 * use date for lasteEditedDate field. 2013-08-06 13:09:50 +08:00
azhi fb7fb60ac7 * fix bug: wrong colspan. 2013-08-06 08:51:30 +08:00
azhi 7e891b1056 * code for task#1670. 2013-08-05 17:04:07 +08:00
azhi 980902940c * finish task#1667. 2013-08-05 14:37:36 +08:00
azhi d05f18aa38 * finish task#1666. 2013-08-05 14:10:43 +08:00
azhi 09446e2ea8 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-05 12:36:24 +08:00
azhi c80ef1e1fd * adjust align. 2013-08-05 10:38:30 +08:00
wyd621 69106a374d * change for new version. 2013-08-05 10:22:07 +08:00
wyd621 a77407a7fe Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-05 09:43:36 +08:00
wyd621 5e26222608 * adjust code and fix bug. 2013-08-05 09:43:06 +08:00
xia0ta0 5be7ec6214 * code for task#1581. 2013-08-05 09:23:15 +08:00
xia0ta0 44b2bf5171 * code for task#1581. 2013-08-02 17:20:19 +08:00
xia0ta0 12c494e162 Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-02 15:55:48 +08:00
xia0ta0 1e563f2f3e * code for task#1636. 2013-08-02 15:55:13 +08:00
xia0ta0 9aca54f96f * code for task#1636. 2013-08-02 15:52:26 +08:00
wyd621 fa147203b1 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-02 15:45:09 +08:00
wyd621 1140dbe11f * finish task #1662. 2013-08-02 15:44:40 +08:00
xia0ta0 902f2a428f * code for task#1636. 2013-08-02 15:14:00 +08:00
azhi 6593516075 * code for task#1648. 2013-08-02 15:12:41 +08:00
xia0ta0 96df1dd035 Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-02 14:57:31 +08:00
xia0ta0 df4c2a15c3 * code for task#1620. 2013-08-02 14:56:47 +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 01dd3ac526 * fix bug for waring. 2013-08-02 10:36:34 +08:00
xia0ta0 26a8572bde * fix bug for set flow. 2013-08-02 10:24:03 +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