Commit Graph
12924 Commits
Author SHA1 Message Date
Yagami 39b0115f55 *Fix Bug #4516. 2018-07-11 10:21:05 +08:00
Yagami 2ff2e04f54 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-11 09:36:36 +08:00
Yagami 510559dd99 *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. *Fix bug #4516. 2018-07-11 09:35:24 +08:00
wangyidong 1fff6b7db8 * adjust for bind ranzhi css. 2018-07-11 09:27:07 +08:00
liugang b432ee4598 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 18:20:27 +08:00
liugang f505416eb7 * Adjust sub menu settings. 2018-07-10 18:20:04 +08:00
wangyidong db9eebee67 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-10 17:36:42 +08:00
wangyidong 86f38aa412 * finish task #4633. 2018-07-10 17:36:18 +08:00
daitingting a8f1f63101 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 17:30:07 +08:00
daitingting 5b09738c95 * Adjust ajaxmenu style for hidden dropdown menu. 2018-07-10 17:29:19 +08:00
Yagami 0891061e34 *Finish task #4630. 2018-07-10 16:15:16 +08:00
Yagami 6eadda51af *Finish task #4509. 2018-07-10 15:59:35 +08:00
daitingting 06a1e11532 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 15:43:38 +08:00
daitingting f0958e21e2 * Use can not edit and delete file if he has no rights with file's object, fix bug #1521. 2018-07-10 15:41:56 +08:00
wangyidong f2c54d74e9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-10 15:21:52 +08:00
wangyidong 0655129d4b * finish task #4522. 2018-07-10 15:19:32 +08:00
daitingting d048bfbedc * Add treeTask and treeStory in group. 2018-07-10 15:04:00 +08:00
daitingting cac62ee5cc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 15:00:46 +08:00
daitingting 9387fd1a91 * Adjust codes. 2018-07-10 15:00:23 +08:00
liugang 9b31294f29 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 13:34:59 +08:00
liugang 80a5334c7a * Finish task #4485 2018-07-10 13:34:32 +08:00
wangyidong fb397502f4 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-10 13:23:40 +08:00
wangyidong 919cb90d37 * finish task #4642. 2018-07-10 13:21:57 +08:00
daitingting c4d6d94d61 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 11:24:40 +08:00
daitingting 4398a6f814 * Add link for platform products. 2018-07-10 11:18:33 +08:00
chenfeiCF 74fbd3b784 * Finish task #4599. 2018-07-10 11:17:42 +08:00
chenfeiCF ea7385a3f1 * Adjust min.js file. 2018-07-10 11:09:31 +08:00
wangyidong 659d939484 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-10 10:35:10 +08:00
wangyidong f35a90fc97 * adjust for multi task. 2018-07-10 10:34:12 +08:00
Yagami e664bb9d1b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 10:16:25 +08:00
Yagami 07b21f67e2 *Finish task #4504. 2018-07-10 10:11:50 +08:00
daitingting 5c294a5d0b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-10 10:08:08 +08:00
daitingting 231e3ab334 * Hidden project when flow is onlyTest. 2018-07-10 10:07:37 +08:00
chenfeiCF b01dc1aa72 * Finish task #4640. 2018-07-10 09:07:58 +08:00
wangyidong b8ccab95d7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-10 09:01:59 +08:00
wangyidong b9003fd791 * adjust for task #4529. 2018-07-10 09:00:50 +08:00
Catouse ba130809f1 * finish task #4510 and fix bug #1971. 2018-07-09 18:53:05 +08:00
Catouse 34827d3921 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 18:42:01 +08:00
Catouse 2ea0c5002f * fix chosen usage. 2018-07-09 18:41:53 +08:00
liugang 59149a9f35 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 17:39:52 +08:00
daitingting 9a3ce4325f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 17:32:28 +08:00
daitingting de5866a8cd * Adjust codes. 2018-07-09 17:32:15 +08:00
Catouse 4598117de4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 17:30:10 +08:00
Catouse eddd9caf61 * finish task #4501 and fix bug #1980. 2018-07-09 17:30:02 +08:00
chenfeiCF f3bebb9b84 Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-09 17:17:14 +08:00
chenfeiCF 4ee9e455ea * Code for task 4640. 2018-07-09 17:16:51 +08:00
chenfeiCF 67cc92c812 * Finish task #4544. 2018-07-09 17:16:24 +08:00
daitingting 45b449e475 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 16:54:43 +08:00
Catouse 03f4199ba9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-09 16:52:29 +08:00
Catouse b340c649b7 * fix div close tag. 2018-07-09 16:52:23 +08:00