Commit Graph
14169 Commits
Author SHA1 Message Date
Yagami 6fbc3adee1 * Fix upgrade 10.6 logic. 2018-11-19 16:13:53 +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
Catouse 7e7a6a1ba5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-19 10:14:42 +08:00
Catouse a3513f0b34 * code for task #5094. 2018-11-19 10:14:36 +08:00
Renee 18aada4921 Update README
Update urls and lang
2018-11-19 10:07:32 +08:00
Catouse f9db113a0b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-16 16:34:18 +08:00
Catouse b6e41d22c3 * code for task #5060. 2018-11-16 16:34:12 +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
Yagami 190398b7d9 * Fix bug #2280. 2018-11-16 14:56:01 +08:00
chenfeiCF 03fb21c710 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-16 13:24:59 +08:00
chenfeiCF 0cedebe922 * Set min-width for groupAndOr of search form. 2018-11-16 13:23:28 +08:00
wangyidong 051db182d8 * fix bug #2283. 2018-11-16 13:23:19 +08:00
wangyidong 250088121d Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-16 13:13:59 +08:00
wangyidong a60bf79ba3 * fix bug #2285. 2018-11-16 13:13:32 +08:00
Yagami be110033d6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-16 13:07:17 +08:00
Yagami 0d376d0f52 * Fix bug #2288. 2018-11-16 13:06:59 +08:00
Catouse 8c2c63bb63 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-16 11:28:48 +08:00
Catouse 87b17af92c * finish task #5063. 2018-11-16 11:28:42 +08:00
wangyidong 8c17b6c61b * fix bug #2290. 2018-11-16 11:25:16 +08:00
wangyidong 22a149dd44 * fix bug #2230. 2018-11-16 11:18:33 +08:00
wangyidong 1a39d023f3 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-16 11:02:52 +08:00
wangyidong e1bccfb4c0 * fix bug #2257. 2018-11-16 11:02:21 +08:00
Catouse 17365e9a6d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-16 11:00:50 +08:00
Catouse 7154e289b6 * adjust style of .article-content element. 2018-11-16 11:00:43 +08:00
Catouse d8250402c4 * finish task #5074. 2018-11-16 11:00:26 +08:00
Yagami 93bde020e2 * Fix bug #2294. 2018-11-16 10:19:09 +08:00
Yagami 6d03636c69 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-16 09:48:22 +08:00
Yagami cdbf1487ac * Fix report empty value. 2018-11-16 09:47:55 +08:00
Catouse 05a48efe90 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-16 09:46:05 +08:00