Commit Graph
13259 Commits
Author SHA1 Message Date
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 3dcc616f48 * Finish task #4746. 2018-09-10 10:42:34 +08:00
Yagami eb780db5ab * Finish task #4762. 2018-09-10 09:53:34 +08:00
Yagami 0524666092 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 16:30:24 +08:00
Yagami 5b7398eb3c * Fix table-header css. 2018-09-07 16:30:04 +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. zentaopms_10.3.1_20180907 2018-09-07 14:49:32 +08:00
wangyidong 4fb50d5132 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-07 14:39:13 +08:00
wangyidong f2d58faaf1 * change for upgrade. 2018-09-07 14:37:45 +08:00
Catouse c2907dc63a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 14:11:10 +08:00
Catouse 6be860c4d2 * change style of active item in tree. 2018-09-07 14:10:56 +08:00
wangyidong fb9e21ffa4 * adjust code. 2018-09-07 14:10:14 +08:00
Catouse f87ff72f2a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 14:05:42 +08:00
Catouse 21d96d54d3 * finish task #4788. 2018-09-07 14:05:37 +08:00
Yagami d45210d7bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 10:19:31 +08:00
Yagami cd3ab96967 * Finish task #4767. 2018-09-07 10:18:56 +08:00
滔哥 def4a53d04 * Finished task#4801 2018-09-07 01:44:22 +08:00
滔哥 05b9275e14 * Finished task#4802. 2018-09-07 00:41:41 +08:00
Catouse eb38ccc270 * finish task #4695. 2018-09-06 18:05:17 +08:00
Catouse ff3ff14d4c * improve UI of doc/view. 2018-09-06 18:05:04 +08:00
Catouse a6fe7e73cf Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	module/build/view/linkbug.html.php
#	module/build/view/linkstory.html.php
#	module/release/view/linkbug.html.php
#	module/release/view/linkstory.html.php
2018-09-06 17:43:57 +08:00
Catouse b538734033 * finish task #4781. 2018-09-06 17:42:59 +08:00
wangyidong e261f646e4 * finish task #4766. 2018-09-06 17:38:20 +08:00
wangyidong 2217278a00 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 17:34:26 +08:00
wangyidong 0c5a8851f6 * finish task #4785. 2018-09-06 17:34:08 +08:00
Catouse 00c0ece2dc * improve search form UI. 2018-09-06 17:27:02 +08:00
Catouse 184ac37fd2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-06 17:13:05 +08:00