Commit Graph
652 Commits
Author SHA1 Message Date
xia0ta0 bb0dac2191 Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-30 16:37:40 +08:00
azhi 736f01df7b * finish task#1644. 2013-07-30 16:21:21 +08:00
xia0ta0 8f6c964b1a * code for task#1657. 2013-07-30 14:46:42 +08:00
wyd621 dc260d66f5 * finish task #1664. 2013-07-30 09:21:24 +08:00
wyd621 2fb8262d78 * change for import csv. 2013-07-30 08:13:58 +08:00
wyd621 35cbd8aa6e * add resloveBy for build. 2013-07-29 16:31:48 +08:00
azhi a31c2efbf1 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-29 15:42:34 +08:00
azhi f9523e7a39 * add ajaxgetdropmenu of product/project priv for guest account. 2013-07-29 15:41:34 +08:00
wyd621 fa8937eff4 * fix the error of pcre.backtrack_limit for preg_match. 2013-07-29 14:56:38 +08:00
wyd621 fb1b8520a3 * fix app->error to app->triggerError. 2013-07-29 14:05:29 +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
xia0ta0 2d4a058478 * inLink has been changed to static function. 2013-07-24 15:37:07 +08:00
xia0ta0 85fd31912a * fix a bug: inlink, not $this->inlink. 2013-07-24 14:48:57 +08:00
xia0ta0 f543d606f1 * fix a bug : printRPN is a static method. 2013-07-24 14:43:35 +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 be31e48b7f * finish task #1600. 2013-07-23 14:50:08 +08:00
xia0ta0 78b1ffdfa0 * code for task#1580. 2013-07-21 21:00:06 +08:00
xia0ta0 1067e55ad3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2013-07-19 14:42:25 +08:00
xia0ta0 d8676d680b * code for task#1580. 2013-07-19 14:16:51 +08:00
wyd621 c0e50a82cd * fix a bug for change pms. 2013-07-19 08:22:21 +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
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
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
wyd621 ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
azhi c9d3e38653 * adjust the menu of web app. 2013-07-17 09:41:11 +08:00
zhujinyong a0dafb6d5a * code for task#1582. 2013-07-16 01:47:01 +00:00
chencongzhi520@gmail.com 44d6401495 * finish task#1563. 2013-07-13 08:59:49 +00:00
chencongzhi520@gmail.com 40dc579bb6 * finish task#1558. 2013-07-12 06:37:48 +00:00
chencongzhi520@gmail.com 1b782cfe21 * finish task#1561. 2013-07-12 06:02:59 +00:00
wangyidong 048b0d7713 * fix a bug for the content of kindeditor is none in post by jquery form. 2013-07-12 05:43:40 +00:00
chencongzhi520@gmail.com d4818f9ea1 * finish task#1560. 2013-07-12 02:51:33 +00:00
wangyidong 1233dee29e * finish task #1519. 2013-07-12 02:15:36 +00:00
chencongzhi520@gmail.com 12827cbdde * finish task#1557. 2013-07-12 01:46:12 +00:00
chencongzhi520@gmail.com 82dc204a37 * finish task#1556. 2013-07-12 00:44:27 +00:00
wangyidong c67514b98c * finish task #1509. 2013-07-10 03:30:10 +00:00
wangyidong c2c80613a9 * finish task #1518. 2013-07-10 02:25:22 +00:00
wangyidong 2dd095e4e2 * finish task #1525. 2013-07-10 00:46:59 +00:00
wangyidong fd66566d50 * change for zh-tw lang. 2013-07-08 00:27:56 +00:00
wangyidong e834636be9 * select all.js and css by debug. 2013-07-06 08:29:33 +00:00
chencongzhi520@gmail.com 60250e6b1d * adjust the border-bottom of navBar. 2013-07-06 07:54:03 +00:00