 孙广明
|
e9c8da2f1e
|
* Finish task #46670.
|
2021-12-30 16:04:32 +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 |
|
|
孙广明
|
5ca7c0cf7f
|
Merge branch 'sprint/181_zhengrunyu_46662'
|
2021-12-30 09:18:02 +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 |
|
|
孙广明
|
408f88a177
|
Merge branch 'sprint/180_songchenxuan_fix_plan_bug' into 'master'
*Fix plan bug.
See merge request easycorp/zentaopms!1179
|
2021-12-29 07:52:05 +00:00 |
|
|
songchenxuan
|
c483052818
|
*Fix plan bug.
|
2021-12-29 15:50:49 +08:00 |
|
|
孙广明
|
70911e06da
|
Merge branch 'sprint/181_tianshujie_kanban' into 'master'
Sprint/181 tianshujie kanban
See merge request easycorp/zentaopms!1178
|
2021-12-29 06:47:25 +00: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 |
|
|
tianshujie
|
510547f7ea
|
* Fix the real-time update of the Kanban board.
|
2021-12-29 10:41:05 +08:00 |
|
|
孙广明
|
378b77cec7
|
Merge branch 'sprint/181_tianshujie_kanban' into 'master'
* Finish task #46657.
See merge request easycorp/zentaopms!1156
|
2021-12-29 02:32:07 +00:00 |
|
|
tianshujie
|
2bb67b955f
|
* Modify code logic.
|
2021-12-29 10:25:28 +08:00 |
|
|
tianshujie
|
15c13057d0
|
* Adjust the query plan logic.
|
2021-12-29 09:36:57 +08:00 |
|
|
tianshujie
|
541aeaba80
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban
|
2021-12-29 08:43:34 +08:00 |
|
|
liumengyi
|
2c8db966ea
|
* Finish task #46656.
|
2021-12-28 17:14:14 +08:00 |
|
|
tianshujie
|
8e90b750aa
|
Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban
|
2021-12-28 17:12:52 +08:00 |
|
|
tianshujie
|
830f551425
|
* Modify the code.
|
2021-12-28 17:12:30 +08:00 |
|
|
liumengyi
|
0eaf072959
|
* Finish task #46656.
|
2021-12-28 17:12:16 +08:00 |
|
|
tianshujie
|
6a6322044e
|
Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban
|
2021-12-28 16:59:36 +08:00 |
|
|
tianshujie
|
545438e452
|
* Finisht task #46666,#46668,#46659,#46658.
|
2021-12-28 16:56:38 +08:00 |
|
|
朱金勇
|
dbe64a36a7
|
Merge branch 'sprint/178_hufangzhou_budget' into 'master'
* Fix bugs for compatible 8.0.
See merge request easycorp/zentaopms!1170
zentaopms_16.0
|
2021-12-28 08:27:49 +00:00 |
|
|
hufangzhou
|
2f58499fee
|
* Fix bugs for compatible 8.0.
|
2021-12-28 16:26:08 +08:00 |
|
|
zhujinyong
|
8407a4a105
|
* Adjust code for PHP8.
|
2021-12-28 16:21:57 +08:00 |
|
|
zhujinyong
|
ede915fce2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-28 16:15:37 +08:00 |
|
|
zhujinyong
|
3dbabdf6af
|
* Adjust code for PHP8.
|
2021-12-28 16:15:20 +08:00 |
|
|
liumengyi
|
50efcdf342
|
* Finish task #46661.
|
2021-12-28 15:59:57 +08:00 |
|
|
liumengyi
|
36e9b91ba0
|
* Finish task #46660.
|
2021-12-28 15:11:27 +08:00 |
|
|
朱金勇
|
3b0c8488f0
|
Merge branch 'sprint/178_hufangzhou_php8.0' into 'master'
* Fix bug for compatible php8.0 .
See merge request easycorp/zentaopms!1165
|
2021-12-28 06:48:41 +00:00 |
|
|
hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
|
zhujinyong
|
df07ada2b3
|
* Fix path of api.
|
2021-12-28 14:34:12 +08:00 |
|
|
zhujinyong
|
6b20c11c88
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-28 14:34:06 +08:00 |
|
|
朱金勇
|
18ffc67c8f
|
Merge branch 'sprint/178_hufangzhou_18014' into 'master'
* Fix bug #18014.
See merge request easycorp/zentaopms!1161
|
2021-12-28 02:21:15 +00:00 |
|