Commit Graph
10919 Commits
Author SHA1 Message Date
Yagami dcce714fdc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 10:41:04 +08:00
Yagami 586a9265ac * Finish task #4713. 2018-09-12 10:40:47 +08:00
wangyidong 4eccc84fbf Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 10:25:13 +08:00
wangyidong d82e59ead9 * finish task #4706. 2018-09-12 10:24:12 +08:00
Yagami 451a2f3e41 * Fix common lang. 2018-09-12 09:46:07 +08:00
Yagami 8373b4649d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 09:45:03 +08:00
Yagami a6f4cb1227 * Finish task #4694,#4693. 2018-09-12 09:43:11 +08:00
wangyidong c4e473df14 * finish task #4712. 2018-09-12 09:32:24 +08:00
wangyidong 8c5a015c6c Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-12 09:28:28 +08:00
wangyidong 7883005c1f * finish task #4737. 2018-09-12 09:28:02 +08:00
Yagami 694c2976e6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-12 09:13:57 +08:00
Yagami 8a4cf98a21 * Finish task #4692. 2018-09-12 09:13:28 +08:00
滔哥 83b6c68be4 * Finish task#4660 2018-09-11 17:43:46 +08:00
滔哥 52b22fa382 * Finished task#4658 2018-09-11 17:14:21 +08:00
滔哥 841de31266 * Fix bug for php7.2 2018-09-11 17:08:03 +08:00
滔哥 59c66f81c4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-11 16:45:18 +08:00
滔哥 2e908786f3 * Finished Task#4805. 2018-09-11 16:44:45 +08:00
wangyidong 33e48bb6a5 * finish task #4707. 2018-09-11 16:42:32 +08:00
滔哥 569a18aae5 * Fix bug. 2018-09-11 16:36:05 +08:00
wangyidong 30239402f5 * finish task #4697. 2018-09-11 15:53:20 +08:00
wangyidong 37204773e4 * finish task #4708. 2018-09-11 15:38:36 +08:00
wangyidong 5c3bc3023d Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-11 15:36:48 +08:00
wangyidong 5edd76800f * finish task #4719. 2018-09-11 15:36:21 +08:00
Yagami be25ee3bd3 * Finish task #4717. 2018-09-11 15:33:07 +08:00
Yagami 60111262d3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-11 15:22:39 +08:00
Yagami c62eecae78 * Finish task #4732. 2018-09-11 15:22:20 +08:00
wangyidong 1282563671 * finish task #4748. 2018-09-11 15:11:12 +08:00
wangyidong 26c8269c7b * finish task #4705. 2018-09-11 14:59:10 +08:00
wangyidong 6cc36e819f * finish task #4704. 2018-09-11 14:51:32 +08:00
wangyidong 239ff3a256 * finish task #4755. 2018-09-11 14:47:25 +08:00
wangyidong 68746993ba * finish task #4752. 2018-09-11 13:29:47 +08:00
wangyidong cb5b94697c * finish task #4757. 2018-09-11 13:26:17 +08:00
wangyidong 60dcfab013 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-11 13:18:20 +08:00
wangyidong 285be81a9c * finish task #4761. 2018-09-11 13:17:30 +08:00
chenfeiCF a3dd13ddc0 * Finish task #4727, #4756. 2018-09-11 13:01:31 +08:00
Yagami 9ef2f028c2 * Fix groupcase method. 2018-09-11 10:20:56 +08:00
Yagami d01b60f37b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-11 08:54:13 +08:00
Yagami 3d0258a6d9 * Fix task #4836. 2018-09-11 08:53:45 +08:00
wangyidong 967174a419 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-10 16:06:17 +08:00
wangyidong 11bc6c1695 * finish task #4760. 2018-09-10 16:05:09 +08:00
Yagami 22b97cb830 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-10 15:39:08 +08:00
Yagami 222296f3ba * Finish task #4735,#4736,#4739,#4734. 2018-09-10 15:37:36 +08:00
wangyidong 7b5878531b Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-10 15:25:06 +08:00
wangyidong 800a77fff6 * finish task #4764. 2018-09-10 15:23:59 +08:00
Yagami 7aa81ab2ad * Finish task #4742. 2018-09-10 13:11:03 +08:00
Yagami eb780db5ab * Finish task #4762. 2018-09-10 09:53:34 +08:00
wangyidong 4877b2d2a9 * adjust for project-activate style. 2018-09-07 16:11:04 +08:00
wangyidong 909155c8f7 * finish task #4821. 2018-09-07 15:59:25 +08:00
wangyidong 86ec6cd982 * code for task #4815. 2018-09-07 15:14:16 +08:00
wangyidong c0557029ab * fix bug for check priv. 2018-09-07 14:49:32 +08:00