Commit Graph

8179 Commits

Author SHA1 Message Date
滔哥
e294367e46 * Fix tutorial bug 2017-11-06 17:49:12 +08:00
滔哥
35a179f00f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-06 17:23:46 +08:00
滔哥
e2f04471ce * Fix tutorial bug 2017-11-06 17:23:39 +08:00
wangyidong
7293086b45 * fix for required. 2017-11-06 16:57:13 +08:00
wangyidong
93f8539803 * fix search width. 2017-11-06 10:56:41 +08:00
wangyidong
f44dba62b1 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-06 10:40:12 +08:00
wangyidong
dc046c4ff5 * adjust for doc priv. 2017-11-06 10:39:28 +08:00
滔哥
db2a8b4a84 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-06 10:26:54 +08:00
滔哥
d2dcabfbc0 * Fix score date 2017-11-06 10:26:45 +08:00
liugang
6dc6d6126f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-06 10:18:17 +08:00
liugang
130f1f1b33 * Make tmp dir when execute makefile. 2017-11-06 10:17:26 +08:00
wangyidong
0f1f1df14b Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-06 10:13:38 +08:00
wangyidong
fbc5b38585 * change for zh-tw lang. 2017-11-06 10:13:16 +08:00
滔哥
7792da815f * fix score title 2017-11-06 10:07:38 +08:00
滔哥
57dbab5a14 * fix score bug 2017-11-06 10:05:45 +08:00
滔哥
c495dac642 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-06 10:03:24 +08:00
滔哥
298e2b6616 * fix score rule title 2017-11-06 10:03:17 +08:00
wangyidong
27f93a8e7f * fix upgrade. 2017-11-06 09:52:35 +08:00
liugang
22eb945187 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-03 17:42:11 +08:00
liugang
58ad5f6374 * Fix bug. 2017-11-03 17:41:48 +08:00
滔哥
0a56094b1c Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-03 16:28:24 +08:00
滔哥
8dc523cdf3 * fix task bug 2017-11-03 16:28:15 +08:00
wangyidong
a260408929 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-03 16:16:34 +08:00
wangyidong
07d043a0a1 Finish task#3286 看板更多操作在火狐下的边框去掉,cost:0.5 left:0 2017-11-03 16:14:44 +08:00
wangyidong
a10e725ba5 Finish task#3311 普通表格太宽时不要滚动整个页面,cost:2 left:0 2017-11-03 16:02:15 +08:00
滔哥
1e94998fb5 * score rule add btn 2017-11-03 16:00:24 +08:00
滔哥
2feb6fc2a9 * score rule add btn 2017-11-03 15:59:51 +08:00
liugang
03279991cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-03 15:45:30 +08:00
wangyidong
3f30bfacf8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-03 15:26:09 +08:00
wangyidong
37538538fa * fix bug for browse testtask. 2017-11-03 15:25:45 +08:00
滔哥
0a1b0abe87 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-03 14:59:25 +08:00
滔哥
58be8d10a8 * fix score rule title 2017-11-03 14:59:16 +08:00
liugang
52d9ff63e3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-03 14:44:16 +08:00
liugang
7a2487d656 * Upgrade from version 9.5.1. 2017-11-03 14:43:46 +08:00
wangyidong
1ad2a03511 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-03 14:18:21 +08:00
wangyidong
ef1291a06c * fix error. 2017-11-03 14:17:58 +08:00
滔哥
1460031cbb * fix tutorial score 2017-11-03 14:09:51 +08:00
滔哥
946c799bbc Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-03 13:36:10 +08:00
滔哥
b5a3b6d415 * fix score lang 2017-11-03 13:35:55 +08:00
wangyidong
5a851c7830 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-03 13:22:52 +08:00
wangyidong
38073d2ad7 * finish task #3310. 2017-11-03 13:22:27 +08:00
滔哥
ad8a305f0d * fix score lang 2017-11-03 13:07:29 +08:00
滔哥
b21aff7bc1 * fix task 2017-11-03 13:03:05 +08:00
滔哥
254cc9a5ef * fix remove score chinese 2017-11-03 00:30:58 +08:00
滔哥
0f3189d9e8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-03 00:28:03 +08:00
滔哥
0dc610f36b * fix score and child task bug 2017-11-03 00:27:58 +08:00
liugang
c5c3f585c4 * Finish task #3303. 2017-11-02 17:38:11 +08:00
liugang
4045697d0a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-02 17:27:55 +08:00
liugang
1485cad751 * Don't display parent when edit a product line.
* Don't display child page when browse a product line.
2017-11-02 17:27:05 +08:00
wangyidong
ea349fa5aa Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-02 16:56:11 +08:00