 孙广明
|
ad25920cf0
|
* Refactor code.
|
2021-12-31 11:06:46 +08:00 |
|
|
liumengyi
|
3dd747f40a
|
* Modify judgment for split chid plan.
|
2021-12-31 10:59:37 +08:00 |
|
|
liumengyi
|
0894fd4898
|
* Modify judgment for split child plan.
|
2021-12-31 09:47:22 +08:00 |
|
|
liumengyi
|
e0d72a4c25
|
* Refactoring code for update status.
|
2021-12-31 09:40:46 +08:00 |
|
|
孙广明
|
7af8683be4
|
Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master'
* Modify print label code of plan list.
See merge request easycorp/zentaopms!1212
|
2021-12-30 08:33:36 +00:00 |
|
|
孙广明
|
7356af0232
|
Merge branch 'sprint/max_tanghucheng_46677' into 'master'
* Finish task #46677.
See merge request easycorp/zentaopms!1202
|
2021-12-30 08:30:07 +00:00 |
|
|
liumengyi
|
abd52e3141
|
* Modify print label code of plan list.
|
2021-12-30 16:25:32 +08:00 |
|
|
孙广明
|
355665690b
|
Merge branch 'sprint/32_zhouxin_46674' into 'master'
Sprint/32 zhouxin 46674
See merge request easycorp/zentaopms!1195
|
2021-12-30 08:15:39 +00:00 |
|
|
孙广明
|
a02d19a0c4
|
* Fix merge code bug.
|
2021-12-30 16:14:12 +08:00 |
|
|
孙广明
|
7267c50600
|
Merge branch 'master' into 'sgm_46670'
# Conflicts:
# module/productplan/model.php
|
2021-12-30 08:12:11 +00:00 |
|
|
zhouxin
|
50dabf7bd7
|
Refactor method checkCanChangeModel.
|
2021-12-30 08:09:50 +00:00 |
|
|
孙广明
|
e9c8da2f1e
|
* Finish task #46670.
|
2021-12-30 16:04:32 +08:00 |
|
|
liumengyi
|
3602538f9c
|
* Fix bug for update status.
|
2021-12-30 15:21:09 +08:00 |
|
|
zhouxin
|
e9231b595a
|
Change configuration file.
|
2021-12-30 07:16:28 +00:00 |
|
|
liumengyi
|
ebe4c65807
|
* Add child Label.
|
2021-12-30 15:11:43 +08:00 |
|
|
tanghucheng
|
9f341e49ed
|
* Finish task #46677.
|
2021-12-30 15:10:54 +08:00 |
|
|
孙广明
|
470b2730e5
|
Merge branch 'sprint/181_tianshujie_button' into 'master'
* The plan is completed or closed grayed out to create an execution button.
See merge request easycorp/zentaopms!1196
|
2021-12-30 06:48:23 +00:00 |
|
|
孙广明
|
86994c2af9
|
Merge branch 'sprint/181_liumengyi_modify' into 'master'
* Fix bug for task #46654.
See merge request easycorp/zentaopms!1193
|
2021-12-30 06:44:40 +00:00 |
|
|
孙广明
|
9ccf3099a0
|
Merge branch 'sprint/32_zhouxin_46679' into 'master'
Finish task #46679 and fix a bug.
See merge request easycorp/zentaopms!1194
|
2021-12-30 06:44:16 +00:00 |
|
|
liumengyi
|
9ecbdf2509
|
* Modify the judged data type.
|
2021-12-30 14:33:20 +08:00 |
|
|
tianshujie
|
82a0d10f4b
|
* The plan is completed or closed grayed out to create an execution button.
|
2021-12-30 14:29:53 +08:00 |
|
|
liumengyi
|
e3933a0f88
|
* Modify judgment for task#46654.
|
2021-12-30 14:26:35 +08:00 |
|
|
zhouxin
|
344682bf7b
|
Delete createguide of kanban,change cmmi to waterfall.
|
2021-12-30 06:25:22 +00:00 |
|
|
liumengyi
|
6b8e4630ba
|
* Fix bug for task #46654.
|
2021-12-30 14:23:37 +08:00 |
|
|
tianshujie
|
4d56aa8bdc
|
* Add card drop-down operation.
|
2021-12-30 14:02:55 +08:00 |
|
|
zhouxin
|
05a75e7039
|
Finish task #46674.
|
2021-12-30 05:50:50 +00:00 |
|
|
tianshujie
|
97ea32f7c3
|
* Modify the mutual test question.
|
2021-12-30 13:49:49 +08:00 |
|
|
孙广明
|
9b2df17e26
|
Merge branch 'sprint/181_liumengyi_addDynamic' into 'master'
* Add dynamic for parent plan status flow.
See merge request easycorp/zentaopms!1191
|
2021-12-30 03:53:41 +00:00 |
|
|
liumengyi
|
8436cbe443
|
* Modify judgment.
|
2021-12-30 11:34:27 +08:00 |
|
|
孙广明
|
d6296cf071
|
Merge branch 'sprint/181_tianshujie_46672' into 'master'
*Finish task #46672.
See merge request easycorp/zentaopms!1188
|
2021-12-30 03:30:11 +00:00 |
|
|
liumengyi
|
53aa300744
|
* Add dynamic for parent plan status flow.
|
2021-12-30 11:25:57 +08:00 |
|
|
tianshujie
|
ff35ce06cd
|
* Hide contextmenu when page scroll.
|
2021-12-30 11:24:07 +08:00 |
|
|
tianshujie
|
08723126ea
|
* Finish task #46672.
|
2021-12-30 11:02:42 +08:00 |
|
|
孙广明
|
d4d7ef1074
|
Merge branch 'master' into 'sprint/181_zhengrunyu_46662'
# Conflicts:
# module/productplan/lang/en.php
# module/productplan/lang/zh-cn.php
# module/productplan/view/browse.html.php
|
2021-12-30 01:17:44 +00:00 |
|
|
zhengrunyu
|
ea8052baa0
|
*Finish task 46662 46664 46669.
|
2021-12-30 09:14:30 +08:00 |
|
|
zhengrunyu
|
d28dcd7d63
|
*Finish task 46662 46665 46669.
|
2021-12-30 09:01:44 +08:00 |
|
|
tianshujie
|
137281f8fb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_46672
|
2021-12-30 08:40:26 +08:00 |
|
|
tianshujie
|
cc81db0ddc
|
* Finish task #46667.
|
2021-12-30 08:24:38 +08:00 |
|
|
孙广明
|
e8f23a5c01
|
Merge branch 'sprint/181_liumengyi_checkDate' into 'master'
* Add judgment for plan start.
See merge request easycorp/zentaopms!1182
|
2021-12-29 09:51:36 +00:00 |
|
|
liumengyi
|
0ed240c378
|
* Add judgment for plan start.
|
2021-12-29 17:29:45 +08:00 |
|
|
李玉春
|
f92963a68a
|
Merge branch 'sgm_plan' into 'master'
* Code for php8.0.
See merge request easycorp/zentaopms!1181
|
2021-12-29 09:22:34 +00:00 |
|
|
孙广明
|
aa60c24da5
|
* Fix code comment.
|
2021-12-29 17:19:31 +08:00 |
|
|
孙广明
|
7b23296aa0
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Modify plan status flow judgment method.
See merge request easycorp/zentaopms!1180
|
2021-12-29 09:16:30 +00:00 |
|
|
liumengyi
|
1250dca867
|
* Modify plan flow button.
|
2021-12-29 17:13:16 +08:00 |
|
|
孙广明
|
3d3d4130dd
|
* Code for php8.0.
|
2021-12-29 16:59:54 +08:00 |
|
|
liumengyi
|
ba9f61de07
|
* Modify plan status flow judgment method.
|
2021-12-29 16:31:46 +08:00 |
|
|
王怡栋
|
c1ffbd839a
|
Merge branch 'sprint/liyuchun_devops' into 'master'
Sprint/liyuchun devops
See merge request easycorp/zentaopms!1137
|
2021-12-29 08:04:37 +00:00 |
|
|
songchenxuan
|
c483052818
|
*Fix plan bug.
|
2021-12-29 15:50:49 +08:00 |
|
|
tianshujie
|
5cf82c2ad0
|
* Remove the copy card function.
|
2021-12-29 14:41:47 +08:00 |
|
|
tianshujie
|
f9f726270e
|
* Finish task #46667.
|
2021-12-29 14:35:09 +08:00 |
|