Commit Graph
11976 Commits
Author SHA1 Message Date
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
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
wangyidong e510114d28 * adjust code for backup. 2018-11-19 15:44:30 +08:00
Yagami 9f94105a8c * Fix review story field display. 2018-11-19 15:36:21 +08:00
Yagami c147ea7296 * Fix doc view css. 2018-11-19 15:27:29 +08:00
Yagami 1d72c2ef71 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-19 15:23:44 +08:00
Yagami ecf4ffafe1 * Fix doc getlibs method. 2018-11-19 15:23:21 +08:00
chenfeiCF af1124ab3f * Code for task #5081. 2018-11-19 15:18:56 +08:00
Yagami 0a1f17db54 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-19 14:51:00 +08:00
Yagami defe22ca46 * Fix block link. 2018-11-19 14:50:32 +08:00
wangyidong dd334ee161 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-19 14:44:53 +08:00
wangyidong 4809e3d1ea * adjust code. 2018-11-19 14:43:49 +08:00
chenfeiCF 072f46710c * Finish task #5132. 2018-11-19 14:37:48 +08:00
wangyidong 8f0288be13 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-16 16:24:42 +08:00
wangyidong 9c8bdabaaa * fix bug #2298. 2018-11-16 16:24:14 +08:00
Yagami 5f8caaec24 * Fix bug #2278. 2018-11-16 16:23:30 +08:00
Yagami a2b8ad8957 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-16 15:30:52 +08:00
Yagami 6ca663dc51 * Fix bug #2279. 2018-11-16 15:05:42 +08:00
wangyidong 3fd9896407 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-16 15:00:24 +08:00
wangyidong 57f9f1322e * fix bug for testreport edit. 2018-11-16 14:57:41 +08:00