 王怡栋
|
bcc8081925
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-25 14:23:40 +08:00 |
|
|
王怡栋
|
39327b4b8f
|
* code for task #44940,44941,44942,44943,44944,44945.
|
2021-11-25 14:22:26 +08:00 |
|
|
朱金勇
|
8cdf02366c
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
* Add the branch switcher in tree browse page.
See merge request easycorp/zentaopms!614
|
2021-11-25 05:05:20 +00:00 |
|
|
hufangzhou
|
e431847c58
|
* Add the branch switcher in tree browse page.
|
2021-11-25 12:22:56 +08:00 |
|
|
王怡栋
|
385cb41a0e
|
* code for task #44938.
|
2021-11-25 11:35:46 +08:00 |
|
|
zhujinyong
|
49bff6df49
|
* Fix router of api.
|
2021-11-25 10:26:17 +08:00 |
|
|
王怡栋
|
9a80f35962
|
Merge branch 'sprint/app10'
|
2021-11-25 10:25:05 +08:00 |
|
|
李玉春
|
a83f2d8ce9
|
Merge branch 'sprint/174_mayue_16605' into 'master'
* Fix bug #16605.
See merge request easycorp/zentaopms!613
|
2021-11-25 01:55:23 +00:00 |
|
|
mayue
|
c2c13a9079
|
* Fix bug #16605.
|
2021-11-25 09:53:49 +08:00 |
|
|
mayue
|
c40360d556
|
* Fix bug #16605.
|
2021-11-25 09:43:34 +08:00 |
|
|
王怡栋
|
fb8ff15c2a
|
Merge branch 'sprint/170_package_bug'
|
2021-11-25 08:34:16 +08:00 |
|
|
王怡栋
|
d589065650
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-11-25 08:34:08 +08:00 |
|
|
王怡栋
|
d9ee0bfbf7
|
Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
# module/mr/model.php
|
2021-11-25 00:32:52 +00:00 |
|
|
王怡栋
|
eec4c536f5
|
Merge branch 'sprint/170' into 'master'
Sprint/170
See merge request easycorp/zentaopms!611
|
2021-11-25 00:31:51 +00:00 |
|
|
tianshujie
|
179e766478
|
* Modify function name.
|
2021-11-24 16:45:08 +08:00 |
|
|
王怡栋
|
57c6ae78a8
|
* adjust for search.
|
2021-11-24 14:24:35 +08:00 |
|
|
hufangzhou
|
97d1a037dd
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug
|
2021-11-24 11:26:46 +08:00 |
|
|
hufangzhou
|
4e2cda3a82
|
* Fix an error for edit story.
|
2021-11-24 11:26:43 +08:00 |
|
|
zhengrunyu
|
2d168bf7e8
|
*Finish task 16602.
|
2021-11-24 11:00:21 +08:00 |
|
|
songchenxuan
|
838c8c8efb
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug
|
2021-11-24 10:52:13 +08:00 |
|
|
hufangzhou
|
c1792262cf
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug
|
2021-11-24 10:51:57 +08:00 |
|
|
hufangzhou
|
cb78fa20e1
|
* Modify the nav in edit story.
|
2021-11-24 10:51:54 +08:00 |
|
|
songchenxuan
|
7fc99d65fd
|
* Fix bug 16696.
|
2021-11-24 10:51:49 +08:00 |
|
|
xieqiyu
|
0c633c71d6
|
* Fix a bug:There is an error on the suite use case page.
|
2021-11-24 10:22:12 +08:00 |
|
|
xieqiyu
|
ccb9327c5a
|
* Fix bug#16565.
|
2021-11-24 10:11:54 +08:00 |
|
|
hufangzhou
|
7d50d0bb9a
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug
|
2021-11-24 10:04:55 +08:00 |
|
|
hufangzhou
|
f15477ae01
|
* Fix an error of modules in product module for batch edit story.
|
2021-11-24 10:04:52 +08:00 |
|
|
xieqiyu
|
501e80ddf2
|
* Fix bug#16606.
|
2021-11-24 10:03:09 +08:00 |
|
|
songchenxuan
|
fc0e55a418
|
* Fix bug #16656.
|
2021-11-24 10:00:59 +08:00 |
|
|
hufangzhou
|
c6e999ecdc
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug
|
2021-11-24 09:52:51 +08:00 |
|
|
hufangzhou
|
76392d18b4
|
* Fix an error for batch edit story.
|
2021-11-24 09:52:49 +08:00 |
|
|
songchenxuan
|
77d7e7c440
|
* Fix bug #16655,16656,16657.
|
2021-11-24 09:41:39 +08:00 |
|
|
hufangzhou
|
3cbdfdcb6f
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug
|
2021-11-24 09:38:23 +08:00 |
|
|
hufangzhou
|
6f4e21aed1
|
* Code for bug #16578.
|
2021-11-24 09:38:21 +08:00 |
|
|
songchenxuan
|
ea45481a2a
|
* Fix bug #16654.
|
2021-11-24 09:24:17 +08:00 |
|
|
songchenxuan
|
55b762b8b9
|
* Fix bug #16654.
|
2021-11-24 09:09:06 +08:00 |
|
|
zhujinyong
|
0d520d03d3
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug
|
2021-11-23 19:47:10 +08:00 |
|
|
zhujinyong
|
80010bb881
|
* Adjust batchEdit of story.
|
2021-11-23 19:46:35 +08:00 |
|
|
朱金勇
|
5b84227610
|
Merge branch 'spring/170_xiawenlong' into 'sprint/170'
* Fix code error
See merge request easycorp/zentaopms!603
|
2021-11-23 11:16:20 +00:00 |
|
|
xiawenlong
|
ace43eb90d
|
* Fix code error
|
2021-11-23 19:11:03 +08:00 |
|
|
xieqiyu
|
15867e4fd3
|
* Fix bug#16638.
|
2021-11-23 19:05:34 +08:00 |
|
|
zhouxin
|
2b3df26fd8
|
Fix bug 16564.
|
2021-11-23 18:47:56 +08:00 |
|
|
zhengrunyu
|
16873a8154
|
*Finish task #16619.
|
2021-11-23 17:50:26 +08:00 |
|
|
tianshujie
|
e4f00ca20e
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug
|
2021-11-23 17:39:03 +08:00 |
|
|
tianshujie
|
d8d277842b
|
* Fix bug #16549.
|
2021-11-23 17:38:43 +08:00 |
|
|
xieqiyu
|
35bdfa9376
|
* Fix bug#16565.
|
2021-11-23 17:33:10 +08:00 |
|
|
songchenxuan
|
049ae60320
|
* Fix bug #16642.
|
2021-11-23 17:30:37 +08:00 |
|
|
songchenxuan
|
6922251f39
|
* Fix bug 16596.
|
2021-11-23 15:48:27 +08:00 |
|
|
zhengrunyu
|
4f67ffed05
|
*Fix bug #16547.
|
2021-11-23 15:39:58 +08:00 |
|
|
songchenxuan
|
ce4def0174
|
Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug
|
2021-11-23 15:36:17 +08:00 |
|