 李玉春
|
2b94fe3a83
|
Merge branch 'cyy_mr' into 'zenops_36'
* Modify repo id save.
See merge request easycorp/zentaopms!4058
|
2022-06-22 05:03:50 +00:00 |
|
|
caoyanyi
|
2d96651ad9
|
* Modify repo id save.
|
2022-06-22 11:57:02 +08:00 |
|
|
李玉春
|
9ac2f27b24
|
Merge branch 'zenops36_zhouxin_57655' into 'zenops_36'
* Finish task #57655.
See merge request easycorp/zentaopms!4054
|
2022-06-22 02:58:37 +00:00 |
|
|
zhouxin
|
4cf1630ae3
|
* Adjust code.
|
2022-06-22 02:55:18 +00:00 |
|
|
zhouxin
|
46cef64035
|
* Add badge.
|
2022-06-22 02:48:36 +00:00 |
|
|
zhouxin
|
a29205235b
|
* Finish task #57655.
|
2022-06-22 01:23:19 +00:00 |
|
|
李玉春
|
cbed1964c2
|
Merge branch 'cyy_devops' into 'zenops_36'
* Finish task #57665.
See merge request easycorp/zentaopms!4027
|
2022-06-22 00:35:31 +00:00 |
|
|
caoyanyi
|
7813db6bd3
|
* Adjust codes.
|
2022-06-22 08:34:40 +08:00 |
|
|
孙广明
|
c099327b2e
|
Merge branch 'liyuchun_57657' into 'zenops_36'
* Show default branch.
See merge request easycorp/zentaopms!4038
|
2022-06-21 06:35:04 +00:00 |
|
|
liyuchun
|
6076785841
|
* Show default branch.
|
2022-06-21 05:37:24 +00:00 |
|
|
孙广明
|
ec56ff2eb7
|
Merge branch 'liyuchun_57657' into 'zenops_36'
* Finish task #57657.
See merge request easycorp/zentaopms!4036
|
2022-06-21 05:12:36 +00:00 |
|
|
liyuchun
|
76c813efc9
|
* Finish task #57657.
|
2022-06-21 03:25:51 +00:00 |
|
|
caoyanyi
|
4bd3805ae9
|
* Add css file.
|
2022-06-21 11:05:31 +08:00 |
|
|
caoyanyi
|
dfbf69a211
|
* Finish task #57664.
|
2022-06-21 10:33:12 +08:00 |
|
|
孙广明
|
413a9bd667
|
Merge branch 'liyuchun_task_57656' into 'zenops_36'
* Finish task #57656.
See merge request easycorp/zentaopms!4017
|
2022-06-20 08:59:06 +00:00 |
|
|
liyuchun
|
76a318cb30
|
* Finish task #57656.
|
2022-06-20 06:10:33 +00:00 |
|
|
caoyanyi
|
e138da8508
|
* Finish task #57665.
|
2022-06-20 13:02:32 +08:00 |
|
|
王怡栋
|
946d5cb782
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766
See merge request easycorp/zentaopms!4015
|
2022-06-20 03:18:59 +00:00 |
|
|
王怡栋
|
233d78e4b7
|
Merge branch 'fixbug' into 'master'
* Fix bug #23908,23888.
See merge request easycorp/zentaopms!4016
|
2022-06-20 03:18:37 +00:00 |
|
|
lanzongjun
|
6786b4d08c
|
* fix bug #23932
|
2022-06-20 11:17:34 +08:00 |
|
|
tanghucheng
|
09268cfe23
|
* Fix bug .
|
2022-06-20 10:50:54 +08:00 |
|
|
lanzongjun
|
2c49643589
|
* fix bug #23766
|
2022-06-20 09:40:46 +08:00 |
|
|
lanzongjun
|
898bb949c1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-06-20 09:30:53 +08:00 |
|
|
zhujinyong
|
c2bff85082
|
* Fix fail of ciresult.
|
2022-06-20 08:50:47 +08:00 |
|
|
孙广明
|
11c5cd1999
|
Merge branch 'sprint/sunhao/apps_loading_state'
|
2022-06-18 00:10:31 +08:00 |
|
|
Hao Sun
|
584bf73577
|
* update zui lib.
|
2022-06-17 15:54:16 +00:00 |
|
|
Hao Sun
|
ef0f9634be
|
* add loading indicator on loading apps.
|
2022-06-17 15:35:36 +00:00 |
|
|
孙广明
|
4f9388e5e6
|
Merge branch 'sprint/sunhao/optimize_program_list' into 'master'
* fix table with nested option not work as expected.
See merge request easycorp/zentaopms!4013
|
2022-06-17 15:24:25 +00:00 |
|
|
Hao Sun
|
a8d212e213
|
* fix table with nested option not work as expected.
|
2022-06-17 15:18:08 +00:00 |
|
|
王怡栋
|
619c03be5d
|
Merge branch 'sgm_fixbug' into 'master'
* Code for product order.
See merge request easycorp/zentaopms!4012
|
2022-06-17 08:26:27 +00:00 |
|
|
孙广明
|
9ac3ed7851
|
* Code for product order.
|
2022-06-17 16:23:46 +08:00 |
|
|
王怡栋
|
e2439f2a5c
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23891.
See merge request easycorp/zentaopms!4011
|
2022-06-17 08:19:30 +00:00 |
|
|
孙广明
|
6ff93fcc13
|
Merge branch 'sprint/sunhao/optimize_program_list' into 'master'
* optimize program list, support to preserve nested state.
See merge request easycorp/zentaopms!4010
|
2022-06-17 08:06:58 +00:00 |
|
|
Hao Sun
|
72d4c854d3
|
* prevent user move row by click a link.
|
2022-06-17 07:39:03 +00:00 |
|
|
Hao Sun
|
775746df0a
|
* optimize program list, support to preserve nested state.
|
2022-06-17 07:31:51 +00:00 |
|
|
lanzongjun
|
3b7adad82e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-06-17 15:29:36 +08:00 |
|
|
tanghucheng
|
9d92db9900
|
* Fix bug #23891.
|
2022-06-17 15:25:12 +08:00 |
|
|
孙广明
|
642b518397
|
Merge branch 'codeReview' into 'master'
codeReview
See merge request easycorp/zentaopms!4004
|
2022-06-17 07:11:23 +00:00 |
|
|
sunjun
|
ca2b45736b
|
codeReview
|
2022-06-17 07:04:52 +00:00 |
|
|
孙广明
|
960ce0c856
|
Merge branch 'sprint/204_tianshujie_23918' into 'master'
* Fix bug #23918.
See merge request easycorp/zentaopms!4009
|
2022-06-17 07:00:20 +00:00 |
|
|
tianshujie
|
d95a2fee68
|
* Fix bug #23918.
|
2022-06-17 14:59:22 +08:00 |
|
|
孙广明
|
998064caf0
|
Merge branch 'sprint/203_mayue_bug#23868' into 'master'
* Fix bug #23868.
See merge request easycorp/zentaopms!4008
|
2022-06-17 06:56:27 +00:00 |
|
|
mayue
|
2295ee69d5
|
* Fix bug #23868.
|
2022-06-17 14:55:25 +08:00 |
|
|
孙广明
|
16dd9ad238
|
Merge branch 'sprint/fixbug_liumengyi' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!4007
|
2022-06-17 06:21:22 +00:00 |
|
|
孙广明
|
6d815e5c33
|
Merge branch 'sprint202_leiyong_fix_bug_23874' into 'master'
* Adjust CSS.
See merge request easycorp/zentaopms!4006
|
2022-06-17 06:15:47 +00:00 |
|
|
孙广明
|
0a00dfe217
|
Merge branch 'sprint/203_mayue_bug#23865#23869' into 'master'
* Fix bug #23865#23869.
See merge request easycorp/zentaopms!4000
|
2022-06-17 06:15:36 +00:00 |
|
|
liumengyi
|
4961913efe
|
* Optimize code.
|
2022-06-17 14:15:33 +08:00 |
|
|
mayue
|
49db5d2b2e
|
* Fix bug #23870#23868.
|
2022-06-17 14:12:47 +08:00 |
|
|
李玉春
|
6429293b82
|
Merge branch 'zhouxin_codereview' into 'master'
* Code for review.
See merge request easycorp/zentaopms!4001
|
2022-06-17 05:38:33 +00:00 |
|
|
leiyong
|
eb6e217f3c
|
* Adjust CSS.
|
2022-06-17 05:21:40 +00:00 |
|