Commit Graph
17304 Commits
Author SHA1 Message Date
wangyidong 4388bf9c7b * fix bug #3038. 2020-03-25 10:57:14 +08:00
wangyidong 65945b7e9c * fix for create build when resolve bug. 2020-03-25 10:35:13 +08:00
wangyidong cf555e09a7 * adjust for backup. 2020-03-25 09:49:26 +08:00
wangyidong d09eb3aff5 * fix bug for show task module. 2020-03-24 16:52:54 +08:00
wangyidong fe4cd3fd3e * adjust for xuanxuan. 2020-03-24 15:58:44 +08:00
wangyidong 7f99fab3a7 Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-24 08:24:14 +08:00
wangyidong a9558f90d2 * change for zh-cn svn. 2020-03-24 08:23:04 +08:00
liugang 305ace628b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-23 17:30:24 +08:00
wangyidong d12c6d75c6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-23 17:23:18 +08:00
wangyidong 149d57e9f7 * fix bug for ci. 2020-03-23 17:22:36 +08:00
liugang ac410c7ebe Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-20 23:51:33 +08:00
reneeteng f7b78d7c83 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-20 23:38:59 +08:00
reneeteng 46c856508e * Rule case in all lang files updated. 2020-03-20 23:37:57 +08:00
liugang a08a5b7d96 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-20 17:00:07 +08:00
chenfei dc0420f4df * Merge db process methods from xxb. 2020-03-20 16:52:48 +08:00
liugang 35dd7a64f8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-20 10:20:07 +08:00
chenfei 63458f7f85 * Add get table fields for zdb class. 2020-03-20 09:30:39 +08:00
liugang d4ee7d8d8f * Display the extend fields of testcase in cases page of the testtask module. 2020-03-19 15:40:42 +08:00
wangyidong 1e542ecbe5 * fix bug #2215. 2020-03-19 15:38:14 +08:00
wangyidong 7c2c59bc24 * code for build zentaoxx. 2020-03-18 17:07:36 +08:00
wangyidong 36c0406829 Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-18 16:49:01 +08:00
wangyidong 9e83e63996 * code for php7.4. 2020-03-18 16:48:14 +08:00
wangyidong f398db053d * code for task #6994. 2020-03-18 16:47:41 +08:00
reneeteng f689b06e76 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-18 15:51:17 +08:00
reneeteng 2ced016c37 * CI compile lang file changed. 2020-03-18 15:50:26 +08:00
wangyidong f991752628 * code for task #6990. 2020-03-18 14:45:57 +08:00
wangyidong 5681905c68 * finish task #6993. 2020-03-18 14:39:02 +08:00
Catouse 43c757f13f * fix bug #3006, fix datepicker not work as expected in Deutsch and Français language. 2020-03-18 09:54:50 +08:00
Catouse 3f608337a0 * fix js error in french language. 2020-03-18 09:35:35 +08:00
wangyidong c7a1e71d27 * finish task #6991. 2020-03-17 17:16:29 +08:00
wangyidong f14dde277c Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-17 16:40:55 +08:00
wangyidong cfa5261960 * finish task #6902 and merge xuanxuan. 2020-03-17 16:38:44 +08:00
leiyong b0966e0faf Wechat can recursively obtain department users. 2020-03-17 16:32:45 +08:00
reneeteng 9e21c86389 * Install lang updated. 2020-03-17 15:38:35 +08:00
Yagami a9fbc3950d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-16 15:29:14 +08:00
Yagami d2d138869d * Fix makefile and sql. 2020-03-16 15:28:45 +08:00
reneeteng 875caed3ed Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-16 14:19:06 +08:00
reneeteng adc3b3c1c4 * Lang file update for ci and my. 2020-03-16 14:16:29 +08:00
wangyidong bc08702d32 * finish task #6970. 2020-03-16 09:16:31 +08:00
reneeteng ac9c8a9559 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-16 08:24:50 +08:00
sgm0422 8dda089476 * Fix isClickble for requirement. 2020-03-15 15:00:51 +08:00
sgm0422 1770208118 * Code for requiment. 2020-03-15 14:37:28 +08:00
reneeteng fd83116e1d Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-15 11:41:11 +08:00
wangyidong da823eacb6 * fix bug. 2020-03-14 13:30:58 +08:00
reneeteng 6e9cc77ed7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-13 15:37:13 +08:00
wangyidong 054c41e2b8 * adjust en lang. 2020-03-13 14:59:09 +08:00
wangyidong db2fc06f49 * change error word. 2020-03-13 14:38:37 +08:00
wangyidong 101679c6a5 Merge branch 'master' of github.com:easysoft/zentaopms 2020-03-13 13:23:13 +08:00
wangyidong 3ba2f42aef * show child label. 2020-03-13 11:22:54 +08:00
sgm0422 8797f0bd90 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-13 10:09:28 +08:00