 hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
|
hufangzhou
|
44783c6933
|
* Fix bug #17999.
|
2021-12-27 18:08:09 +08:00 |
|
|
hufangzhou
|
4b2890c766
|
* Add the new version.
|
2021-12-24 15:01:04 +08:00 |
|
|
xieqiyu
|
1491db714d
|
* Fix bug: batch update branch.
|
2021-12-24 13:45:05 +08:00 |
|
|
xieqiyu
|
c9eaa1cb0d
|
* Add a period.
|
2021-12-24 09:51:07 +08:00 |
|
|
hufangzhou
|
5a8966c8e8
|
* Fix bug #17903.
|
2021-12-23 17:28:29 +08:00 |
|
|
hufangzhou
|
897f930f48
|
* Adjust the merge branch page style.
|
2021-12-23 14:01:25 +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 |
|
|
孙广明
|
7bdb0499e9
|
Merge branch 'master' into 'sprint/178_songchenxuan_46100'
# Conflicts:
# module/productplan/view/batchedit.html.php
# module/productplan/view/browse.html.php
|
2021-12-23 02:46:03 +00:00 |
|
|
songchenxuan
|
a7258e471b
|
*Finish task #46100.
|
2021-12-22 14:28:28 +08:00 |
|
|
hufangzhou
|
5b0923a7a3
|
* Resolve the issue of merge branch.
|
2021-12-22 10:07:18 +08:00 |
|
|
hufangzhou
|
10c2f33c2b
|
* Adjust the issue of merge branch.
|
2021-12-22 08:50:42 +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
|
b300ca39da
|
* Change branch language for manage.
|
2021-12-16 11:09:02 +08:00 |
|
|
hufangzhou
|
f02ca7df03
|
* Code for task #45756.
|
2021-12-15 08:40:25 +08:00 |
|
|
xieqiyu
|
0b8fc53302
|
* Add function of change branch language.
|
2021-12-11 14:59:03 +08:00 |
|
|
xieqiyu
|
5472859d6e
|
* Code for task#45536.
|
2021-12-11 14:28:45 +08:00 |
|
|
hufangzhou
|
6eeaa44aa0
|
* Fix bug #17077.
|
2021-12-06 08:58:58 +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 |
|
|
mayue
|
63d4d3dad8
|
* Fix bug #16987.
|
2021-12-02 09:20:37 +08:00 |
|
|
xieqiyu
|
3755502cf5
|
* Fix bug : Unit test product drop-down error.
|
2021-12-02 09:12:50 +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 |
|
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
|
mayue
|
f92ba845a3
|
* Fix bug #16605.
|
2021-11-25 14:35:33 +08:00 |
|
|
mayue
|
36afb288d6
|
* Fix bug #16605.
|
2021-11-25 13:31:35 +08:00 |
|
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
|
mayue
|
c40360d556
|
* Fix bug #16605.
|
2021-11-25 09:43:34 +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 |
|
|
songchenxuan
|
9be4ee136f
|
* Fix bug #16560.
|
2021-11-23 15:35:21 +08:00 |
|
|
hufangzhou
|
6d03387d4b
|
* Add the new version.
|
2021-11-22 16:48:28 +08:00 |
|
|
hufangzhou
|
5492d27798
|
* Fix bug #16512.
|
2021-11-22 13:46:02 +08:00 |
|
|
zhouxin
|
b8783ecd5c
|
Fix bug 16408.
|
2021-11-18 17:32:02 +08:00 |
|
|
zhouxin
|
e55bc34ee6
|
Fix bug 16408.
|
2021-11-18 16:26:29 +08:00 |
|
|
孙广明
|
66dd543027
|
Merge branch 'sprint/170_zhengrunyu_44597' into 'sprint/170'
*Finish task #44597.
See merge request easycorp/zentaopms!492
|
2021-11-18 00:58:13 +00:00 |
|
|
zhengrunyu
|
f47e855649
|
*Finish task #44597.
|
2021-11-17 17:25:37 +08:00 |
|
|
zhengrunyu
|
36d7e664e6
|
*Finish task #44597.
|
2021-11-17 16:20:54 +08:00 |
|
|
songchenxuan
|
73b5f5e057
|
* Product-Settings-Branch/platform-Language item
|
2021-11-15 13:44:26 +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
|
de30e9216d
|
* Product->Setting Language item modification.
|
2021-11-15 11:03:54 +08:00 |
|
|
songchenxuan
|
7cebe10e8d
|
* Product->Setting Language item modification.
|
2021-11-15 10:55:24 +08: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 |
|