songchenxuan
|
8cd05d8301
|
* Finish task 44490.
|
2021-11-17 16:22:43 +08:00 |
|
songchenxuan
|
1dab48045e
|
* Finish task 44490.
|
2021-11-17 15:39:30 +08:00 |
|
李玉春
|
293f76a1ed
|
Merge branch 'sprint/170_songchenxuan_44601' into 'sprint/170'
* Fix bug 13756
See merge request easycorp/zentaopms!483
|
2021-11-17 05:25:38 +00:00 |
|
李玉春
|
bac9beeb27
|
Merge branch 'sprint/170_lizhiqiang_44499' into 'sprint/170'
Sprint/170 lizhiqiang 44499
See merge request easycorp/zentaopms!482
|
2021-11-17 05:10:33 +00:00 |
|
lizhiqiang
|
7d2daa9302
|
* Fix bug 16302
|
2021-11-17 11:09:55 +08:00 |
|
lizhiqiang
|
2dcd335698
|
* Fix bug 16302
|
2021-11-17 11:09:25 +08:00 |
|
李玉春
|
87597eccbb
|
Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170'
* Finish task #44493,44494.
See merge request easycorp/zentaopms!477
|
2021-11-17 02:33:33 +00:00 |
|
李玉春
|
e9847db1c1
|
Merge branch 'sprint/170_zhengrunyu_44501' into 'sprint/170'
*Finish task #44501.
See merge request easycorp/zentaopms!479
|
2021-11-17 02:29:52 +00:00 |
|
mayue
|
0dd5dd1955
|
* Finish task #44493,44494.
|
2021-11-17 10:27:02 +08:00 |
|
zhengrunyu
|
db4be7990d
|
*Finish task #44501.
|
2021-11-17 10:06:56 +08:00 |
|
mayue
|
8cce5342f4
|
* Finish task #44493,44494.
|
2021-11-17 09:35:30 +08:00 |
|
mayue
|
8b8c4fe180
|
* Finish task #44493,44494.
|
2021-11-17 09:30:34 +08:00 |
|
songchenxuan
|
4b42cb22a4
|
* Fix bug 13756
|
2021-11-17 09:26:02 +08:00 |
|
mayue
|
65ef0c6f1b
|
* Finish task #44493,44494.
|
2021-11-17 08:41:04 +08:00 |
|
mayue
|
102561019d
|
* Finish task #44493,44494.
|
2021-11-16 18:20:35 +08:00 |
|
songchenxuan
|
1578acc86d
|
* Fix bug 15828
|
2021-11-16 17:37:30 +08:00 |
|
songchenxuan
|
fe5c7a762e
|
* Fix bug 15828
|
2021-11-16 17:30:56 +08:00 |
|
mayue
|
7d496eebc2
|
* Finish task #44493,44494.
|
2021-11-16 17:05:03 +08:00 |
|
songchenxuan
|
626ff953ca
|
* Fix bug 15828
|
2021-11-16 16:47:00 +08:00 |
|
songchenxuan
|
515221aa5d
|
*Fix bug #15828
|
2021-11-16 16:03:37 +08:00 |
|
songchenxuan
|
cb3678fbf6
|
* Finish task 44492
|
2021-11-16 15:31:19 +08:00 |
|
songchenxuan
|
f262ca14d1
|
*Finish task 44492
|
2021-11-16 15:23:13 +08:00 |
|
songchenxuan
|
f495a6cb62
|
* Finish task 44492
|
2021-11-16 14:46:14 +08:00 |
|
songchenxuan
|
1079ebaec1
|
* Finish task 44492
|
2021-11-16 14:46:02 +08:00 |
|
孙广明
|
102d718ecf
|
Merge branch 'sprint/170' into 'sprint/170_zhengrunyu_44498'
# Conflicts:
# module/project/model.php
|
2021-11-16 05:47:29 +00:00 |
|
zhengrunyu
|
d5783e71b3
|
*Finish task #44498.
|
2021-11-16 13:43:05 +08:00 |
|
zhengrunyu
|
a76ec95e69
|
*Finish task #44498.
|
2021-11-16 13:09:51 +08:00 |
|
李玉春
|
b74f5ab258
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Fix bug #43916.
See merge request easycorp/zentaopms!465
|
2021-11-16 03:20:54 +00:00 |
|
zhouxin
|
b521b7f6d0
|
Fix bug.
|
2021-11-16 11:19:02 +08:00 |
|
zhouxin
|
dd5cf8c7bd
|
Fix bug #43916.
|
2021-11-15 19:15:20 +08:00 |
|
xieqiyu
|
bdb5d1ee01
|
* Fix bug#16297.
|
2021-11-15 16:51:12 +08:00 |
|
tianshujie
|
432ffc6602
|
* Fix bug #16303.
|
2021-11-15 16:27:30 +08:00 |
|
tianshujie
|
b175a5057b
|
* Fix bug #16293.
|
2021-11-15 16:13:51 +08:00 |
|
李玉春
|
8620758bfc
|
Merge branch 'sprint/170_tianshujie_16304' into 'sprint/170'
* Fix bug 16304.
See merge request easycorp/zentaopms!458
|
2021-11-15 07:54:25 +00:00 |
|
tianshujie
|
4bc73b9223
|
* Fix bug 16304.
|
2021-11-15 15:49:00 +08:00 |
|
李玉春
|
152326a33e
|
Merge branch 'sprint/170_songchenxuan_16297' into 'sprint/170'
* Fix bug #16297
See merge request easycorp/zentaopms!457
|
2021-11-15 07:09:54 +00:00 |
|
李玉春
|
182ab9a55b
|
Merge branch 'sprint/170_tianshujie_16296' into 'sprint/170'
* Fix bug #16296.
See merge request easycorp/zentaopms!455
|
2021-11-15 06:47:26 +00:00 |
|
songchenxuan
|
f77166bfb3
|
* Fix bug #16297
|
2021-11-15 14:47:13 +08:00 |
|
tianshujie
|
f849667ce3
|
* Fix bug #16296.
|
2021-11-15 14:36:48 +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 |
|
李玉春
|
ba6a2cd512
|
Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170'
Fix bug #16209.
See merge request easycorp/zentaopms!452
|
2021-11-15 05:23:45 +00:00 |
|
李玉春
|
1b2cf5ca09
|
Merge branch 'sprint/170_xieqiyu_upgrade' into 'sprint/170'
Sprint/170 xieqiyu upgrade
See merge request easycorp/zentaopms!453
|
2021-11-15 05:14:37 +00:00 |
|
xieqiyu
|
f6884fd700
|
* Modify comment.
|
2021-11-15 13:09:42 +08:00 |
|
xieqiyu
|
55e0e9591b
|
* Process branch and module when upgrade.
|
2021-11-15 13:07:07 +08:00 |
|
李玉春
|
a8523d317a
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.
See merge request easycorp/zentaopms!437
|
2021-11-15 05:05:00 +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 |
|
zhouxin
|
ccb98adb41
|
Fix bug #16209.
|
2021-11-15 10:44:29 +08:00 |
|
zhouxin
|
b5ab5a03d7
|
Finish task #43916.
|
2021-11-15 10:07:01 +08:00 |
|