 孙广明
|
bf107fc06e
|
Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish story #35409, #35408, #35407.
See merge request easycorp/zentaopms!4681
|
2022-07-27 07:04:41 +00:00 |
|
|
liumengyi
|
5551773576
|
* Finish story #35409, #35408, #35407.
|
2022-07-27 14:50:07 +08:00 |
|
|
孙广明
|
69ee2ea498
|
Merge branch 'sprint/220_tianshujie_issue' into 'master'
Sprint/220 tianshujie issue
See merge request easycorp/zentaopms!4678
|
2022-07-27 05:43:42 +00:00 |
|
|
孙广明
|
ec9ff2d44d
|
Merge branch 'sprint/220_liumengyi_fixissue' into 'master'
* Fix issue #695, #696.
See merge request easycorp/zentaopms!4675
|
2022-07-27 05:43:20 +00:00 |
|
|
孙广明
|
2e3f503d95
|
Merge branch 'sprint/hufangzhou_compatibleMax' into 'master'
* Compatible with zentaomax.
See merge request easycorp/zentaopms!4677
|
2022-07-27 05:43:07 +00:00 |
|
|
tianshujie
|
ca01a7540b
|
* Fix bug #25732.
|
2022-07-27 13:40:43 +08:00 |
|
|
hufangzhou
|
c4296b1b9f
|
* Compatible with zentaomax.
|
2022-07-27 13:35:06 +08:00 |
|
|
tianshujie
|
270618a38c
|
* Fix bug #25733.
|
2022-07-27 13:29:19 +08:00 |
|
|
tianshujie
|
21be27748f
|
* Fix bug #25745.
|
2022-07-27 13:12:37 +08:00 |
|
|
孙广明
|
61babc61a5
|
Merge branch 'sprint/scx_userapi' into 'master'
* Add User api param.
See merge request easycorp/zentaopms!4645
|
2022-07-27 05:10:22 +00:00 |
|
|
liumengyi
|
757a39e21b
|
* Fix issue #696.
|
2022-07-27 13:06:34 +08:00 |
|
|
liumengyi
|
0ba22df874
|
* Fix issue #695.
|
2022-07-27 13:06:12 +08:00 |
|
|
李玉春
|
1dd7771fdc
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_ZTF' into 'master'
* Add Icon ZTF
See merge request easycorp/zentaopms!4674
|
2022-07-27 03:46:14 +00:00 |
|
|
guofeilong
|
4f82de69c8
|
* Add Icon ZTF
|
2022-07-27 03:39:49 +00:00 |
|
|
tianshujie
|
6454cc7025
|
* Resolve issue #697.
|
2022-07-27 11:15:27 +08:00 |
|
|
李玉春
|
8e0a5d4eee
|
Merge branch 'cyy_git_tag' into 'master'
* Modify tag get.
See merge request easycorp/zentaopms!4670
|
2022-07-27 02:10:11 +00:00 |
|
|
王怡栋
|
0b87a710f1
|
Merge branch 'sprint/master_zhouxudong_25703' into 'master'
* Fix bug #25703.
See merge request easycorp/zentaopms!4673
|
2022-07-27 02:06:23 +00:00 |
|
|
王怡栋
|
8eb24df570
|
Merge branch 'sprint220_zg_61964' into 'master'
Sprint220 zg 61964
See merge request easycorp/zentaopms!4663
|
2022-07-27 02:05:06 +00:00 |
|
|
zenggang
|
4bd33b9cba
|
* Adjust code
|
2022-07-27 01:53:26 +00:00 |
|
|
zhouxudong
|
38ae663640
|
* Fix bug #25703.
|
2022-07-27 01:52:04 +00:00 |
|
|
孙广明
|
1ee14c99dc
|
Merge branch 'sprint/220_liumengyi_fixbug' into 'master'
* Fix bug for dynamic view.
See merge request easycorp/zentaopms!4672
|
2022-07-27 01:31:21 +00:00 |
|
|
zenggang
|
3897108473
|
* Adjust code
|
2022-07-27 01:23:11 +00:00 |
|
|
liumengyi
|
f9c408db4c
|
* Fix bug for dynamic view.
|
2022-07-27 09:20:58 +08:00 |
|
|
caoyanyi
|
a3a27c51ec
|
* Adjust code.
|
2022-07-27 08:56:35 +08:00 |
|
|
caoyanyi
|
a57bae6c2b
|
* Add language.
|
2022-07-27 08:52:56 +08:00 |
|
|
王怡栋
|
c6dc59a9e3
|
Merge branch 'master_xieqiyu_25708' into 'master'
* Fix bug#25708.
See merge request easycorp/zentaopms!4669
|
2022-07-27 00:52:01 +00:00 |
|
|
王怡栋
|
a5f04b97d5
|
Merge branch 'sprint/hufangzhou_docObjectID' into 'master'
* Modify the object id equal zero for custom type doc.
See merge request easycorp/zentaopms!4671
|
2022-07-27 00:51:43 +00:00 |
|
|
hufangzhou
|
4c7699178a
|
* Modify the object id equal zero for custom type doc.
|
2022-07-27 08:48:42 +08:00 |
|
|
caoyanyi
|
24d032fd92
|
* Modify tag get.
|
2022-07-27 08:48:08 +08:00 |
|
|
liyuchun
|
26cf62842d
|
Merge branch 'cyy_repo'
|
2022-07-27 00:32:59 +00:00 |
|
|
李玉春
|
8fe00ca4cd
|
Merge branch 'master' into 'cyy_repo'
# Conflicts:
# db/update17.3.sql
|
2022-07-27 00:31:56 +00:00 |
|
|
xieqiyu
|
94c72b04e1
|
* Fix bug#25708.
|
2022-07-27 08:29:42 +08:00 |
|
|
王怡栋
|
6b9c9c4893
|
Merge branch 'sprint/master_zhouxudong_25696' into 'master'
* Fix bug #25696.
See merge request easycorp/zentaopms!4664
|
2022-07-27 00:28:49 +00:00 |
|
|
caoyanyi
|
3b3bf589f9
|
* Adjust codes.
|
2022-07-27 08:27:57 +08:00 |
|
|
王怡栋
|
a62fc93df6
|
Merge branch 'sprint/hufangzhou_doc' into 'master'
* Finish task #62132, #62133, #62134, #62135, #62136.
See merge request easycorp/zentaopms!4668
|
2022-07-27 00:27:50 +00:00 |
|
|
caoyanyi
|
abd4b2aa6f
|
* Update sql.
|
2022-07-27 08:25:37 +08:00 |
|
|
caoyanyi
|
9c7ed724cc
|
* Adjust codes.
|
2022-07-27 08:24:21 +08:00 |
|
|
hufangzhou
|
8883ac8e77
|
* Finish task #62132, #62133, #62134, #62135, #62136.
|
2022-07-26 18:14:09 +08:00 |
|
|
王怡栋
|
82ff63f607
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_ZTF' into 'master'
* Add Icon ZTF and sub-review
See merge request easycorp/zentaopms!4667
|
2022-07-26 09:26:43 +00:00 |
|
|
王怡栋
|
f56ba3313d
|
Merge branch 'sprint/220_tianshujie_burn' into 'master'
*Fix bug #25712.
See merge request easycorp/zentaopms!4666
|
2022-07-26 09:26:31 +00:00 |
|
|
guofeilong
|
91de8f2459
|
* Add Icon ZTF and sub-review
|
2022-07-26 09:22:44 +00:00 |
|
|
tianshujie
|
a84a4098e9
|
* Fix bug #25721.
|
2022-07-26 17:18:35 +08:00 |
|
|
wangyidong
|
ba89545efb
|
* fix bug.
|
2022-07-26 17:11:33 +08:00 |
|
|
tianshujie
|
a2f203990e
|
* Fixed burnout chart display in execution list.
|
2022-07-26 17:05:13 +08:00 |
|
|
zhouxudong
|
3e842a6316
|
* Fix bug #25696.
|
2022-07-26 08:53:24 +00:00 |
|
|
zenggang
|
0baf0d5fda
|
* Finish task#62107
|
2022-07-26 08:51:47 +00:00 |
|
|
caoyanyi
|
3e484a6087
|
* Modify code pull.
|
2022-07-26 16:33:10 +08:00 |
|
|
caoyanyi
|
228898dd1b
|
* Modify repo url.
|
2022-07-26 16:22:10 +08:00 |
|
|
王怡栋
|
f4b971d877
|
Merge branch 'sprint/220_liumengyi_25699' into 'master'
* Fix bug #25699, #25700.
See merge request easycorp/zentaopms!4661
|
2022-07-26 08:16:38 +00:00 |
|
|
caoyanyi
|
c10c25b84d
|
* Modify branch get.
|
2022-07-26 16:16:17 +08:00 |
|