 孙广明
|
ad25920cf0
|
* Refactor code.
|
2021-12-31 11:06:46 +08:00 |
|
|
liumengyi
|
e0d72a4c25
|
* Refactoring code for update status.
|
2021-12-31 09:40:46 +08: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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
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 |
|
|
liumengyi
|
8436cbe443
|
* Modify judgment.
|
2021-12-30 11:34:27 +08:00 |
|
|
liumengyi
|
53aa300744
|
* Add dynamic for parent plan status flow.
|
2021-12-30 11:25:57 +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 |
|
|
liumengyi
|
0ed240c378
|
* Add judgment for plan start.
|
2021-12-29 17:29:45 +08:00 |
|
|
liumengyi
|
ba9f61de07
|
* Modify plan status flow judgment method.
|
2021-12-29 16:31:46 +08: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
|
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 |
|
|
liumengyi
|
36e9b91ba0
|
* Finish task #46660.
|
2021-12-28 15:11:27 +08:00 |
|
|
songchenxuan
|
ca1230076f
|
*Finish task #46095.
|
2021-12-20 18:10:40 +08:00 |
|
|
孙广明
|
13f162edd2
|
* Merge 169 untrack file to master.
|
2021-12-08 11:07:06 +08:00 |
|
|
王怡栋
|
bf16167b19
|
* Support for flow.
|
2021-12-02 10:55:04 +08:00 |
|
|
tianshujie
|
86ccece2ca
|
* Modify the problem of function demonstration.
|
2021-12-01 16:32:10 +08:00 |
|
|
tianshujie
|
e74dd9ad80
|
* Fix bug #16977.
|
2021-12-01 14:05:59 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
tianshujie
|
adb2c12935
|
* Modify the code.
|
2021-11-29 15:54:48 +08:00 |
|
|
tianshujie
|
96a46aa2ca
|
* Modify the code.
|
2021-11-29 14:16:10 +08:00 |
|
|
tianshujie
|
f4d1a727a7
|
* Finish task #45084,44994,44993.
|
2021-11-27 17:41:42 +08:00 |
|
|
tianshujie
|
8bf6c34acd
|
* Modify the logic of planning related stories and bugs.
|
2021-11-26 13:37:15 +08:00 |
|
|
tianshujie
|
ba63ff33bf
|
* Transfer the stories and bugs of the parent plan to the child plan.
|
2021-11-25 18:22:29 +08:00 |
|
|
tianshujie
|
774ee347f5
|
* Translate modified code.
|
2021-11-25 17:57:24 +08:00 |
|
|
tianshujie
|
1d93fa0cd9
|
* Modify the scope of the linked plan when creating and editing stories.
|
2021-11-25 10:30:22 +08:00 |
|
|
zhujinyong
|
80010bb881
|
* Adjust batchEdit of story.
|
2021-11-23 19:46:35 +08:00 |
|
|
xieqiyu
|
aae0921d23
|
* Fix bug#16479.
|
2021-11-22 09:47:35 +08:00 |
|
|
wangjianhua
|
fa32609ca0
|
* Fix bug #16477和#16485
|
2021-11-19 08:31:58 +00:00 |
|
|
wangjianhua
|
1e57264ff4
|
* finish task 44491. Load branch lang before using.
|
2021-11-18 09:16:07 +00:00 |
|
|
wangjianhua
|
a1e07d2b4b
|
* Finish task 44491.
|
2021-11-17 13:55:59 +00:00 |
|
|
wangjianhua
|
f7a063e9ec
|
* Add branch name before product plan name in product list page.
|
2021-11-17 05:56:48 +00:00 |
|
|
tianshujie
|
5f6bc547a3
|
* Fix the problem of obtaining plan.
|
2021-11-11 14:15:06 +08:00 |
|
|
tianshujie
|
16251869b4
|
* Modify the SQL statement linked to the query story plan.
|
2021-11-11 09:10:38 +08:00 |
|
|
tianshujie
|
9e622a2995
|
* Merge conflicts.
|
2021-11-09 16:27:06 +08:00 |
|
|
李玉春
|
98f519fe31
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
# module/branch/model.php
# module/story/model.php
|
2021-11-09 07:53:17 +00:00 |
|
|
tianshujie
|
8e9dd74c0d
|
* Modify code logic.
|
2021-11-09 15:47:31 +08:00 |
|
|
tianshujie
|
5ab6fe77c2
|
* Modify code logic.
|
2021-11-09 14:21:17 +08:00 |
|
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|
|
tianshujie
|
0328182a47
|
* Modify the logic of the acquisition plan.
|
2021-11-05 17:19:41 +08:00 |
|
|
tianshujie
|
77da777064
|
* Finish task #43893.
|
2021-11-05 15:46:52 +08:00 |
|
|
hufangzhou
|
af5b6ff489
|
* Finish task #43899.
|
2021-11-04 11:48:22 +08:00 |
|