Commit Graph

33 Commits

Author SHA1 Message Date
tanghucheng
dc86a15a62 * Fix bug . 2022-04-26 17:07:12 +08:00
tanghucheng
e00d70491b * Fix bug . 2022-04-26 13:47:34 +08:00
tanghucheng
0fd5968a14 * Fix bug #15552,15559. 2022-04-26 13:46:45 +08:00
tanghucheng
60bdd927d1 * Fix bug #18209. 2022-04-26 11:26:03 +08:00
tanghucheng
66ee1b0ffe * Fix bug . 2022-04-25 17:01:43 +08:00
王怡栋
0faf44af53 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   module/stage/model.php
2022-04-24 07:02:51 +00:00
tanghucheng
c72bd0a1df * Fix bug #18209. 2022-04-24 14:27:19 +08:00
lanzongjun
e011e6c2f0 * fix bug #18210 2022-04-24 14:11:33 +08:00
mayue
29574c3e85 * Fix bug #17216. 2022-03-16 17:13:07 +08:00
mayue
122ffd9c2c * Fix bug #17216. 2022-03-16 13:23:58 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
孙广明
75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
Yagami
9a0cc1a747 * Code for task #36042, move subject estimate stage holiday to max. 2021-02-24 16:55:07 +08:00
leiyong
fa8ac71eee * Add version. 2021-01-29 17:10:24 +08:00
Yagami
54f89c88b9 * Fix details. 2021-01-21 11:31:36 +08:00
leiyong
8b2007c564 * Finish task#8655. 2020-12-17 09:20:41 +08:00
hufangzhou
8b80e3b217 * Finish task#8656. 2020-12-16 13:49:11 +08:00
Yagami
3ecbf0262b * Code for task #8597. 2020-12-10 15:05:33 +08:00
leiyong
f5b127e427 * Adjust code. 2020-12-04 15:13:48 +08:00
leiyong
aa7053f040 * Adjustment language files. 2020-11-02 13:23:34 +08:00
tianshujie98
24b8fe642b * Remove spaces. 2020-09-03 17:44:15 +08:00
tianshujie98
8c0ce02ac6 * Remove spaces. 2020-09-03 17:44:15 +08:00
tianshujie98
29b606efdb * Modify English language items. 2020-09-03 17:33:29 +08:00
tianshujie98
4e0040435f * Fix comment. 2020-08-28 09:17:10 +08:00
tianshujie98
dd2f82a8de * Add stage comment. 2020-08-27 11:12:53 +08:00
tianshujie98
fb263a1152 * Add lang/en.php 2020-08-25 16:27:11 +08:00
holan20180123
4ad3e6d979 * Code for stage. 2020-08-18 09:06:13 +08:00
Yagami
8f7f158ad5 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-17 17:29:19 +08:00
holan20180123
4c2d627fd9 * Code for stage. 2020-08-17 17:27:42 +08:00
Yagami
3b72ae8238 * Add stage to 20.x. 2020-08-17 17:24:22 +08:00
holan20180123
0f4927728a * Code for stage. 2020-08-17 16:58:34 +08:00
holan20180123
da8347f289 * Add stage model update method. 2020-08-17 15:16:19 +08:00
Yagami
4fe2e5f278 * Move stage method to zentaopms. 2020-08-17 14:41:58 +08:00