 mayue
|
5f5cc8768e
|
* Fix bug #21904.
|
2022-04-21 15:04:59 +08:00 |
|
|
liumengyi
|
bdbf43362d
|
* Add unit test of branch.
|
2022-04-18 17:00:06 +08:00 |
|
|
孙华伟
|
a5d6663342
|
* Fix bug #20316.
|
2022-04-18 10:55:42 +08:00 |
|
|
xieqiyu
|
8aaaeafcb3
|
* Modify review code.
|
2022-04-07 17:22:15 +08:00 |
|
|
xieqiyu
|
1a59190992
|
* Fix bug#21550.
|
2022-04-07 17:09:41 +08:00 |
|
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
xieqiyu
|
9024dae71e
|
* Modify linked products when edit product.
|
2022-02-28 10:15:16 +08:00 |
|
|
xieqiyu
|
9fa66c3d0f
|
* Code for task#49304.
|
2022-02-24 14:40:14 +08:00 |
|
|
zhujinyong
|
b17c3c8206
|
* Move die to return print.
|
2022-02-22 08:42:32 +08:00 |
|
|
hufangzhou
|
44783c6933
|
* Fix bug #17999.
|
2021-12-27 18:08:09 +08:00 |
|
|
xieqiyu
|
1491db714d
|
* Fix bug: batch update branch.
|
2021-12-24 13:45:05 +08:00 |
|
|
孙广明
|
f5da2d8a21
|
Merge branch 'sprint/178_hufangzhou_mergeBranch' into 'master'
* Finish task #46096.
See merge request easycorp/zentaopms!1095
|
2021-12-23 03:32:01 +00:00 |
|
|
hufangzhou
|
e1075ca205
|
* Finish task #46096.
|
2021-12-23 11:29:51 +08:00 |
|
|
songchenxuan
|
a7258e471b
|
*Finish task #46100.
|
2021-12-22 14:28:28 +08:00 |
|
|
zhujinyong
|
42fc345e2a
|
Merge branch 'sprint/176_xieqiyu_mergeBranch'
|
2021-12-21 16:12:48 +08:00 |
|
|
hufangzhou
|
2809bc0b94
|
* Perfect details.
|
2021-12-21 15:42:26 +08:00 |
|
|
zhujinyong
|
5a1e31adf2
|
* Refactor getList of branch.
|
2021-12-21 14:53:05 +08:00 |
|
|
hufangzhou
|
872a8b2bbd
|
* Finish task #46096.
|
2021-12-21 14:30:38 +08:00 |
|
|
xieqiyu
|
b67911b304
|
* Pass the data of the merged branch.
|
2021-12-16 17:19:25 +08:00 |
|
|
xieqiyu
|
0b8fc53302
|
* Add function of change branch language.
|
2021-12-11 14:59:03 +08:00 |
|
|
mayue
|
63d4d3dad8
|
* Fix bug #16987.
|
2021-12-02 09:20:37 +08:00 |
|
|
mayue
|
a2dc25af7c
|
* Code format.
|
2021-12-01 15:02:12 +08:00 |
|
|
mayue
|
fc0834cadb
|
* Modify code #44987,44988,44989.
|
2021-12-01 14:58:20 +08:00 |
|
|
mayue
|
c62d599292
|
* Finish task #44987,44988,44989.
|
2021-12-01 10:44:38 +08:00 |
|
|
mayue
|
f92ba845a3
|
* Fix bug #16605.
|
2021-11-25 14:35:33 +08:00 |
|
|
zhengrunyu
|
2d168bf7e8
|
*Finish task 16602.
|
2021-11-24 11:00:21 +08:00 |
|
|
zhujinyong
|
80010bb881
|
* Adjust batchEdit of story.
|
2021-11-23 19:46:35 +08:00 |
|
|
hufangzhou
|
5492d27798
|
* Fix bug #16512.
|
2021-11-22 13:46:02 +08:00 |
|
|
李玉春
|
878b22f8ca
|
Merge branch 'sprint/170_songchenxuan_codeforbug' into 'sprint/170'
* Product->Setting Language item modification.
See merge request easycorp/zentaopms!444
|
2021-11-15 05:32:14 +00:00 |
|
|
songchenxuan
|
c2d3d4a24b
|
* Product->Setting Language item modification.
|
2021-11-15 09:42:16 +08:00 |
|
|
songchenxuan
|
9ae77a2765
|
* Product->Setting Language item modification.
|
2021-11-12 15:54:10 +08:00 |
|
|
liyuchun
|
0c7bcaf928
|
* Fix error of manage product.
|
2021-11-12 15:07:42 +08:00 |
|
|
xieqiyu
|
877ebd38ad
|
* Delete unused code.
|
2021-11-11 09:37:40 +08:00 |
|
|
xieqiyu
|
00ced21b19
|
* Optimize the code.
|
2021-11-11 09:34:30 +08:00 |
|
|
xieqiyu
|
d2685055cb
|
* Fix a bug.
|
2021-11-10 15:44:17 +08:00 |
|
|
xieqiyu
|
880f91a3d2
|
* Add duplicate name judgment.
|
2021-11-10 15:32:05 +08:00 |
|
|
xieqiyu
|
50b928ac9b
|
* Fix bug#16143.
|
2021-11-10 14:48:37 +08:00 |
|
|
xieqiyu
|
36b9634059
|
* Add duplicate name judgment.
|
2021-11-10 14:21:47 +08:00 |
|
|
李玉春
|
8165200c74
|
Merge branch 'sprint/170_xieqiyu_43920' into 'sprint/170'
Sprint/170 xieqiyu 43920
See merge request easycorp/zentaopms!378
|
2021-11-10 05:20:01 +00:00 |
|
|
xieqiyu
|
089238bd79
|
* Modify review questions.
|
2021-11-10 12:26:55 +08:00 |
|
|
xieqiyu
|
b185ef3ba9
|
* Batch edit one branch error.
|
2021-11-10 10:51:09 +08:00 |
|
|
xieqiyu
|
adaa7cd1d2
|
* Add dynamic when batch edit main branch.
|
2021-11-10 09:50:43 +08:00 |
|
|
xieqiyu
|
4f90b186ea
|
* Fix a bug: batch edit main branch error.
|
2021-11-10 09:37:59 +08:00 |
|
|
xieqiyu
|
76651524d9
|
* Add order.
|
2021-11-09 20:10:07 +08:00 |
|
|
xieqiyu
|
0a3dc10f4a
|
* Finish task#43905.
|
2021-11-09 19:46:08 +08:00 |
|
|
hufangzhou
|
9f77cc6fb6
|
* Finish task #43898.
|
2021-11-09 17:16:30 +08:00 |
|
|
xieqiyu
|
d889184204
|
* Finish task#43920.
|
2021-11-09 16:17:15 +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
|
eedcc1aed5
|
* Modify code logic.
|
2021-11-09 10:28:16 +08:00 |
|
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|