 liumengyi
|
9e5a0ff356
|
* Fix bug for task #59469.
|
2022-07-07 12:06:41 +08:00 |
|
|
liumengyi
|
eb6901ee34
|
* Fix bug #24949.
|
2022-07-07 10:29:37 +08:00 |
|
|
liumengyi
|
119175e5c9
|
* Fix bug #24942.
|
2022-07-07 10:28:57 +08:00 |
|
|
wangyidong
|
072945f180
|
* fix for tid.
|
2022-07-07 10:09:19 +08:00 |
|
|
孙广明
|
b5a365422f
|
* Code for pri error.
|
2022-07-07 09:57:20 +08:00 |
|
|
李玉春
|
c69b9e32d5
|
Merge branch 'cyy_gitea' into 'master'
Add Gitea module.
See merge request easycorp/zentaopms!4390
|
2022-07-07 01:56:40 +00:00 |
|
|
caoyanyi
|
ebbcfd3564
|
* Modify language.
|
2022-07-07 09:54:20 +08:00 |
|
|
caoyanyi
|
9dd1c4454c
|
* Adjust code.
|
2022-07-07 09:49:40 +08:00 |
|
|
王怡栋
|
5879801b8b
|
Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.
See merge request easycorp/zentaopms!4395
|
2022-07-07 01:49:35 +00:00 |
|
|
liumengyi
|
c8b30d557a
|
* Optimize code for task #59482.
|
2022-07-07 09:48:17 +08:00 |
|
|
caoyanyi
|
e794c59ce1
|
* Adjust codes.
|
2022-07-07 09:46:11 +08:00 |
|
|
liumengyi
|
59bbb4577a
|
* Finish task #59482.
|
2022-07-07 09:44:33 +08:00 |
|
|
caoyanyi
|
3ece68c081
|
* Modify user edit.
|
2022-07-07 09:42:50 +08:00 |
|
|
王怡栋
|
779e95fde9
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59546. Update create story and copy bug.
See merge request easycorp/zentaopms!4391
|
2022-07-07 01:40:11 +00:00 |
|
|
liumengyi
|
3049879a44
|
* Fix bug of task #59482.
|
2022-07-07 09:40:07 +08:00 |
|
|
wangyidong
|
ab72e9986c
|
Merge branch 'sprint212_leiyong_task_59528'
|
2022-07-07 09:38:40 +08:00 |
|
|
王怡栋
|
e7502f6641
|
Merge branch 'master' into 'sprint212_leiyong_task_59528'
# Conflicts:
# module/execution/css/create.css
|
2022-07-07 01:38:20 +00:00 |
|
|
王怡栋
|
2ca2192913
|
Merge branch 'fixbug_report' into 'master'
Fixbug report
See merge request easycorp/zentaopms!4393
|
2022-07-07 01:36:34 +00:00 |
|
|
刘刚
|
52da827d60
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24908.
See merge request easycorp/zentaopms!4394
|
2022-07-07 01:23:55 +00:00 |
|
|
daitingting
|
3bdeeea0f0
|
* Fix bug #24908.
|
2022-07-07 01:12:48 +00:00 |
|
|
caoyanyi
|
e05f1dbf6a
|
* Modify language.
|
2022-07-07 09:07:57 +08:00 |
|
|
xieqiyu
|
e10272248b
|
* Code for task#59546. Update create story and copy bug.
|
2022-07-07 09:06:33 +08:00 |
|
|
caoyanyi
|
1aa80a3989
|
* Modify tips.
|
2022-07-07 09:05:21 +08:00 |
|
|
sunjun
|
d9e6914e53
|
fixbug
|
2022-07-07 01:04:35 +00:00 |
|
|
孙广明
|
69fb98ef34
|
Merge branch 'sprint213_zg' into 'master'
* Adjust cfd style
See merge request easycorp/zentaopms!4388
|
2022-07-07 00:45:49 +00:00 |
|
|
caoyanyi
|
99fa5aaae3
|
* Add gitea module.
|
2022-07-07 08:29:46 +08:00 |
|
|
sunjun
|
de58643be7
|
fixbug
|
2022-07-06 14:33:20 +00:00 |
|
|
zenggang
|
93da33e08d
|
* Adjust cfd style
|
2022-07-06 09:38:39 +00:00 |
|
|
王怡栋
|
3e537ee455
|
Merge branch 'sprint/211_liumengyi_24910' into 'master'
* Fix bug #24910.
See merge request easycorp/zentaopms!4387
|
2022-07-06 09:23:47 +00:00 |
|
|
liumengyi
|
7c7a7689d6
|
* Fix bug #24910.
|
2022-07-06 17:23:17 +08:00 |
|
|
liumengyi
|
92fbca540e
|
* Fix bug #24910.
|
2022-07-06 17:20:54 +08:00 |
|
|
wangyidong
|
16663dee7f
|
* fix bug #24818.
|
2022-07-06 17:17:28 +08:00 |
|
|
刘刚
|
e7767459f2
|
Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10
See merge request easycorp/zentaopms!4385
|
2022-07-06 09:08:05 +00:00 |
|
|
孙广明
|
5a30bcc5fe
|
Merge branch 'sprint212_leiyong_task_59520' into 'master'
Sprint212 leiyong task 59520
See merge request easycorp/zentaopms!4341
|
2022-07-06 09:07:29 +00:00 |
|
|
孙广明
|
409a96c494
|
Merge branch 'sprint213_zg_24867' into 'master'
* Adjust cfd css
See merge request easycorp/zentaopms!4386
|
2022-07-06 09:05:57 +00:00 |
|
|
zenggang
|
4825e51b78
|
* Adjust cfd css
|
2022-07-06 09:04:56 +00:00 |
|
|
李玉春
|
0842185bfc
|
Merge branch 'cyy_repo' into 'master'
Cyy repo
See merge request easycorp/zentaopms!4376
|
2022-07-06 09:01:15 +00:00 |
|
|
孙广明
|
b7f59caaf9
|
Merge branch 'sprint/211_liumengyi_24892' into 'master'
* Fix bug #24892.
See merge request easycorp/zentaopms!4384
|
2022-07-06 08:46:39 +00:00 |
|
|
daitingting
|
e06b64e997
|
* Add fetchModule to distinguish rawModule.
|
2022-07-06 08:42:21 +00:00 |
|
|
liumengyi
|
3fd52a833f
|
* Fix bug #24892.
|
2022-07-06 16:33:53 +08:00 |
|
|
王怡栋
|
ee7f594ce0
|
Merge branch 'sprint/211_tianshujie_59476' into 'master'
Sprint/211 tianshujie 59476
See merge request easycorp/zentaopms!4383
|
2022-07-06 08:25:03 +00:00 |
|
|
liumengyi
|
73fe07dd49
|
* Finish task #59482.
|
2022-07-06 16:18:44 +08:00 |
|
|
caoyanyi
|
6c4a58b1a0
|
* Adjust codes.
|
2022-07-06 16:02:50 +08:00 |
|
|
tianshujie
|
4aaaa2be85
|
* Finish task #59476.
|
2022-07-06 15:56:48 +08:00 |
|
|
孙广明
|
ada3b47db7
|
Merge branch 'sprint/213_mayue_bug#24832' into 'master'
* Fix bug #24832.
See merge request easycorp/zentaopms!4382
|
2022-07-06 07:56:09 +00:00 |
|
|
mayue
|
fbb92627b8
|
* Fix bug #24832.
|
2022-07-06 15:51:28 +08:00 |
|
|
王怡栋
|
01e9f98e06
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #24785
See merge request easycorp/zentaopms!4381
|
2022-07-06 07:42:09 +00:00 |
|
|
lanzongjun
|
d664bc44b0
|
* fix bug #24785
|
2022-07-06 15:39:33 +08:00 |
|
|
tianshujie
|
2e74516127
|
* Finish task #59476.
|
2022-07-06 15:06:05 +08:00 |
|
|
liuruogu
|
5aabaa4c1e
|
* Fix bug #24782.
|
2022-07-06 07:03:56 +00:00 |
|