Commit Graph
3921 Commits
Author SHA1 Message Date
wyd621 4063cbad13 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-22 08:40:41 +08:00
xia0ta0 78b1ffdfa0 * code for task#1580. 2013-07-21 21:00:06 +08:00
xia0ta0 cbe4afe436 * code for task#1552. 2013-07-19 16:35:05 +08:00
xia0ta0 1067e55ad3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2013-07-19 14:42:25 +08:00
xia0ta0 6954ee9d89 * code for task#1580. 2013-07-19 14:40:51 +08:00
xia0ta0 36a90cd70d * code for task#1580. 2013-07-19 14:38:26 +08:00
xia0ta0 d8676d680b * code for task#1580. 2013-07-19 14:16:51 +08:00
wyd621 042df2c813 * finish task #1577. 2013-07-19 14:02:48 +08:00
wyd621 307eb8832a * finish task #1463. 2013-07-19 09:13:37 +08:00
wyd621 c0e50a82cd * fix a bug for change pms. 2013-07-19 08:22:21 +08:00
wyd621 aae95743f9 * finish task #1571. 2013-07-18 16:48:06 +08:00
wyd621 67fd654b2e * code for task #1579. 2013-07-18 14:52:01 +08:00
wyd621 87b50d246e Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-18 14:19:21 +08:00
wyd621 e521a8fef3 * finish task #1579. 2013-07-18 14:17:45 +08:00
wyd621 012b5381ba * finish task #1578. 2013-07-18 14:17:06 +08:00
wyd621 337eadde8e * adjust code. 2013-07-18 14:16:37 +08:00
wwccss 1be7953bd0 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-18 13:16:34 +08:00
azhi 9cb8bad9fb * code for task#1513. 2013-07-18 09:53:58 +08:00
wwccss bba40c0072 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-18 09:18:06 +08:00
wwccss c20261cb20 * init ext directory again. 2013-07-18 09:17:31 +08:00
wyd621 4038b40e74 * finish task #1576. 2013-07-18 08:30:14 +08:00
wwccss e4405b929e * remove E_STRICT errors. 2013-07-17 20:13:46 +08:00
wwccss bf8b7ae75b * finish task#1495. 2013-07-17 16:12:00 +08:00
xia0ta0 1db57d442b Merge branch 'master' of https://github.com/easysoft/zentaopms 2013-07-17 14:00:37 +08:00
xia0ta0 0b3d0552ae + add open sso module. 2013-07-17 13:59:41 +08:00
xia0ta0 4b2adf55d8 + add sso module. 2013-07-17 13:54:21 +08:00
wyd621 c920eeb60f * finish task #1575. 2013-07-17 11:05:28 +08:00
wyd621 d31842a4c8 * revert right config. 2013-07-17 10:16:04 +08:00
wyd621 ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
wyd621 1aa58c8895 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-17 10:04:22 +08:00
wyd621 890ca7d02f * adjust for pager from api. 2013-07-17 09:44:56 +08:00
azhi 917209abbb * code for task#1513. 2013-07-17 09:44:27 +08:00
wyd621 09a9872a14 * finish task #1573. 2013-07-17 09:41:40 +08:00
azhi c9d3e38653 * adjust the menu of web app. 2013-07-17 09:41:11 +08:00
wyd621 648c28140d * finish task #1568. 2013-07-17 09:40:41 +08:00
wyd621 1be844dbea * finish task #1569. 2013-07-17 09:39:29 +08:00
azhi 6c92b0ec48 * finish task#1439. 2013-07-17 09:12:04 +08:00
xia0ta0 2a3c6b09c3 * fix comment. 2013-07-17 08:31:29 +08:00
wangyidong 443dabf7ed * finish task #1567 2013-07-16 04:07:21 +00:00
chencongzhi520@gmail.com b0056f8e82 * finish task#1574. 2013-07-16 02:01:43 +00:00
wangyidong 2baf6f43f5 * finish task #1566. 2013-07-16 01:47:14 +00:00
zhujinyong a0dafb6d5a * code for task#1582. 2013-07-16 01:47:01 +00:00
chencongzhi520@gmail.com 2bd6e5375e * finish task#1572. 2013-07-16 01:31:08 +00:00
chencongzhi520@gmail.com 5c29ce162a * code for task#1534. 2013-07-15 08:43:26 +00:00
chencongzhi520@gmail.com 348e0577c8 * finish task#1516. 2013-07-15 06:47:26 +00:00
chencongzhi520@gmail.com 04b22c74f9 * finish task#1514. 2013-07-15 06:37:03 +00:00
zhujinyong a6c59896b8 * code for task#1541. 2013-07-15 06:11:59 +00:00
zhujinyong 7896522db1 * code for task#1541. 2013-07-15 06:10:50 +00:00
chencongzhi520@gmail.com c6e732626c * finish task#1515. 2013-07-15 05:57:15 +00:00
zhujinyong bfd533aa29 * code for task#1541. 2013-07-15 03:43:25 +00:00