Commit Graph
16517 Commits
Author SHA1 Message Date
guanxiying e0f4d2be6a * Remove unused bug typeList. 2019-11-20 13:21:42 +08:00
Yagami 27b0a26628 * Fix testtask batchrun bug. 2019-11-20 11:28:54 +08:00
wangyidong 67c482275f * code for task #6506. 2019-11-20 10:28:31 +08:00
wangyidong a996954ccb Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-20 10:27:27 +08:00
wangyidong 192af3d23c * finish task #6506. 2019-11-20 10:26:58 +08:00
Yagami 39e4ddb259 * Finish task #6544. 2019-11-20 10:14:17 +08:00
Yagami 24ca9fbc01 * Finish task #6542. 2019-11-20 10:00:56 +08:00
wangyidong e193e27ebc * change for en lang. 2019-11-20 09:48:34 +08:00
wangyidong c9f10bfdc5 * finish task #6509. 2019-11-20 09:29:32 +08:00
wangyidong fd436aca6b * adjust for dingapi style. 2019-11-20 09:16:25 +08:00
wangyidong 61e0a9d4f1 * finish task #6505. 2019-11-19 17:18:35 +08:00
wangyidong 06a5e621d8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-19 17:11:15 +08:00
wangyidong 97c0a65e21 * fix error varname. 2019-11-19 17:09:17 +08:00
guanxiying a32fbf7a60 * Finish task #6516. 2019-11-19 15:41:40 +08:00
guanxiying aa9fd639fb Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-19 15:41:05 +08:00
wangyidong 5336c5e1c3 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-19 15:39:55 +08:00
wangyidong 546d4ae53d * finish task #6543. 2019-11-19 15:39:23 +08:00
guanxiying 8e66e7efab Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-19 15:14:05 +08:00
guanxiying 39be2ba90e * Fix bug #2812. 2019-11-19 15:13:18 +08:00
Yagami e85b63ec85 * Finish task #6541. 2019-11-19 14:36:19 +08:00
Yagami 6e6e9cce0c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-19 14:30:03 +08:00
Yagami 99e6b82715 * Finish task #6524. 2019-11-19 14:29:50 +08:00
guanxiying a9a6068ec7 * Fix legendPrjStoryTask. 2019-11-19 14:26:49 +08:00
Yagami 3116bcf330 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-19 14:19:53 +08:00
Yagami 9b3afc02ce * Finish task #6523. 2019-11-19 14:19:33 +08:00
wangyidong b4b96c2101 * finish task #6561. 2019-11-19 13:56:45 +08:00
wangyidong 08146afd37 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-19 11:15:33 +08:00
Yagami 3173f9a71f * Finish task #6522. 2019-11-19 11:14:23 +08:00
wangyidong 7244bcda02 * code for task #6510. 2019-11-19 11:13:17 +08:00
wangyidong 3fd71d9708 * finish task #6531. 2019-11-19 11:12:29 +08:00
Yagami a0ca607022 * Add case change tips. 2019-11-19 11:01:13 +08:00
Yagami d59f9aa38a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-19 10:13:49 +08:00
guanxiying 9b72dd4df3 * Fix miss ; bug. 2019-11-19 09:57:02 +08:00
guanxiying c3c8c4b80f * Quote $lang->storyCommon with " . 2019-11-19 09:49:22 +08:00
Yagami e91028bbb7 * Finish task #6518. 2019-11-19 09:32:12 +08:00
Yagami 4767fec851 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-19 09:16:23 +08:00
Yagami 4251a59f0d * Finish task #6512. 2019-11-19 09:15:55 +08:00
wangyidong 1eca1b14c1 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-18 17:13:35 +08:00
guanxiying c43211716c * Remove deleted users from team. 2019-11-18 16:56:10 +08:00
wangyidong 323fc07bab Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-18 16:17:56 +08:00
Yagami b3c2163a26 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-18 16:17:55 +08:00
Yagami ceebffb6fe * Finish task #6396. 2019-11-18 16:17:38 +08:00
wangyidong aa471fff1b * finish task #6540. 2019-11-18 16:07:46 +08:00
guanxiying 4825707cae * Fix bug #2779. 2019-11-18 16:00:56 +08:00
Yagami b8e8e46637 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-18 15:43:22 +08:00
Yagami 800bc78722 * Finish task #6502. 2019-11-18 14:57:23 +08:00
guanxiying 31a001c6c3 * Replace story common. 2019-11-18 14:54:57 +08:00
guanxiying 871a6de666 * Fix ajax request. 2019-11-18 14:42:32 +08:00
guanxiying ec57032159 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-18 14:21:51 +08:00
guanxiying be4a224c64 * Fix hour point setting function. 2019-11-18 14:20:55 +08:00