 孙广明
|
575d9e098f
|
Merge branch 'sprint/175_zry_fixbug' into 'master'
Sprint/175 zry fixbug
See merge request easycorp/zentaopms!733
|
2021-12-02 03:22:23 +00:00 |
|
|
王怡栋
|
b043ff0772
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-02 10:55:40 +08:00 |
|
|
王怡栋
|
bf16167b19
|
* Support for flow.
|
2021-12-02 10:55:04 +08:00 |
|
|
李玉春
|
b1cd56f4b3
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079
See merge request easycorp/zentaopms!715
|
2021-12-02 02:53:09 +00:00 |
|
|
zhengrunyu
|
0a7b5b0efc
|
* Code for kanban.
|
2021-12-02 10:10:20 +08:00 |
|
|
王怡栋
|
f25d797b54
|
* adjust for flow.
|
2021-12-02 10:06:02 +08:00 |
|
|
zhengrunyu
|
79ce6537df
|
* Code for kanban.
|
2021-12-02 09:53:41 +08:00 |
|
|
xieqiyu
|
3755502cf5
|
* Fix bug : Unit test product drop-down error.
|
2021-12-02 09:12:50 +08:00 |
|
|
zhujinyong
|
8ee3e5ce16
|
Merge branch 'sprint/168_sunhao/task45145'
|
2021-12-01 11:32:08 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
Hao Sun
|
39a2d7296b
|
* refactor pages with kanban lib.
|
2021-11-30 14:21:24 +08:00 |
|
|
孙广明
|
801c9ce3d0
|
Merge branch 'sprint/169' into sprint/168
|
2021-11-30 13:47:05 +08:00 |
|
|
李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
|
zhujinyong
|
e86878e5c6
|
* Fix tree of product and branch.
|
2021-11-25 14:49:15 +08:00 |
|
|
tianshujie
|
4f4a1f990b
|
* Modify the logic of changing branches in stories.
|
2021-11-25 11:28:50 +08:00 |
|
|
tianshujie
|
600e4fdbba
|
* Fix bug #16576,16576.
|
2021-11-23 14:45:20 +08:00 |
|
|
王怡栋
|
90a913ca4b
|
Merge branch 'sprint/170'
|
2021-11-22 16:59:40 +08:00 |
|
|
zhouxin
|
1f47ec43c9
|
.
|
2021-11-22 16:15:37 +08:00 |
|
|
zhouxin
|
1d2ce49b24
|
Add comment.
|
2021-11-22 15:58:14 +08:00 |
|
|
zhouxin
|
cf29cfdca7
|
Delete a kongge.
|
2021-11-22 15:23:52 +08:00 |
|
|
zhouxin
|
72f57c6f01
|
Fix bug 16468.
|
2021-11-22 15:19:22 +08:00 |
|
|
zhouxin
|
7ec2b00493
|
Fix bug 16468.
|
2021-11-22 14:48:19 +08:00 |
|
|
wangjianhua
|
fa32609ca0
|
* Fix bug #16477和#16485
|
2021-11-19 08:31:58 +00:00 |
|
|
liyuchun
|
a240c9aa23
|
* Fix bug #16426,#16393.
|
2021-11-18 23:17:15 +08:00 |
|
|
Hao Sun
|
c2b944d7e9
|
* adjust table layout for english environment.
|
2021-11-18 17:08:02 +08:00 |
|
|
Hao Sun
|
759533f592
|
* task #44364, improve layout for page product/all.
|
2021-11-18 16:45:11 +08:00 |
|
|
Hao Sun
|
2a3c7922ab
|
* improve UI for product table list.
|
2021-11-18 15:21:55 +08:00 |
|
|
wangjianhua
|
dcb971c040
|
* Finish task 44491.
|
2021-11-18 02:39:03 +00:00 |
|
|
liyuchun
|
9362f0941a
|
* Adjust code for task #44730.
|
2021-11-16 16:30:41 +08:00 |
|
|
liyuchun
|
412fbb2305
|
* Finish task #44370.
|
2021-11-16 16:25:00 +08:00 |
|
|
xieqiyu
|
cce14cef80
|
* Fix bug#16188.
|
2021-11-14 10:47:12 +08:00 |
|
|
李玉春
|
2ff4571f77
|
Merge branch 'sprint/170_hufangzhou_16169' into 'sprint/170'
* Fix bug #16169, bug#16179.
See merge request easycorp/zentaopms!412
|
2021-11-11 08:32:14 +00:00 |
|
|
mayue
|
c9996a26ec
|
* Fix bug #16191.
|
2021-11-11 15:54:22 +08:00 |
|
|
hufangzhou
|
4163d17335
|
* Fix bug #16169, bug#16179.
|
2021-11-11 15:31:37 +08:00 |
|
|
mayue
|
af83e8a639
|
* Resolve display of list Settings #43892.
|
2021-11-11 13:56:02 +08:00 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|
|
mayue
|
5ca0c7972e
|
* Fix bug #15835.
|
2021-11-03 11:24:51 +08:00 |
|
|
root
|
0a6a4d2e1d
|
sovle bug 15467
|
2021-11-01 09:39:07 +08:00 |
|
|
root
|
6db04fa88e
|
bug_15467
|
2021-11-01 09:29:45 +08:00 |
|
|
mayue
|
217927ce09
|
* Fix a bug #15835.
|
2021-10-29 14:47:21 +08:00 |
|
|
孙广明
|
968c53b3ab
|
Merge branch 'sprint/169_tanghucheng_43541' into 'sprint/169'
Finish task #43541
See merge request easycorp/zentaopms!186
|
2021-10-27 09:00:41 +00:00 |
|
|
tanghucheng
|
82d42ca24a
|
* Finish task #43541.
|
2021-10-27 16:37:30 +08:00 |
|
|
tanghucheng
|
4ea309a73d
|
* Finish task #43541.
|
2021-10-27 16:30:56 +08:00 |
|
|
tanghucheng
|
a0d22615b8
|
Merge branch 'sprint/169_tanghucheng_43541' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169_tanghucheng_43541
|
2021-10-27 16:19:24 +08:00 |
|
|
tanghucheng
|
635f4e1c35
|
* Finish task #43541.
|
2021-10-27 16:14:35 +08:00 |
|
|
tanghucheng
|
d2cca97b50
|
* Finish task #43541.
|
2021-10-27 14:19:38 +08:00 |
|
|
李玉春
|
ee48738da8
|
Merge branch 'sprint/169_tianshujie_43540' into 'sprint/169'
* Fix bug #43540.
See merge request easycorp/zentaopms!174
|
2021-10-27 06:10:09 +00:00 |
|
|
tianshujie
|
9fac2ea22e
|
* Fix bug #43540.
|
2021-10-27 13:50:27 +08:00 |
|
|
zenggang
|
51531e1e6b
|
* Fix bug#15488
|
2021-10-26 09:39:25 +00:00 |
|