Commit Graph

14101 Commits

Author SHA1 Message Date
Catouse
138b2bdafb * fix bug #2035 and finish task #5134. 2018-11-15 16:25:55 +08:00
Catouse
66f6f1d761 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 15:40:03 +08:00
Catouse
ceed1e4821 * finish task #5141. 2018-11-15 15:39:42 +08:00
wangyidong
3241b0a970 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-15 15:39:03 +08:00
wangyidong
e8af92a166 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-15 15:38:34 +08:00
Yagami
d2d421c9fb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 15:36:48 +08:00
Yagami
e481a5496f * Finish task #5116. 2018-11-15 15:36:11 +08:00
wangyidong
8bef03e8f3 * finish task #5057. 2018-11-15 15:35:19 +08:00
Catouse
8387e49602 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 15:30:25 +08:00
Catouse
2cf4be7d7b * finish task #5088. 2018-11-15 15:29:48 +08:00
chenfeiCF
496964c1b0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-15 15:21:16 +08:00
chenfeiCF
cefdbaa5d3 * Finish task #5133. 2018-11-15 15:20:42 +08:00
Catouse
9fc889340f * finish task #5086. 2018-11-15 15:19:39 +08:00
Catouse
52ecb55c52 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 14:22:49 +08:00
Catouse
aa5031778d * finish task #5060. 2018-11-15 14:22:43 +08:00
chenfeiCF
1650ba3592 * Finish task #5129. 2018-11-15 14:10:27 +08:00
chenfeiCF
48f425f180 * Finish task #5128. 2018-11-15 13:43:28 +08:00
wangyidong
c4e1908371 * adjust for backup. 2018-11-15 13:32:54 +08:00
Yagami
691cd7646e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 13:09:29 +08:00
Yagami
f1db7cd1a8 * Finish task #5114. 2018-11-15 13:09:05 +08:00
chenfeiCF
263153b6c8 * Adjust for task #5126. 2018-11-15 11:19:33 +08:00
Catouse
4cfcbd291e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 11:03:58 +08:00
Catouse
9367e36fb9 * update ajaxform. 2018-11-15 11:03:52 +08:00
wangyidong
d2398049d2 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-15 11:01:33 +08:00
wangyidong
ba3430ad67 * adjust for en lang. 2018-11-15 11:00:50 +08:00
chenfeiCF
b94614c9c7 * Finish task #5126. 2018-11-15 10:59:48 +08:00
Yagami
fa7e25f966 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 10:35:46 +08:00
Yagami
f772d46bcc * Finish task #5068. 2018-11-15 10:35:27 +08:00
chenfeiCF
419afb8509 * Finish task #5135. 2018-11-15 10:34:20 +08:00
Catouse
22644614e6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 10:18:41 +08:00
Catouse
c8c769427a * fix UI of testcase/create view. 2018-11-15 10:18:36 +08:00
Catouse
f724c7ddb6 * fix ajaxform not work. 2018-11-15 10:18:14 +08:00
Yagami
0c736904d4 * Finish task #5090. 2018-11-15 10:04:39 +08:00
reneeteng
37e2c1205a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 09:57:57 +08:00
reneeteng
b9e4f1c766 * Lang optimized. 2018-11-15 09:57:30 +08:00
Yagami
43816350b0 * Fix project menu order. 2018-11-15 09:10:17 +08:00
Yagami
7bda99a84b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-15 09:08:25 +08:00
Yagami
e6feb5f675 * Fix project menu. 2018-11-15 09:08:01 +08:00
reneeteng
0f455e04bf Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 16:58:15 +08:00
reneeteng
f8b08d842b *Change lang. 2018-11-14 16:57:42 +08:00
Yagami
94c6ecedf6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 16:28:24 +08:00
Yagami
8b71c1ea3a * Finish task #5142. 2018-11-14 16:28:07 +08:00
Catouse
e3efb2e5af Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2018-11-14 15:30:33 +08:00
Catouse
d383aeb1a8 * fix title attribute int datatable not work. 2018-11-14 15:30:19 +08:00
Yagami
d81aef132c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-14 15:21:01 +08:00
Yagami
65ba8a4786 * Finish task #5077. 2018-11-14 15:20:39 +08:00
chenfeiCF
2771600905 * Finish task #5124. 2018-11-14 15:20:26 +08:00
chenfeiCF
4a021cb8a5 * Finish task #5123. 2018-11-14 14:52:00 +08:00
chenfeiCF
f37251a734 * Finish task #5119. 2018-11-14 14:34:04 +08:00
Yagami
2d26caad2e * Finish task #5084. 2018-11-14 14:10:23 +08:00