songchenxuan
|
6667a3c19a
|
*Fix reactive bug.
|
2022-01-11 14:45:19 +08:00 |
|
zhujinyong
|
891686e8f9
|
* Fix ztest init.
|
2022-01-11 13:55:01 +08:00 |
|
zhujinyong
|
4ae737da92
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-01-11 12:33:22 +08:00 |
|
zhujinyong
|
7599836f3b
|
+ Add processor of zentao test.
|
2022-01-11 12:32:57 +08:00 |
|
孙广明
|
aa1a28a20c
|
Merge branch 'Fixbug_zhengrunyu' into 'master'
*Fix bug 18290.
See merge request easycorp/zentaopms!1338
|
2022-01-11 03:18:33 +00:00 |
|
zhengrunyu
|
919ea9d8d0
|
*Fix bug 18290.
|
2022-01-11 10:28:33 +08:00 |
|
孙广明
|
770e577102
|
Merge branch 'sprint/182_tianshujie_47314' into 'master'
* Fix bug #47314.
See merge request easycorp/zentaopms!1335
|
2022-01-11 02:10:43 +00:00 |
|
tianshujie
|
378abd8527
|
* Modify variable name.
|
2022-01-11 10:09:40 +08:00 |
|
tianshujie
|
4a5ec8d84b
|
* Modify variable name.
|
2022-01-11 10:06:47 +08:00 |
|
tianshujie
|
0c50201fa6
|
* Modify the code logic.
|
2022-01-11 10:04:48 +08:00 |
|
tianshujie
|
fc081f1d21
|
* Modify the code logic.
|
2022-01-11 10:03:22 +08:00 |
|
孙广明
|
db61688b9f
|
Merge branch '180_mayue_js' into 'master'
* Fix compatibility issues.
See merge request easycorp/zentaopms!1336
|
2022-01-11 01:59:49 +00:00 |
|
mayue
|
d68eb433fe
|
* Fix compatibility issues.
|
2022-01-11 09:57:03 +08:00 |
|
tianshujie
|
353d85ed86
|
* Delete code.
|
2022-01-11 09:42:11 +08:00 |
|
tianshujie
|
0755e5a4af
|
* Add comment of kanban model file.
|
2022-01-11 09:39:40 +08:00 |
|
tianshujie
|
eac960afe5
|
* Fix bug #47314.
|
2022-01-11 09:38:21 +08:00 |
|
孙广明
|
0abf6e40db
|
Merge branch '180_hufangzhou_package' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!1334
|
2022-01-11 01:21:03 +00:00 |
|
hufangzhou
|
d0cfa7531e
|
* Add the new version.
|
2022-01-11 09:19:47 +08:00 |
|
孙广明
|
76b750f955
|
Merge branch 'sprint/182_liumengyi_18293' into 'master'
* Fix bug #18293.
See merge request easycorp/zentaopms!1333
|
2022-01-11 00:56:24 +00:00 |
|
liumengyi
|
dc8da347b6
|
* Fix bug #18293.
|
2022-01-11 08:54:15 +08:00 |
|
孙广明
|
cf15aa2f19
|
Merge branch 'sprint/182_tianshujie_bugmodule' into 'master'
* Change the die of the bug module to return print.
See merge request easycorp/zentaopms!1330
|
2022-01-11 00:50:39 +00:00 |
|
孙广明
|
3598466d9b
|
Merge branch 'sprint/182_tianshujie_47309' into 'master'
* Fix bug #47309.
See merge request easycorp/zentaopms!1332
|
2022-01-11 00:48:28 +00:00 |
|
tianshujie
|
0176c8689a
|
* Fix bug #47309.
|
2022-01-11 08:47:17 +08:00 |
|
王怡栋
|
9f778e38b5
|
Merge branch 'revert-3e9bcdb8' into 'master'
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
See merge request easycorp/zentaopms!1328
|
2022-01-11 00:43:35 +00:00 |
|
王怡栋
|
19fc483611
|
Merge branch 'revert-b904bc3c' into 'master'
Revert "Merge branch 'sgm_182db' into 'master'"
See merge request easycorp/zentaopms!1329
|
2022-01-11 00:41:01 +00:00 |
|
王怡栋
|
1e50b1b3e4
|
Merge branch 'revert-db968165' into 'master'
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
See merge request easycorp/zentaopms!1331
|
2022-01-11 00:40:34 +00:00 |
|
孙广明
|
1cae18380b
|
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
|
2022-01-11 00:39:37 +00:00 |
|
孙广明
|
9a744f651a
|
Revert "Merge branch 'sgm_182db' into 'master'"
This reverts merge request !1325
|
2022-01-11 00:38:36 +00:00 |
|
孙广明
|
3ab13aa61e
|
Merge branch 'sprint/182_songchenxuan_action_lang' into 'master'
*Case action lang.
See merge request easycorp/zentaopms!1322
|
2022-01-11 00:36:32 +00:00 |
|
孙广明
|
b57562e99e
|
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
|
2022-01-11 00:35:04 +00:00 |
|
songchenxuan
|
bb13431274
|
*Fix bug 18074.
|
2022-01-11 08:34:55 +08:00 |
|
李玉春
|
b904bc3c58
|
Merge branch 'sgm_182db' into 'master'
* Add upgrade.sql.
See merge request easycorp/zentaopms!1325
|
2022-01-11 00:11:48 +00:00 |
|
tianshujie
|
1c28a0462f
|
* Change the die of the bug module to return print.
|
2022-01-11 08:09:13 +08:00 |
|
zhujinyong
|
80765f894d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-01-10 21:13:52 +08:00 |
|
zhujinyong
|
f3e681c99f
|
* Add testTask table for update0.sql.
|
2022-01-10 21:12:04 +08:00 |
|
孙广明
|
714471e03b
|
Merge branch 'sprint/182_liumengyi_47483' into 'master'
* Finish task #47483.
See merge request easycorp/zentaopms!1327
|
2022-01-10 09:40:44 +00:00 |
|
liumengyi
|
cc3c90291d
|
* Finish task #47483.
|
2022-01-10 17:32:31 +08:00 |
|
孙广明
|
3e9bcdb892
|
Merge branch 'sprint/182_hufangzhou_47331' into 'master'
* Finish task #47331.
See merge request easycorp/zentaopms!1326
|
2022-01-10 09:21:23 +00:00 |
|
hufangzhou
|
0b9e2c0fa3
|
* Finish task #47331.
|
2022-01-10 17:18:18 +08:00 |
|
孙广明
|
ff6b122f3a
|
* Add upgrade.sql.
|
2022-01-10 16:46:02 +08:00 |
|
孙广明
|
db9681654b
|
Merge branch 'sprint/182_hufangzhou_47330' into 'master'
* Finish task #47330.
See merge request easycorp/zentaopms!1324
|
2022-01-10 08:36:39 +00:00 |
|
hufangzhou
|
075ac6efc5
|
* Adjust the lang item order.
|
2022-01-10 15:58:01 +08:00 |
|
hufangzhou
|
63226a2e84
|
* Finish task #47330.
|
2022-01-10 15:45:24 +08:00 |
|
孙广明
|
489c06ddb3
|
Merge branch 'sprint/182_tianshujie_18289' into 'master'
* Fix bug #18289.
See merge request easycorp/zentaopms!1323
|
2022-01-10 07:43:45 +00:00 |
|
tianshujie
|
0601474a78
|
* Fix bug #18289.
|
2022-01-10 15:41:24 +08:00 |
|
songchenxuan
|
721cdba3d3
|
*Case action lang.
|
2022-01-10 14:11:28 +08:00 |
|
孙广明
|
3c2fe9e87f
|
Merge branch 'tianshujie_fixBug' into 'master'
* Fix bug #18287.
See merge request easycorp/zentaopms!1321
|
2022-01-10 05:35:22 +00:00 |
|
tianshujie
|
1ee5fb522f
|
* Fix bug #18287.
|
2022-01-10 12:15:19 +08:00 |
|
李玉春
|
f08514b544
|
Merge branch 'devops18_18277' into 'master'
* Fix bug#18277
See merge request easycorp/zentaopms!1316
zentaopms_16.1_20220110
|
2022-01-10 00:46:09 +00:00 |
|
孙广明
|
6ef3c5018e
|
Merge branch 'sprint/liyuchun_devops18' into 'master'
* Fix bug #18264.
See merge request easycorp/zentaopms!1319
|
2022-01-10 00:44:48 +00:00 |
|