Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
9,697 Commits 2 Branches 292 Tags
d71f095975f12869d8734fdbdb91e2ee5fd4c9a1
Commit Graph
9697 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
pengjiangxiu d71f095975 * Update version info 2017-06-21 11:20:46 +08:00
wangyidong 5e46cb6fc5 * adjust code. 2017-06-20 16:12:10 +08:00
wangyidong f4608f5a6b Merge branch 'master' of github.com:easysoft/zentaopms 2017-06-20 15:58:09 +08:00
wangyidong 3777f18b8f * create file read link with extension. 2017-06-20 15:57:42 +08:00
pengjiangxiu e929d7a6a9 * Adjust config 2017-06-20 15:55:10 +08:00
pengjiangxiu 0d73f34c52 * fix filter params bug 2017-06-20 08:26:58 +08:00
wangyidong d18cc65d90 * merge new framework. 2017-06-16 16:52:45 +08:00
wangyidong db4eca22ae * merge framework. 2017-06-15 11:37:04 +08:00
pengjiangxiu 06e714223f * update file dangers type 2017-06-15 10:46:06 +08:00
pengjiangxiu 757b9ecf71 * Adjust for framework. 2017-06-15 09:48:51 +08:00
pengjiangxiu 97bbc1bef0 * Merge file upload allowed 2017-06-15 09:46:13 +08:00
wangyidong a29c6f2143 * adjust code. 2017-06-14 16:11:08 +08:00
wangyidong de5c536659 * adjust for framework. 2017-06-14 15:23:38 +08:00
wangyidong 19def0f2fd * adjust for filter cookie. 2017-06-12 10:47:15 +08:00
wangyidong a37df65bc8 * mereg zentaophp framework to zentao. 2017-06-09 17:06:18 +08:00
wangyidong c27f1f7d34 * merge zentaophp to zentao. 2017-06-09 17:05:37 +08:00
wangyidong e3d6b9d709 * fix workload days. 2017-06-02 16:19:10 +08:00
wangyidong 90d12565de * fix bug. 2017-06-01 10:23:54 +08:00
wangyidong 67b29ccb88 * fix bug edit build. 2017-05-23 11:03:54 +08:00
wangyidong 02bd73a67b * change for upgrade. zentaopms_9.2.1_20170522 2017-05-22 09:53:16 +08:00
wangyidong 93063f15df Merge branch 'master' of github.com:easysoft/zentaopms 2017-05-19 16:57:23 +08:00
wangyidong 11ea0f3e93 * fix for create story in prject story when force review. 2017-05-19 16:56:27 +08:00
wangyidong 117bec6bfb * fix bug for #1098. 2017-05-19 16:48:19 +08:00
wangyidong 6a308ba5ca * adjust for page style. 2017-05-19 16:33:20 +08:00
Catouse ee2370eb56 * prevent login page show in a iframe modal. 2017-05-19 16:27:20 +08:00
Catouse ac7958d736 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-05-19 15:08:27 +08:00
Catouse dd5e5e7767 * fix required error. 2017-05-19 15:08:21 +08:00
daitingting 3e5d56f665 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-05-19 10:08:11 +08:00
daitingting ef8be94f83 * Hidden product when working is task. 2017-05-19 10:07:48 +08:00
Catouse 089a70ef11 * adjust code format. 2017-05-18 16:35:26 +08:00
Catouse d133157f7c * fix tooltip behavior in tutorial page. 2017-05-18 16:26:36 +08:00
Catouse 07865fdb42 * fix setRequiredFields method. 2017-05-18 16:17:16 +08:00
daitingting 5f66e75da9 * Adjust codes. 2017-05-18 11:14:19 +08:00
daitingting 4065570e95 Merge branch 'master' of https://github.com/easysoft/zentaopms zentaopms_9.2.stable_20170516 2017-05-16 16:06:11 +08:00
daitingting e8b8b67471 * Adjust codes. 2017-05-16 16:06:02 +08:00
wangyidong 4804c795b6 * fix bug for install. 2017-05-16 15:51:54 +08:00
wangyidong 68b274e3d3 * adjust css. 2017-05-16 15:16:03 +08:00
daitingting fc5c2a964c * Adjust conflict. 2017-05-16 14:55:06 +08:00
daitingting 58b0e33efc Merge branch 'master' of https://github.com/easysoft/zentaopms 
Conflicts:
	module/common/lang/en.php
	module/common/lang/zh-cn.php
 2017-05-16 14:51:26 +08:00
daitingting 7d46c76ea2 * Adjust rights. 2017-05-16 14:51:03 +08:00
daitingting d49867fc20 * Add english language. 2017-05-16 14:43:45 +08:00
wangyidong 12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
daitingting f0e76ff576 * Set flow for custom doc menu. 2017-05-16 13:53:17 +08:00
daitingting 07cebfea4a * Adjust fixed menu. 2017-05-16 13:03:04 +08:00
daitingting 1a23280c75 * Adjust codes. 2017-05-16 11:29:21 +08:00
daitingting 06d26ecce9 * Adjust style for create btn group. 2017-05-16 11:26:05 +08:00
daitingting 2274c3ec6f * Adjust menu when width is more. 2017-05-16 11:20:53 +08:00
daitingting 917fc19011 * Adjust high light. 2017-05-16 09:53:51 +08:00
daitingting 33932cad94 * Remove useless codes. 2017-05-15 16:58:15 +08:00
daitingting 69255005d8 * Adjust custom field. 2017-05-15 16:56:21 +08:00