 李玉春
|
0e26c165c2
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
pailei2_sunhuawei_50407
See merge request easycorp/zentaopms!2319
|
2022-03-17 01:31:38 +00:00 |
|
|
孙华伟
|
9270dbf6fa
|
*Fix bug #17639
|
2022-03-17 08:45:04 +08:00 |
|
|
李玉春
|
59ff30de9d
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407
See merge request easycorp/zentaopms!2265
|
2022-03-15 05:43:03 +00:00 |
|
|
孙华伟
|
a2d2db7b27
|
*Fix bug#17639
|
2022-03-15 13:21:14 +08:00 |
|
|
zhouxin
|
bfa1f3940d
|
Fix bug #19818.
|
2022-03-14 08:40:16 +00:00 |
|
|
李玉春
|
2ec1dd38b4
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
*fix bug#17639
See merge request easycorp/zentaopms!2237
|
2022-03-14 08:28:27 +00:00 |
|
|
孙华伟
|
951a3ab1af
|
*Fix bug#17639
|
2022-03-14 16:26:45 +08:00 |
|
|
孙华伟
|
60e271f10a
|
*fix bug#17639
|
2022-03-14 15:31:29 +08:00 |
|
|
李玉春
|
abad40f8f6
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407
See merge request easycorp/zentaopms!2196
|
2022-03-11 02:42:52 +00:00 |
|
|
孙华伟
|
38ddffdd3f
|
*
|
2022-03-11 10:39:39 +08:00 |
|
|
孙华伟
|
e4f3113301
|
*Fix bug#17639
|
2022-03-11 10:36:44 +08:00 |
|
|
孙华伟
|
1dd0399e02
|
*Fix bug #17639.
|
2022-03-11 08:33:09 +08:00 |
|
|
zhouxin
|
38ebc88fd5
|
Fix bug.
|
2022-03-10 03:20:19 +00:00 |
|
|
zhouxin
|
ccdcec9e32
|
Fix bug 50414.
|
2022-03-10 01:49:52 +00:00 |
|
|
tianshujie
|
5b2b646db3
|
* Fix bug #20328.
|
2022-03-04 16:29:56 +08:00 |
|
|
liumengyi
|
86d19f82f7
|
* Fix bug #20290.
|
2022-03-03 14:53:58 +08:00 |
|
|
liyuchun
|
adee975255
|
Merge branch 'sprint/sunhao/task49295'
|
2022-03-02 13:48:36 +08:00 |
|
|
tianshujie
|
1dafa1e8dd
|
* Fix bug #20228.
|
2022-03-02 09:26:39 +08:00 |
|
|
tianshujie
|
30600fb7bb
|
* Fix bug #20200.
|
2022-03-01 20:37:20 +08:00 |
|
|
Hao Sun
|
aa30172fea
|
* Task #49295, optimize UI for avatar.
|
2022-03-01 13:24:13 +08:00 |
|
|
王怡栋
|
44be255e67
|
* adjust task #49362 and check priv.
|
2022-03-01 11:23:44 +08:00 |
|
|
王怡栋
|
4f6834011c
|
* fix bug for revert team when edit project.
|
2022-02-28 14:21:45 +08:00 |
|
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
|
孙广明
|
7ba3ed1dfc
|
Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.
See merge request easycorp/zentaopms!1980
|
2022-02-25 05:26:24 +00:00 |
|
|
zhengrunyu
|
b641170d85
|
* Fix bug 19941 19923 19922 19787.
|
2022-02-25 11:01:31 +08:00 |
|
|
liumengyi
|
d605fd3f2d
|
* Modify project config edition.
|
2022-02-24 17:20:50 +08:00 |
|
|
liumengyi
|
9bd39c1e98
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:44:11 +08:00 |
|
|
songchenxuan
|
66bbe4cfbe
|
*Translate.
|
2022-02-24 16:31:58 +08:00 |
|
|
liumengyi
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15:08 +08:00 |
|
|
孙广明
|
4695a2bd83
|
Merge branch 'sprint/185_xieqiqyu_fixbug' into 'sprint/185'
* Fix bug#19974.
See merge request easycorp/zentaopms!1940
|
2022-02-24 05:04:34 +00:00 |
|
|
xieqiyu
|
76a66dd3e9
|
* Fix bug#19974.
|
2022-02-24 11:03:54 +08:00 |
|
|
孙广明
|
e6338d280e
|
Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.
See merge request easycorp/zentaopms!1936
|
2022-02-24 02:46:43 +00:00 |
|
|
zhangzilong
|
a9e3772439
|
* Finish task #49280.
|
2022-02-24 09:30:52 +08:00 |
|
|
xieqiyu
|
0678ee1fde
|
* Fix bug#19928.
|
2022-02-24 08:54:08 +08:00 |
|
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00:00 |
|
|
孙广明
|
47c48e68a2
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong
See merge request easycorp/zentaopms!1878
|
2022-02-22 07:53:22 +00:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
王怡栋
|
2c89a401d5
|
* code for task #49352 and fix error.
|
2022-02-22 13:29:07 +08:00 |
|
|
zhengrunyu
|
069f009b6d
|
*Finish task 49283
|
2022-02-17 14:34:11 +08:00 |
|
|
zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
liyuchun
|
0d16a79b63
|
* Fix bug #19323.
|
2022-02-15 08:22:25 +08:00 |
|
|
tanghucheng
|
ca0ac94d92
|
* code for task#49013.
|
2022-02-14 13:23:51 +08:00 |
|
|
tanghucheng
|
41e0b66473
|
* finish task #49013.
|
2022-02-14 13:17:56 +08:00 |
|
|
tanghucheng
|
c7fab53ed1
|
* finish task #49090.
|
2022-02-14 09:57:10 +08:00 |
|
|
tanghucheng
|
fd0ee50bbe
|
* Fix bug #19307.
|
2022-02-08 16:15:13 +08:00 |
|
|
xieqiyu
|
0b9e65b245
|
* Fix bug#18983.
|
2022-01-26 10:27:50 +08:00 |
|
|
tanghucheng
|
1f81f7cef8
|
* Fix projectlist.
|
2022-01-25 16:27:13 +08:00 |
|
|
liumengyi
|
b6b895bb87
|
* Modify how the creator is appended to team members.
|
2022-01-24 17:20:38 +08:00 |
|
|
liumengyi
|
30236e6a94
|
* Remove empty line.
|
2022-01-24 17:11:25 +08:00 |
|