 lizhiqiang
|
2dcd335698
|
* Fix bug 16302
|
2021-11-17 11:09:25 +08:00 |
|
|
李玉春
|
e8af2d25bc
|
Merge branch 'sprint/170_songchenxuan_44500' into 'sprint/170'
*Fix bug #15828
See merge request easycorp/zentaopms!473
|
2021-11-16 09:38:14 +00: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 |
|
|
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 |
|
|
李玉春
|
3fadaad6ec
|
Merge branch 'sprint/170_songchenxuan_44492' into 'sprint/170'
* Finish task 44492
See merge request easycorp/zentaopms!472
|
2021-11-16 07:33:20 +00:00 |
|
|
songchenxuan
|
cb3678fbf6
|
* Finish task 44492
|
2021-11-16 15:31:19 +08:00 |
|
|
李玉春
|
33ff51254b
|
Merge branch 'sprint/170_songchenxuan_44492' into 'sprint/170'
Sprint/170 songchenxuan 44492
See merge request easycorp/zentaopms!471
|
2021-11-16 07:24:16 +00: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 |
|
|
孙广明
|
f18441ad73
|
Merge branch 'sprint/170_zhengrunyu_44498' into sprint/170
|
2021-11-16 13:47:49 +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
zentaopms_15.8.beta1_20211116
|
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 |
|
|
李玉春
|
b0d992a335
|
Merge branch 'sprint/170_xieqiyu_16297' into 'sprint/170'
* Fix bug#16297.
See merge request easycorp/zentaopms!463
|
2021-11-15 08:53:43 +00:00 |
|
|
xieqiyu
|
bdb5d1ee01
|
* Fix bug#16297.
|
2021-11-15 16:51:12 +08:00 |
|
|
李玉春
|
3342b38f9e
|
Merge branch 'sprint/170_tianshujie_16303' into 'sprint/170'
* Fix bug #16303.
See merge request easycorp/zentaopms!462
|
2021-11-15 08:36:58 +00:00 |
|
|
tianshujie
|
432ffc6602
|
* Fix bug #16303.
|
2021-11-15 16:27:30 +08:00 |
|
|
李玉春
|
eee668f6d9
|
Merge branch 'sprint/170_tianshujie_16293' into 'sprint/170'
* Fix bug #16293.
See merge request easycorp/zentaopms!461
|
2021-11-15 08:18:02 +00: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 |
|
|
李玉春
|
46ce0e09e8
|
Merge branch 'sprint/170_songchenxuan_bug' into 'sprint/170'
* Product-Settings-Branch/platform-Language item
See merge request easycorp/zentaopms!454
|
2021-11-15 05:46:24 +00: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 |
|
|
李玉春
|
4719289333
|
Merge branch 'sprint/170_tianshujie_16248' into 'sprint/170'
* Fix bug #16248.
See merge request easycorp/zentaopms!450
|
2021-11-15 02:04:36 +00:00 |
|
|
tianshujie
|
17ee3c0980
|
* Fix bug #16248.
|
2021-11-15 09:55:18 +08:00 |
|
|
songchenxuan
|
c2d3d4a24b
|
* Product->Setting Language item modification.
|
2021-11-15 09:42:16 +08:00 |
|
|
李玉春
|
dbf8840697
|
Merge branch 'sprint/170_mayue_16223' into 'sprint/170'
* Fix bug #16223.
See merge request easycorp/zentaopms!449
|
2021-11-15 01:40:34 +00:00 |
|
|
李玉春
|
ca0f02be21
|
Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'
* Fix bug #16179.
See merge request easycorp/zentaopms!448
|
2021-11-15 01:35:56 +00:00 |
|
|
hufangzhou
|
12054383a6
|
* Fix bug #16179.
|
2021-11-15 09:28:58 +08:00 |
|
|
mayue
|
92c5221f26
|
* Fix bug #16223.
|
2021-11-15 09:08:40 +08:00 |
|