 王怡栋
|
2b8a51de68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 15:48:07 +08:00 |
|
|
王怡栋
|
c16478c5d0
|
* fix for upgrade from lower version.
|
2021-12-03 15:47:39 +08:00 |
|
|
孙广明
|
8d72bedc6d
|
Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Fixbug 17066.
See merge request easycorp/zentaopms!769
|
2021-12-03 07:27:07 +00:00 |
|
|
王怡栋
|
16bb344a1f
|
Merge branch 'sprint/174_xieqiyu_17075' into 'master'
* Fix bug#17075.
See merge request easycorp/zentaopms!770
|
2021-12-03 06:50:05 +00:00 |
|
|
xieqiyu
|
a944ec7ccd
|
* Fix bug#17075.
|
2021-12-03 14:46:12 +08:00 |
|
|
王怡栋
|
7344486770
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 13:54:05 +08:00 |
|
|
zhengrunyu
|
d5f6181ea3
|
*Fixbug 17066.
|
2021-12-03 13:53:53 +08:00 |
|
|
王怡栋
|
9cf38e4ff8
|
* adjust for projectOverview.
|
2021-12-03 13:53:50 +08:00 |
|
|
孙广明
|
acf95daf8a
|
Merge branch 'sprint/174_hufangzhou_17065' into 'master'
* Fix bug #17065.
See merge request easycorp/zentaopms!768
|
2021-12-03 05:35:30 +00:00 |
|
|
hufangzhou
|
e76a988bbe
|
* Fix bug #17065.
|
2021-12-03 13:25:51 +08:00 |
|
|
李玉春
|
0f2ea93509
|
Merge branch 'devops_16884' into 'master'
* Fix bug#16884,16856
See merge request easycorp/zentaopms!758
|
2021-12-03 05:22:07 +00:00 |
|
|
liyuchun
|
8c83a45cd3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 13:21:23 +08:00 |
|
|
liyuchun
|
0c888e8dff
|
Merge branch 'sprint/174_xieqiyu_45015'
|
2021-12-03 13:20:29 +08:00 |
|
|
xieqiyu
|
47f1099039
|
* Fix bug#17061.
|
2021-12-03 13:09:22 +08:00 |
|
|
李玉春
|
f0f0325a8d
|
Merge branch 'master' into 'sprint/174_xieqiyu_45015'
# Conflicts:
# module/testcase/control.php
|
2021-12-03 05:07:19 +00:00 |
|
|
李玉春
|
3455ec3004
|
Merge branch 'sprint/174_xieqiyu_17022' into 'master'
* Add judgment on null parameters.
See merge request easycorp/zentaopms!740
|
2021-12-03 05:05:42 +00:00 |
|
|
zhujinyong
|
d73d395995
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 12:37:58 +08:00 |
|
|
zhujinyong
|
e660a67e40
|
* Fix product api.
|
2021-12-03 12:37:45 +08:00 |
|
|
xieqiyu
|
5d5045a4dd
|
* Adjust code for import form lib.
|
2021-12-03 12:30:30 +08:00 |
|
|
zenggang
|
f619cf0341
|
* Adjust mr view button
|
2021-12-03 03:09:37 +00:00 |
|
|
李玉春
|
671cf2a8fa
|
Merge branch 'sprint/174_sunhao/bug16878' into 'master'
* Bug 16878, fix layout when open execution/task in iframe modal.
See merge request easycorp/zentaopms!765
|
2021-12-03 02:57:22 +00:00 |
|
|
liyuchun
|
c919c8105d
|
* Adjust code style.
|
2021-12-03 10:56:55 +08:00 |
|
|
xieqiyu
|
e61c87a6ff
|
* Code for task#45015.
|
2021-12-03 10:49:42 +08:00 |
|
|
李玉春
|
26056ba15b
|
Merge branch 'devops_16736' into 'master'
* Fix bug#16736,17037,16844
See merge request easycorp/zentaopms!766
|
2021-12-03 02:25:07 +00:00 |
|
|
孙广明
|
87c7acdf03
|
Merge branch 'sprint/175_liyuchun_45162' into 'master'
* Finish task #45154.
See merge request easycorp/zentaopms!762
|
2021-12-03 02:11:49 +00:00 |
|
|
孙广明
|
fd0e67494d
|
Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Fixbug .
See merge request easycorp/zentaopms!767
|
2021-12-03 02:11:31 +00:00 |
|
|
zhengrunyu
|
cda9cdf969
|
*Fixbug .
|
2021-12-03 10:04:54 +08:00 |
|
|
zhujinyong
|
fc9fe1ac84
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 10:01:17 +08:00 |
|
|
zhujinyong
|
861e92107c
|
+ Add user type for api.
|
2021-12-03 10:01:01 +08:00 |
|
|
zenggang
|
4b53f349df
|
* Fix bug#16736,17037,16844
|
2021-12-03 01:59:04 +00:00 |
|
|
李玉春
|
0d9f5197af
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug #17051.
See merge request easycorp/zentaopms!764
|
2021-12-03 01:57:35 +00:00 |
|
|
Hao Sun
|
42a1cdc0b4
|
* Bug 16878, fix layout when open execution/task in iframe modal.
|
2021-12-03 09:56:11 +08:00 |
|
|
孙广明
|
ae50871336
|
* Fix style.
|
2021-12-03 09:55:21 +08:00 |
|
|
王怡栋
|
096f679282
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 09:54:44 +08:00 |
|
|
王怡栋
|
caab069444
|
* add system mode for config.
|
2021-12-03 09:54:28 +08:00 |
|
|
孙广明
|
fe3e96de2d
|
* Fix bug #17051.
|
2021-12-03 09:46:58 +08:00 |
|
|
李玉春
|
87769894a6
|
Merge branch 'sprint/174_hufangzhou_17038' into 'master'
* Fix bug #17038.
See merge request easycorp/zentaopms!754
|
2021-12-03 01:46:39 +00:00 |
|
|
xieqiyu
|
346b0cf9e2
|
* Finish task#45015.
|
2021-12-03 09:35:36 +08:00 |
|
|
liyuchun
|
c39512c79e
|
* Finish task #45154.
|
2021-12-03 09:33:35 +08:00 |
|
|
王怡栋
|
3c276c75f5
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 09:26:27 +08:00 |
|
|
王怡栋
|
2837dc322c
|
* adjust for classic mode and fix bug.
|
2021-12-03 09:25:44 +08:00 |
|
|
孙广明
|
32ec141d3d
|
Merge branch 'sprint/devops_liyuchun_bug' into 'master'
* Adjust style.
See merge request easycorp/zentaopms!750
|
2021-12-03 01:04:19 +00:00 |
|
|
孙广明
|
27a25ed019
|
Merge branch 'sprint/174_tianshujie_17025' into 'master'
* Fix bug #17025.
See merge request easycorp/zentaopms!761
|
2021-12-03 01:03:41 +00:00 |
|
|
朱金勇
|
789a419696
|
Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'
* Support for using kanban in old browsers without CSS flex.
See merge request easycorp/zentaopms!757
|
2021-12-03 00:50:26 +00:00 |
|
|
tianshujie
|
90b385d022
|
* Fix bug #17025.
|
2021-12-03 08:45:02 +08:00 |
|
|
李玉春
|
acf728eb91
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!756
|
2021-12-03 00:26:35 +00:00 |
|
|
zenggang
|
42a5e9bf78
|
* Fix bug#16884,16856
|
2021-12-02 09:32:45 +00:00 |
|
|
Hao Sun
|
3230cff401
|
* fix kanban not work in ie.
|
2021-12-02 17:03:41 +08:00 |
|
|
孙广明
|
24c613bba9
|
* Fix bug.
|
2021-12-02 17:01:33 +08:00 |
|
|
孙广明
|
1c61d0c57a
|
Merge branch 'sprint/174_tianshujie_17050' into 'master'
* Fix bug #17050.
See merge request easycorp/zentaopms!755
|
2021-12-02 08:58:47 +00:00 |
|