 王怡栋
|
d9d331c38e
|
Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
# framework/control.class.php
|
2022-05-10 08:46:32 +00:00 |
|
|
wangyuting2
|
fe3c882c5e
|
* Adjust buildin workflow menu.
|
2022-05-10 16:32:04 +08:00 |
|
|
孙广明
|
69d9ffe9ae
|
Merge branch 'task_sunjun_53672' into 'master'
*task_sunjun_53672
See merge request easycorp/zentaopms!3300
|
2022-05-10 08:28:14 +00:00 |
|
|
sunjun
|
6abe1812a0
|
task_sunjun_53672
|
2022-05-10 08:23:33 +00:00 |
|
|
孙广明
|
9d8f4b4f21
|
Merge branch 'task_sunjun_53665' into 'master'
sprint_sunjun_53665
See merge request easycorp/zentaopms!3306
|
2022-05-10 08:23:21 +00:00 |
|
|
sunjun
|
0a23be8a5b
|
task_sunjun_53672
|
2022-05-10 08:22:25 +00:00 |
|
|
sunjun
|
bf1f9172ff
|
tasj_sunjun_53665
|
2022-05-10 08:15:50 +00:00 |
|
|
sunjun
|
57b5a8a1c5
|
task_sunjun_53672
|
2022-05-10 08:13:05 +00:00 |
|
|
李玉春
|
25a2285ccc
|
Merge branch 'sprint_sunjun_53654' into 'master'
Sprint sunjun 53654
See merge request easycorp/zentaopms!3308
|
2022-05-10 07:43:55 +00:00 |
|
|
sunjun
|
14b9350a1c
|
sprint_sunjun_53654
|
2022-05-10 07:40:57 +00:00 |
|
|
sunjun
|
d88c1310b6
|
sprint_sunjun_53654
|
2022-05-10 07:37:12 +00:00 |
|
|
sunjun
|
631601a39b
|
sprint_sunjun_53665
|
2022-05-10 06:42:34 +00:00 |
|
|
王怡栋
|
e7ae63a1a0
|
Merge branch 'sprint/daitingting_buildoperatemenu_product' into 'master'
* Build operate menu for product.
See merge request easycorp/zentaopms!3304
|
2022-05-10 05:58:27 +00:00 |
|
|
wangyidong
|
c9bc2ba86f
|
* code for task #53592.
|
2022-05-10 13:48:37 +08:00 |
|
|
daitingting
|
deb8d170a7
|
* Build operate menu for product.
|
2022-05-10 05:44:25 +00:00 |
|
|
王怡栋
|
418a4580bb
|
Merge branch 'branch/workflow' into 'master'
Branch/workflow
See merge request easycorp/zentaopms!3302
|
2022-05-10 02:27:35 +00:00 |
|
|
daitingting
|
a71cf1d280
|
Merge branch 'branch/workflow' of https://gitlab.zcorp.cc/easycorp/zentaopms into branch/workflow
|
2022-05-10 01:44:47 +00:00 |
|
|
sunjun
|
84ad06f3ec
|
*task_sunjun_53672
|
2022-05-10 01:37:07 +00:00 |
|
|
zhouxudong
|
a5fe4b5387
|
* Fix bug.
|
2022-05-10 00:37:24 +00:00 |
|
|
王怡栋
|
5090da4280
|
Merge branch 'branch/workflow' into 'master'
#Do task # 53548 and task #53550.
See merge request easycorp/zentaopms!3296
|
2022-05-09 09:20:05 +00:00 |
|
|
wangyuting2
|
dceb7ba183
|
* Optimize code.
|
2022-05-09 17:09:24 +08:00 |
|
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
|
wangyuting2
|
a607161591
|
* Finish task #53549.
|
2022-05-09 17:00:41 +08:00 |
|
|
wangyuting2
|
19631c8b97
|
* Adjust return.
|
2022-05-09 16:14:53 +08:00 |
|
|
wangyuting2
|
e86f32df24
|
* Adjust feedback menu.
|
2022-05-09 15:58:02 +08:00 |
|
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +00:00 |
|
|
wangyuting2
|
73dce33bc3
|
* Adjust bug action menu.
|
2022-05-09 13:49:02 +08:00 |
|
|
wangyuting2
|
91366891f4
|
* Adjust bug action menu.
|
2022-05-09 13:46:59 +08:00 |
|
|
wangyuting2
|
219eb1060e
|
* Fix bug.
|
2022-05-09 13:38:21 +08:00 |
|
|
李玉春
|
bc3973b2fa
|
Merge branch 'cyy_22212' into 'master'
* Fix bug #22212.
See merge request easycorp/zentaopms!3286
|
2022-05-09 05:03:11 +00:00 |
|
|
wangyuting2
|
cc57fc819a
|
* Add buildOperateMenu for bug module.
|
2022-05-09 11:16:14 +08:00 |
|
|
wangyuting2
|
45ae4de775
|
* Do task 53548.
|
2022-05-09 09:20:01 +08:00 |
|
|
caoyanyi
|
f13ba3cf99
|
* Fix bug #22212.
|
2022-05-07 15:38:18 +08:00 |
|
|
王怡栋
|
274c0443f8
|
Merge branch 'sgm_fixbug' into 'master'
* Rename var.
See merge request easycorp/zentaopms!3276
|
2022-05-07 07:05:31 +00:00 |
|
|
孙广明
|
305a4074e4
|
* Rename var.
|
2022-05-07 13:50:02 +08:00 |
|
|
孙广明
|
192198a02f
|
Merge branch 'test_sunjun' into 'master'
test_sunjun
See merge request easycorp/zentaopms!3262
|
2022-05-07 02:03:09 +00:00 |
|
|
sunjun
|
3ceae4320f
|
test_sunjun
|
2022-05-07 01:41:38 +00:00 |
|
|
孙广明
|
6598915476
|
Merge branch 'liyuchun_unittest' into 'master'
* Add unit test.
See merge request easycorp/zentaopms!3261
|
2022-05-07 01:25:20 +00:00 |
|
|
liyuchun
|
bc11d6a8a0
|
* Add unit test.
|
2022-05-07 01:22:13 +00:00 |
|
|
孙广明
|
68c99f281f
|
Merge branch 'autotest_renying' into 'master'
Add weekly module auto test.
See merge request easycorp/zentaopms!3260
|
2022-05-07 00:41:04 +00:00 |
|
|
renying
|
a6d2780d2e
|
Add weekly module auto test.
|
2022-05-07 08:37:36 +08:00 |
|
|
李玉春
|
3bd94b2ed0
|
Merge branch 'testcase_tianshujie' into 'master'
* Add test case file.
See merge request easycorp/zentaopms!3259
|
2022-05-07 00:34:20 +00:00 |
|
|
tianshujie
|
95ae927251
|
* Add test case file.
|
2022-05-07 08:31:55 +08:00 |
|
|
wangyidong
|
8d1f35aaf9
|
* Add for git unit.
|
2022-05-06 17:33:43 +08:00 |
|
|
孙广明
|
ec76ee1daf
|
Merge branch 'testcase_zhouxin_1' into 'master'
* Add tsetcase for holiday.
See merge request easycorp/zentaopms!3256
|
2022-05-06 09:23:24 +00:00 |
|
|
zhouxin
|
d1ebd38016
|
* Add tsetcase for holiday.
|
2022-05-06 09:19:37 +00:00 |
|
|
hufangzhou
|
7833ed1ceb
|
* Fix an error for 15 version upgrading.
|
2022-05-06 14:44:22 +08:00 |
|
|
hufangzhou
|
90265f93d8
|
* Add the new version.
|
2022-05-06 13:48:21 +08:00 |
|
|
hufangzhou
|
bb3587b65b
|
* Fix bug #22153.
|
2022-05-05 17:33:46 +08:00 |
|