Commit Graph
14213 Commits
Author SHA1 Message Date
reneeteng 732f7caa68 *Minor change. 2018-11-28 15:48:58 +08:00
reneeteng 4aa5c9e11b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-26 09:55:15 +08:00
reneeteng 2ffaaa91a7 * Extension lang changed. 2018-11-26 09:54:27 +08:00
wangyidong 7bc823d490 * fix bugs. 2018-11-26 09:01:16 +08:00
Yagami 83f8947ef7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-23 14:56:44 +08:00
Yagami d7dde0bc00 * Fix bug #2307. 2018-11-23 14:56:23 +08:00
wangyidong 8fb75c353a Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-23 10:48:28 +08:00
wangyidong 92854b5e5b * adjust for zbox curl. 2018-11-23 10:48:01 +08:00
Yagami 0009f5cc66 * Fix bug #2305. 2018-11-23 09:18:39 +08:00
wangyidong 78b165cd62 * adjust for check consistency. 2018-11-22 16:22:25 +08:00
wangyidong ad0eb0a7ba * add new version and upgrade. zentaopms_10.6.stable_20181120 2018-11-20 15:05:36 +08:00
Yagami 4473c05556 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-20 14:12:59 +08:00
wangyidong 47f0af8005 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-20 14:06:43 +08:00
wangyidong 6df216b795 * adjust code for link doc. 2018-11-20 14:05:56 +08:00
Yagami 1a3c4f7af5 * Fix qa index css and doc lang. 2018-11-20 13:58:29 +08:00
Catouse 6b1f94243f * improve severity label style. 2018-11-20 13:35:46 +08:00
Catouse 652fdcba6e * code for task #5116. 2018-11-20 12:09:01 +08:00
Catouse 001d810984 Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	module/block/view/productstatisticblock.html.php
#	module/block/view/projectstatisticblock.html.php
2018-11-20 11:57:01 +08:00
Catouse f570a5872f * code for task #5116. 2018-11-20 11:56:33 +08:00
Yagami e3e0e17a5e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-20 11:18:21 +08:00
Yagami 7e871f2e95 * Fix index project block. 2018-11-20 11:14:52 +08:00
chenfeiCF 95408a4142 * Adjust code. 2018-11-20 11:14:06 +08:00
Catouse 470e5d4e86 * improve UI of statistic blocks. 2018-11-20 10:49:54 +08:00
Catouse 391838d5b5 * code for task #5074. 2018-11-20 10:43:18 +08:00
Catouse 5a74a30ec3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-20 10:34:59 +08:00
Catouse 6480f58375 * improve create btn style in dashboard. 2018-11-20 10:34:54 +08:00
Yagami 3563237275 * Fix doc fullscreen. 2018-11-20 10:19:53 +08:00
chenfeiCF 8cd37c37e1 * Adjust code for task #5060. 2018-11-20 10:12:15 +08:00
wangyidong 58ddcf5489 * code for get extensions by api. 2018-11-20 09:53:44 +08:00
Catouse 1bd0234675 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-20 09:43:27 +08:00
Catouse c32562cc46 * fix divider in actions toolbar. 2018-11-20 09:43:22 +08:00
Yagami 68840fe795 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-20 09:30:21 +08:00
Yagami 56e8978654 * Fix doc fullscreen. 2018-11-20 09:29:50 +08:00
wangyidong 07053781c6 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-20 09:25:29 +08:00
wangyidong 56b5881790 * adjust for url card position. 2018-11-20 09:24:28 +08:00
Catouse 00c74cba26 * code for task #5086. 2018-11-20 09:10:51 +08:00
Catouse b8ccb1542e * code for task #5074. 2018-11-20 09:10:12 +08:00
Catouse e87f44e6af * code for task #5086. 2018-11-20 08:59:00 +08:00
wangyidong 6c447de480 * code for dev group. 2018-11-19 17:25:29 +08:00
wangyidong e576594489 * code for remove isdoing param. 2018-11-19 16:54:02 +08:00
wangyidong b58fb37eb3 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-19 16:37:42 +08:00
wangyidong 81c64773b4 * adjust code for backup. 2018-11-19 16:37:21 +08:00
Yagami 043189a376 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-19 16:14:34 +08:00
Yagami 6fbc3adee1 * Fix upgrade 10.6 logic. 2018-11-19 16:13:53 +08:00
chenfeiCF 18452bba9c * Adjust for task #5106. 2018-11-19 16:07:45 +08:00
Yagami 6e71947629 * Fix testtask action. 2018-11-19 16:00:52 +08:00
Catouse 7b89f7a1fc * fix #module dropdown not hide when #lib chosen dropdown show. 2018-11-19 15:53:48 +08:00
Catouse 8be7a334bf Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	module/tree/view/edit.html.php
2018-11-19 15:46:57 +08:00
Catouse fbcbf1d364 * fix #parent dropdown not hide when #root chosen dropdown show. 2018-11-19 15:46:31 +08:00
wangyidong dddbb2e523 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-19 15:44:54 +08:00