Commit Graph
100 Commits
Author SHA1 Message Date
wangyidong b22f1df1d6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-09 14:26:51 +08:00
wangyidong 0c6c88d2e6 * adjust for lower php version. 2021-08-09 14:26:22 +08:00
wangyidong dd1375a2cb * adjust requiredFields for create job. 2021-08-06 19:41:48 +08:00
wangyidong fb3afc88a3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-06 18:12:34 +08:00
wangyidong 509afaa6f7 * adjust upgrade. 2021-08-06 18:12:18 +08:00
wangyidong 927d91b09c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-06 13:44:39 +08:00
wangyidong 36b298a29b * fix bug #14093. 2021-08-06 13:44:18 +08:00
wangyidong 04be61ef0d * fix bug #14094. 2021-08-06 13:43:48 +08:00
wangyidong 501dbdd8ab * adjust for adjust priv. 2021-08-06 11:21:10 +08:00
wangyidong 8864fffb70 * adjust for zh-tw lang. 2021-08-06 10:06:50 +08:00
wangyidong 5cd04e3903 * adjust for priv. 2021-08-06 09:40:10 +08:00
wangyidong 2529f5a076 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-06 09:29:30 +08:00
wangyidong b6bb62db9f * fix bug #14059. 2021-08-06 09:29:07 +08:00
wangyidong e9fdb1e775 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 17:34:54 +08:00
wangyidong 656e13e3b9 * adjust for construct function. 2021-08-05 17:34:04 +08:00
wangyidong 382f43ab16 * adjust for delItem for create job. 2021-08-05 17:33:24 +08:00
wangyidong 8bdaed8390 * fix js error. 2021-08-05 17:11:43 +08:00
wangyidong 7e6d5e0946 * adjust for exec gitlab. 2021-08-05 17:04:37 +08:00
wangyidong 772f49bb9d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 16:56:47 +08:00
wangyidong 9edf5f89e1 * fix for create job. 2021-08-05 16:56:29 +08:00
wangyidong 249f29ddf1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 16:25:24 +08:00
wangyidong 3fc2eecb3c * adjust for show dao error. 2021-08-05 16:25:08 +08:00
wangyidong d90d4580f4 * adjust for error. 2021-08-05 16:05:25 +08:00
wangyidong cbcdd534ec Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 16:05:11 +08:00
wangyidong c4d0eabcf3 * adjust for show pipeline in trash. 2021-08-05 16:03:46 +08:00
wangyidong 4ce49042d3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 14:28:47 +08:00
wangyidong 38606a8bd3 * fix bug for show unitCases in modal. 2021-08-05 14:28:26 +08:00
wangyidong 17c6f4e24e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 14:05:38 +08:00
wangyidong 1975cdb024 * fix bug #14038. 2021-08-05 14:05:19 +08:00
wangyidong 3962e1de32 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 13:58:26 +08:00
wangyidong cfda81bede * fix for edit job. 2021-08-05 13:57:57 +08:00
wangyidong 54d8c561c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 13:32:00 +08:00
wangyidong 7f5db66701 * adjust for delete repo and jenkins. 2021-08-05 13:30:57 +08:00
wangyidong 0f17432c53 * adjust for create job. 2021-08-05 13:08:17 +08:00
wangyidong 3bed17c945 * adjust style for create job. 2021-08-05 11:02:24 +08:00
wangyidong c7ebee7431 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 10:56:27 +08:00
wangyidong e4bd2b2d01 * fix for get branches from gitlab. 2021-08-05 10:56:02 +08:00
wangyidong d6b0fbbfbd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 10:50:39 +08:00
wangyidong 472360028a * adjust for priv lang. 2021-08-05 10:50:11 +08:00
wangyidong 55c7e1ada6 * fix bug #14060. 2021-08-05 10:48:53 +08:00
wangyidong 19ca95819b * fix bug #14059. 2021-08-05 10:48:16 +08:00
wangyidong 2c9b575895 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 10:28:46 +08:00
wangyidong c6fd961de9 * fix bug for repo maintain order. 2021-08-05 10:27:57 +08:00
wangyidong 7d2064c15e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 16:58:41 +08:00
wangyidong 87a04e4857 * finish task #40900. 2021-08-04 16:58:15 +08:00
wangyidong 392f0b1525 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 14:19:37 +08:00
wangyidong fd8d02c7df * add new version and upgrade. 2021-08-04 14:18:09 +08:00
wangyidong d8c69da5b4 * change for upgrade. 2021-08-04 13:04:42 +08:00
wangyidong 6621d2971f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 11:28:10 +08:00
wangyidong 4deba02129 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 11:27:57 +08:00
wangyidong b601825a36 * finish task #40918. 2021-08-04 11:26:20 +08:00
wangyidong 11095c1a76 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 10:46:47 +08:00
wangyidong 3ccbb16941 * finish task #40919. 2021-08-04 10:46:31 +08:00
wangyidong 3e1717fc44 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 10:09:44 +08:00
wangyidong 722dbe4f77 * finish task #40923. 2021-08-04 10:09:26 +08:00
wangyidong 1bf5898f94 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 10:00:17 +08:00
wangyidong f39bb5ba5e * finish task #14038. 2021-08-04 09:59:55 +08:00
wangyidong 502a6f95a2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 09:44:27 +08:00
wangyidong b2f733d05e * finish task #40927. 2021-08-04 09:44:04 +08:00
wangyidong 46d47bdd67 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 17:22:19 +08:00
wangyidong 047780db1c * finish task #40901. 2021-08-03 17:21:53 +08:00
wangyidong 9be2cf253f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 16:38:51 +08:00
wangyidong 1445f18e14 * finish task #40901. 2021-08-03 16:37:48 +08:00
wangyidong 57e68d9f4d * fix for view bug in modal. 2021-08-03 16:32:23 +08:00
wangyidong 4c2ebf8f97 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 16:23:38 +08:00
wangyidong 2fc3496f90 * fix bug #14015. 2021-08-03 16:22:31 +08:00
wangyidong d6e08c274e * adjust priv. 2021-08-03 15:33:32 +08:00
wangyidong 7907a29cf8 * finish task #40911. 2021-08-03 15:33:32 +08:00
wangyidong a40762cb98 * strtolower for loadExtension. 2021-08-03 15:33:32 +08:00
wangyidong 7f6170c77e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-02 16:59:33 +08:00
wangyidong 7b0a8a5bb0 * fix bug for loadModel. 2021-08-02 16:59:14 +08:00
wangyidong 46b576255c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-02 16:31:51 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong 4dd58196d7 * adjust for upgrade. 2021-08-02 16:02:10 +08:00
wangyidong 545d611d56 - delete null row. 2021-08-02 14:31:59 +08:00
wangyidong 0f231bbf80 * adjust for change subStatus when finish task by effort. 2021-08-02 13:47:28 +08:00
wangyidong 89b439d1da Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 2021-08-02 13:12:47 +08:00
wangyidong 7f9e7623e1 * add api in build. 2021-08-02 13:12:27 +08:00
wangyidong 3bfa1df846 * fix bug #13954. 2021-07-30 10:48:14 +08:00
wangyidong 9d91f22f32 * finish task #40115. 2021-07-30 08:42:23 +08:00
wangyidong e620c34202 * fix bug #13891 in master branch. 2021-07-29 17:02:22 +08:00
wangyidong 304f541621 * code for task #13891. 2021-07-29 17:00:07 +08:00
wangyidong 3def2a4713 * adjust update userview for project involved execution. 2021-07-29 16:52:13 +08:00
wangyidong 7055857a90 * fix bug #13891. 2021-07-29 16:47:56 +08:00
wangyidong f46c5f5072 * fix for save index. 2021-07-29 16:12:41 +08:00
wangyidong 0a131fe8db * finish task #40432. 2021-07-29 15:12:10 +08:00
wangyidong 8d37af5669 * code for task #40451. 2021-07-28 17:49:03 +08:00
wangyidong 61bff4552d * fix error. 2021-07-27 13:32:33 +08:00
wangyidong 42588eabfe * adjust for flow. 2021-07-27 13:32:09 +08:00
wangyidong 4f29e51ef0 * fix bug for create action when close story. 2021-07-27 13:30:38 +08:00
wangyidong d10c54fa2c * fix bug #13850. 2021-07-27 09:50:38 +08:00
wangyidong c3a28b5c5b Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 2021-07-26 17:41:57 +08:00
wangyidong 84f4723fb6 * finish task #40452. 2021-07-26 17:41:35 +08:00
wangyidong 9ec3e847d9 * code for task #40466. 2021-07-26 13:07:31 +08:00
wangyidong b1e233feb1 Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 2021-07-26 11:46:35 +08:00
wangyidong effe28a36e * finish task #40466. 2021-07-26 11:46:06 +08:00
wangyidong 12361696b2 * fix bug #13812. 2021-07-26 11:45:13 +08:00
wangyidong 750ef9fad3 * finish task #40469. 2021-07-23 14:48:30 +08:00
wangyidong 86063e6236 Merge branch '15.2' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.2 2021-07-23 09:25:26 +08:00
wangyidong f333e1aa21 * adjust for flow in GET. 2021-07-23 09:24:01 +08:00