 liuyongkai
|
9455b09e17
|
* Resolve feedback #1459.
|
2022-11-28 14:55:02 +08:00 |
|
|
liuyongkai
|
64fb4c10ca
|
* Resolve feedback #1459.
|
2022-11-28 14:15:58 +08:00 |
|
|
mayue
|
fc4abe395d
|
* Fix bug #30096.
|
2022-11-24 16:10:19 +08:00 |
|
|
xieqiyu
|
37122bb5a8
|
* Fix bug#30056.
|
2022-11-23 09:34:21 +08:00 |
|
|
王怡栋
|
3852627523
|
* fix bug #29557.
|
2022-11-21 11:30:59 +08:00 |
|
|
xieqiyu
|
df629b33bf
|
* Fix bug#29940.
|
2022-11-17 11:08:59 +08:00 |
|
|
王怡栋
|
9e0c3de9da
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
change story
See merge request easycorp/zentaopms!6188
|
2022-11-16 07:26:11 +00:00 |
|
|
王怡栋
|
2bb3cd3371
|
Merge branch 'fixbug'
|
2022-11-16 13:08:00 +08:00 |
|
|
lanzongjun
|
9e0ac41d78
|
change story
|
2022-11-16 11:31:21 +08:00 |
|
|
tanghucheng
|
3ce0869e1a
|
* Replace '' to helper::dbIN for release linkStory.
|
2022-11-16 11:28:40 +08:00 |
|
|
tanghucheng
|
47398d1cf0
|
* Fix bug #29869.
|
2022-11-16 10:52:53 +08:00 |
|
|
lanzongjun
|
72c38e942e
|
add param
|
2022-11-15 13:39:09 +08:00 |
|
|
lanzongjun
|
4d4b1565f4
|
* finish task #75923#75924
|
2022-11-15 10:23:54 +08:00 |
|
|
lanzongjun
|
c512ab0d73
|
* finish task #75912
|
2022-11-14 17:06:33 +08:00 |
|
|
lanzongjun
|
991253d2a8
|
remove code
|
2022-11-14 14:48:18 +08:00 |
|
|
lanzongjun
|
d6c741c436
|
* finish task #75911
|
2022-11-14 14:35:55 +08:00 |
|
|
孙广明
|
ca3de7cc84
|
Merge branch 'lyk_feedback_1411' into 'master'
* Resolve feedback #1411.
See merge request easycorp/zentaopms!6121
|
2022-11-11 06:50:22 +00:00 |
|
|
liuyongkai
|
dd519c7587
|
* Resolve feedback #1411.
|
2022-11-11 13:02:26 +08:00 |
|
|
王怡栋
|
66b9e6b116
|
Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
# framework/base/router.class.php
|
2022-11-11 02:49:32 +00:00 |
|
|
wangyidong
|
8a178c72fe
|
* adjust for project release link story and bug.
|
2022-11-11 10:47:01 +08:00 |
|
|
孙广明
|
1a65c652fc
|
Merge branch 'master_xieqiyu_29483' into 'master'
* Fix bug#29483.
See merge request easycorp/zentaopms!6114
|
2022-11-11 01:41:38 +00:00 |
|
|
tianshujie
|
ea99f50a0a
|
* Fix bug #29361.
|
2022-11-11 09:36:10 +08:00 |
|
|
xieqiyu
|
318f8b7b31
|
* Fix bug#29483.
|
2022-11-11 01:32:38 +00:00 |
|
|
xieqiyu
|
53bde8fe9f
|
* Fix bug#29533.
|
2022-11-10 05:38:49 +00:00 |
|
|
tanghucheng
|
e09a070318
|
* Merge branch 'master' into transfer.
|
2022-11-09 15:44:42 +08:00 |
|
|
wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
|
liyuchun
|
7e02324b22
|
* Fix bug #27253.
|
2022-11-04 15:17:49 +08:00 |
|
|
wangyidong
|
7cd735d1e0
|
* code for task #28138.
|
2022-11-02 16:05:05 +08:00 |
|
|
wangyidong
|
4a0a5649a0
|
* adjust code.
|
2022-11-02 09:16:51 +08:00 |
|
|
wangyidong
|
9aea6ec0fe
|
* code for task #73995.
|
2022-11-01 16:38:26 +08:00 |
|
|
王怡栋
|
11fa395ed1
|
Merge branch 'master_feedback_1049' into 'master'
Master feedback 1049
See merge request easycorp/zentaopms!5944
|
2022-11-01 05:31:20 +00:00 |
|
|
wangyidong
|
40e20fa112
|
* code for task #74178.
|
2022-11-01 10:22:13 +08:00 |
|
|
liuhong
|
5c1b236833
|
* Adjust code #1049.
|
2022-10-31 09:56:23 +00:00 |
|
|
liuhong
|
f9e5e9858a
|
* Adjust code #1049 for story export.
|
2022-10-31 07:00:40 +00:00 |
|
|
王怡栋
|
afba980ce4
|
Merge branch 'bug_29103' into 'master'
* Fix bug #29103
See merge request easycorp/zentaopms!5946
|
2022-10-31 06:02:16 +00:00 |
|
|
zenggang
|
1af29a6aa6
|
* Fix bug #29103
|
2022-10-31 02:18:56 +00:00 |
|
|
liuhong
|
67ce1a86eb
|
* Resolved feedback #1301.
|
2022-10-31 01:49:23 +00:00 |
|
|
liuhong
|
07fd9dc9aa
|
* Fix feedback #1049.
|
2022-10-30 03:59:56 +00:00 |
|
|
孙广明
|
012a37a3ae
|
Merge branch 'feedback_zhouxin_981' into 'master'
* Resolve feedback #981.
See merge request easycorp/zentaopms!5908
|
2022-10-27 06:21:27 +00:00 |
|
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
|
zhouxin
|
98bf133f47
|
* Resolve feedback #981.
|
2022-10-27 10:13:21 +08:00 |
|
|
caoyanyi
|
fb5e0ec4f6
|
* Fix bug #28998.
|
2022-10-27 09:22:47 +08:00 |
|
|
Yagami
|
d0abde8930
|
* Code for zentaopms_250 bug.
|
2022-10-21 17:31:32 +08:00 |
|
|
王怡栋
|
b39c666128
|
Merge branch 'bug_28795' into 'master'
Bug 28795
See merge request easycorp/zentaopms!5858
|
2022-10-21 07:59:10 +00:00 |
|
|
曾刚
|
d2771a1dea
|
Bug 28795
|
2022-10-21 07:59:09 +00:00 |
|
|
xieqiyu
|
1a4bfe923e
|
* Fix bug#26953.
|
2022-10-21 14:58:17 +00:00 |
|
|
zenggang
|
64e958b0f5
|
* Fix bug#28676
|
2022-10-20 05:27:28 +00:00 |
|
|
Yagami
|
33bb2e6082
|
* Finish task #72672.
|
2022-10-19 10:47:30 +08:00 |
|
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
|
sunguangming
|
c5c22f0e3d
|
* Fix bug #28492.
|
2022-10-17 08:54:14 +08:00 |
|