Commit Graph
41302 Commits
Author SHA1 Message Date
zhouxin 79e71b2d41 * Fix bug #31668. 2023-01-16 14:38:54 +08:00
wangyidong bf1130cff7 * fix bug for create linked2revision action. 2023-01-13 17:39:02 +08:00
孙广明 9554414096 Merge branch 'master_bug_27671' into 'master'
* Fix bug #27671.

See merge request easycorp/zentaopms!6766
2023-01-13 08:35:07 +00:00
孙广明 8b77fc9886 Merge branch 'master_bug_29324' into 'master'
* Fix bug #29324

See merge request easycorp/zentaopms!6767
2023-01-13 08:34:58 +00:00
孔令茂 4c9f01a9e1 Fix feedback #1967, when import record ge 100 sub task error. 2023-01-13 07:51:19 +00:00
liuhong 2f57e614d4 * Fix bug #29324 2023-01-13 07:15:23 +00:00
王怡栋 14948a345e Merge branch 'bug_31517' into 'master'
* Fix bug#31517

See merge request easycorp/zentaopms!6762
2023-01-13 07:11:47 +00:00
zenggang b1208305a1 * Adjust code 2023-01-13 07:09:43 +00:00
王怡栋 6b33586e1e Merge branch 'sprint/weibufeedback' into 'master'
* Fix can bypass permissions.

See merge request easycorp/zentaopms!6765
2023-01-13 07:08:23 +00:00
王怡栋 879b06b074 Merge branch 'feedback_1954' into 'master'
* Resolve feedback#1954

See merge request easycorp/zentaopms!6763
2023-01-13 07:07:42 +00:00
王怡栋 7b83232b17 Merge branch 'zenops_46' into 'master'
Merge Zenops 46 into master

See merge request easycorp/zentaopms!6759
2023-01-13 07:05:17 +00:00
liuhong 2b48e98222 * Fix bug #27671. 2023-01-13 06:47:07 +00:00
chaideqing 971133f23d * Fix can bypass permissions. 2023-01-13 06:39:03 +00:00
孙广明 a696740a96 Merge branch 'sprint/tsj_uinttest' into 'master'
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6757
2023-01-13 06:13:21 +00:00
孙广明 b21a9be30e Merge branch 'master_bug_28243' into 'master'
* Fix bug #28243.

See merge request easycorp/zentaopms!6761
2023-01-13 06:12:56 +00:00
caoyanyi 5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00
liuhong fe80314c6a * Fix bug #30816. 2023-01-13 03:29:21 +00:00
zenggang d31c104de2 * Resolve feedback#1954 2023-01-13 03:28:34 +00:00
caoyanyi c1fa0b85fe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-13 10:56:17 +08:00
caoyanyi 32174bfc47 * Modify block style. 2023-01-13 10:55:23 +08:00
caoyanyi 0eea47c282 * Modify help block style. 2023-01-13 10:53:26 +08:00
zenggang 37dc5793e0 * Fix bug#31517 2023-01-13 02:12:24 +00:00
liuhong 90b524a6d9 * Fix bug #28243. 2023-01-13 02:12:01 +00:00
xieqiyu 584c57e313 * Fix bug#31345. 2023-01-12 16:15:57 +08:00
xieqiyu 9dd04c346f * Fix bug#31502. 2023-01-12 15:26:00 +08:00
zhaoke c0ba60ebbc Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-12 07:16:48 +00:00
zhaoke f00c7584f5 * Hide status title when export finish. 2023-01-12 07:16:45 +00:00
tanghucheng 52014f1f41 * Fix bug #31489. 2023-01-12 13:40:02 +08:00
tanghucheng f499e9e4af * Remove init operation for zahost and zanode. 2023-01-12 13:22:03 +08:00
tanghucheng a9d3a9dcc7 * Fix bug #31410. 2023-01-12 13:16:30 +08:00
tanghucheng c26848670d * Fix bug #31487. 2023-01-12 13:06:36 +08:00
zhaoke 4b1bb58383 * Fix bug #31421. 2023-01-12 05:00:46 +00:00
zhaoke 55ad3049c7 * Fix bug #31421. 2023-01-12 05:00:31 +00:00
zhaoke 5dc9bd80d5 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-12 03:20:10 +00:00
zhaoke bf95108952 * Fix bug #31432. 2023-01-12 03:20:06 +00:00
tanghucheng 749c884c45 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-12 11:02:19 +08:00
tanghucheng a82e54a830 * Fix bug #31522. 2023-01-12 11:01:38 +08:00
zhaoke 66dccf3bc6 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-12 02:59:12 +00:00
zhaoke ef650485ee * Fix bug #31493 2023-01-12 02:59:08 +00:00
caoyanyi a5067b43ef * Modify gogs code clone. 2023-01-12 10:54:50 +08:00
tanghucheng f64ccc30d8 * Fix bug #31540. 2023-01-12 10:48:50 +08:00
tanghucheng 9383d497de Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-12 10:30:00 +08:00
caoyanyi 7b0dd36f82 * Add test case. 2023-01-12 10:06:45 +08:00
zhaoke f665030cb1 * Finish task #82697. 2023-01-11 09:46:57 +00:00
xieqiyu 7e5bcb8182 * Fix bug#31478. 2023-01-11 16:46:54 +08:00
xieqiyu 9bd57aa0d4 * Fix bug#31581. 2023-01-11 15:59:30 +08:00
xieqiyu 03a227dbe6 * Fix bug#31506. 2023-01-11 15:47:47 +08:00
孙广明 0762cfa0ca Merge branch 'master_bug_30830' into 'master'
* Fix bug #30830.

See merge request easycorp/zentaopms!6735
2023-01-11 05:27:15 +00:00
王怡栋 c5bd66918f Merge branch 'bugfix/importWorkflowFiledError' into 'master'
* Reloved feedback #1940 , import error if field is extend by workflow.

See merge request easycorp/zentaopms!6745
2023-01-10 09:22:13 +00:00
王怡栋 6a214f851a Merge branch 'sprint/tsj_uinttest' into 'master'
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6741
2023-01-10 09:21:44 +00:00