Commit Graph

276 Commits

Author SHA1 Message Date
wangyidong
65d8752b5e * fix for import case in testsuite. 2018-03-29 15:39:53 +08:00
wangyidong
d35e51a15a * merge new change. 2018-03-13 12:26:20 +08:00
wangyidong
d71d582f3d * adjust code. 2017-12-29 11:25:53 +08:00
滔哥
1de783bf74 * Fix bug 2017-12-15 15:15:08 +08:00
wangyidong
11d80a5d93 * finish task #3442. 2017-12-14 15:29:09 +08:00
wangyidong
5d63380722 * add commonModel::http method. 2017-11-23 16:52:34 +08:00
liugang
90211f67fa * Finish task #3337,3338,3357,3358,3365,3366,3367. 2017-11-09 15:16:22 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
wangyidong
27f93a8e7f * fix upgrade. 2017-11-06 09:52:35 +08:00
liugang
58ad5f6374 * Fix bug. 2017-11-03 17:41:48 +08:00
滔哥
3d0dff1420 * add score auth 2017-10-31 10:03:54 +08:00
滔哥
d9290cbf9b * + score in all model 2017-10-27 11:15:28 +08:00
liugang
c4f435237e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-26 17:55:18 +08:00
liugang
8f6026ca78 + Add api.php as entrance. 2017-10-26 17:54:34 +08:00
滔哥
fc52d683c7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-26 17:26:12 +08:00
滔哥
001057edb0 * + my score log 2017-10-26 17:26:09 +08:00
wangyidong
48024e6cf8 Finish task#3273 操作受限用户无法创建待办和日志,cost:1 left:0 2017-10-25 10:48:31 +08:00
wangyidong
b965b706a8 Finish task#3252 管理员可以将自己的菜单配置作为公共的配置,cost:3 left:0 2017-10-19 14:31:03 +08:00
wangyidong
50460830e2 * adjust for limited user. 2017-09-26 11:08:11 +08:00
pengjiangxiu
41a2fc9a8f * Finish task #3210. 2017-09-19 13:56:39 +08:00
pengjiangxiu
16f87e721d * Finish task #3213. 2017-09-12 14:02:07 +08:00
pengjiangxiu
a1570d6b75 * Finish task #3204. 2017-09-08 14:21:12 +08:00
sgm0422
c81685eaec Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-28 17:06:13 +08:00
sgm0422
cdc0fb9707 *Fix Bug #1207. 2017-08-28 16:53:33 +08:00
wangyidong
49f8f606f6 * fix bug for ajax form. 2017-08-25 16:31:23 +08:00
wangyidong
34b794e39a * fix error. 2017-08-22 13:44:34 +08:00
pengjiangxiu
7f6274c07d * Finish task #1201. 2017-08-18 15:10:07 +08:00
sgm0422
c0a3efe859 * Fix bug: change 'limit' to 'LIMIT'. 2017-08-03 15:09:52 +08:00
wangyidong
c27f1f7d34 * merge zentaophp to zentao. 2017-06-09 17:05:37 +08:00
wangyidong
954539c4c8 * adjust for safe. 2017-05-15 16:22:43 +08:00
daitingting
954a16cd15 * Revert loadConfigFromDB function. 2017-05-15 11:30:24 +08:00
daitingting
8624ceb224 * Adjust codes for test working. 2017-05-08 15:08:42 +08:00
daitingting
ce174f973c * Set as working as only test. 2017-05-05 12:09:19 +08:00
daitingting
2e5e8ec5a4 * Set working.
* Set as only task.
 * Set as only story.
2017-05-03 17:35:37 +08:00
wangyidong
5b39baaade * adjust for print mobile order link. 2017-04-18 10:13:03 +08:00
wangyidong
0f1d1dd275 * change for web. 2017-04-05 09:51:33 +08:00
chenfeiCF
e7bad1c238 * adjust code for code refactoring of mobile web. 2017-03-28 16:19:35 +08:00
wangyidong
2eb5ee260a * adjust judgeSuhosinSetting method to static. 2017-03-22 14:12:26 +08:00
wangyidong
dc812fd161 * adjust code. 2017-03-21 15:06:38 +08:00
wangyidong
c8d822e454 * rewrite convert pinyin. 2017-03-20 16:32:02 +08:00
wangyidong
e61a36a9e0 * change lang. 2017-03-17 09:34:32 +08:00
wangyidong
90c70d3373 * adjust for link case in testtask. 2017-03-16 09:44:55 +08:00
wangyidong
0416eed289 * set admin in login. 2017-03-15 16:43:58 +08:00
wangyidong
eaeab89f53 * finish task #2927. 2017-03-10 11:59:01 +08:00
wangyidong
429ab3b494 * finish task #2941. 2017-03-10 10:24:31 +08:00
wangyidong
2926039122 * finish task #2862. 2017-01-11 14:12:00 +08:00
Catouse
a87d63949a * replace QR code image source with a empty image, see http://www.zentao.net/thread/86777.html. 2016-12-20 09:27:55 +08:00
wangyidong
921ff77303 * adjust isOpenMethod. 2016-12-02 09:06:28 +08:00
wangyidong
3baf0ab280 * finish task #2703. 2016-11-28 16:27:39 +08:00
wangyidong
7ac6afe616 * finish task #2719,2729. 2016-11-25 15:32:28 +08:00