Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
37,648 Commits 2 Branches 292 Tags
2f3f35679087f332d0ddf4656684f3acdb849757
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Guan Xiying a9bc9cfaa0 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 16:11:37 +08:00
Guan Xiying 65de424a3e * Add new markdown parser lib. 2021-11-30 16:09:24 +08:00
Guan Xiying ba8ae82bbc * Fix links in tab nav of mr view page. 2021-11-24 11:27:32 +08:00
Guan Xiying 32a0795e8e * Adjust style of view mr page. 2021-11-24 09:48:20 +08:00
Guan Xiying 1f2fa3e96d * Adjust style of mr view. 2021-11-23 20:16:59 +08:00
Guan Xiying bcb70c304e * Adjust view header. 2021-11-23 20:08:16 +08:00
Guan Xiying 610ab20e9e * Add public keywords to define helper::cd function. 2021-09-28 16:28:38 +08:00
管西迎 04607e8a79 Merge branch 'sprint/165_test' into 'sprint/165' 
* Send encrypted password when creating user by API.

See merge request easycorp/zentaopms!20
 2021-09-24 06:56:37 +00:00
管西迎 5c4ae3dbf5 Merge branch 'sprint/165_sunhao_bug15216' into 'master' 
BUG #15216: 调整火狐浏览器上单选框空间获得焦点样式

See merge request easycorp/zentaopms!14
 2021-09-23 07:25:27 +00:00
管西迎 a304d99033 Merge branch 'sprint/165_sunhao' into 'master' 
BUG #14890: 修复了执行→需求列表点击表头全新复选框可能触发拖拽批量选择的问题，现在拖拽批量选择仅在正常的数据行内 ID 列（td.c-id）生效。

See merge request easycorp/zentaopms!12
 2021-09-23 07:17:34 +00:00
Guan Xiying 7e44cf65c0 * Check job reference is set. 2021-09-15 10:06:21 +08:00
Guan Xiying b08066c64c * Change getSingleCommit to getCommitedDate, 2021-09-09 15:45:34 +08:00
Guan Xiying 5c4178002d * Remove extra space. 2021-09-09 15:44:27 +08:00
Guan Xiying d85c93438a * Fix bug #15007. 2021-09-08 23:08:51 +08:00
Guan Xiying 7f41858f5a * Fix bug #15006. 2021-09-08 23:00:55 +08:00
Guan Xiying cef4ce5e1c * Add $lang->mr to common module. 2021-09-08 13:57:19 +08:00
Guan Xiying d1a08fda29 * Fix bug #15006. 2021-09-08 13:45:41 +08:00
Guan Xiying 1017947c6c * Fix bug #15019. 2021-09-08 10:38:39 +08:00
Guan Xiying 2cee5fc75e * Fix bug #14996. 2021-09-08 10:31:08 +08:00
Guan Xiying 426e366791 * Hide mr setting lang item. 2021-09-08 10:30:10 +08:00
Guan Xiying 6e3be6bdf2 * Fix bug #15006. 2021-09-08 10:27:05 +08:00
Guan Xiying ba70dcbaab * Fix bug #15007. 2021-09-08 10:24:13 +08:00
Guan Xiying b305b8c752 * Fix bug #15009 and change config->MR to config->mr. 2021-09-08 10:13:28 +08:00
Guan Xiying 8d6ad93727 * Add gitlab browse to resoure list. 2021-09-07 16:13:52 +08:00
Guan Xiying d5b52bc7ad * Fix viewDiif. 2021-09-07 10:50:34 +08:00
Guan Xiying 7b9cb9ed8e * Remove debug codes. 2021-09-07 10:26:39 +08:00
Guan Xiying 2d1bc4fcc7 * Finish task #41977. 2021-09-06 20:07:04 +08:00
Guan Xiying cd1a40b066 * Fix job object name in browse page. 2021-09-06 17:45:08 +08:00
Guan Xiying a5ceffb6cf * Fix exec gitlab job bug and adjust exec job function. 2021-09-06 17:29:37 +08:00
Guan Xiying ddfe2479ac * Finish task #41976, adjust exec gitlab function. 2021-09-06 16:46:07 +08:00
Guan Xiying 81795244b3 * Adjust getReferenceOptions function, rename param of function apiCreatePipeline. 2021-09-06 16:44:27 +08:00
管西迎 bcdee8ef2c Merge branch 'jihuMR' into 'jihuMR' 
Finish task#41303

See merge request easycorp/zentaopms!8
 2021-09-01 03:15:00 +00:00
Guan Xiying ff83efb066 * Add manage reference of gitlab job function. 2021-09-01 10:57:07 +08:00
Guan Xiying bb27425288 * Add process actions function. 2021-08-31 14:08:34 +08:00
Guan Xiying 578613ca5b * Fix query all issues bug. 2021-08-31 09:56:05 +08:00
Guan Xiying 6c0ed1691f * Fix query by labels error. 2021-08-30 14:40:57 +08:00
Guan Xiying d82f45a7df * Fix query by label error. 2021-08-30 11:32:04 +08:00
Guan Xiying 0a56e0100e * Fix comments. 2021-08-26 17:45:16 +08:00
Guan Xiying 8c32895ad8 * Fix comments. 2021-08-26 17:44:44 +08:00
Guan Xiying 1160e1eba7 * Use common::printLink and remove extra comments. 2021-08-26 17:44:06 +08:00
Guan Xiying 03b9fd3982 * Add apiError->createMR lang item. 2021-08-26 17:43:10 +08:00
Guan Xiying cfd56b03f0 * Remove processMR function, Adjust api error message. 2021-08-26 17:41:35 +08:00
Guan Xiying 3110a903c3 * Fix ajaxGetMRTragetProjects. 2021-08-26 17:41:13 +08:00
Guan Xiying 567f80f171 * Fix ajaxGetMRTragetProjects and remove and Fix comments. 2021-08-26 17:40:03 +08:00
Guan Xiying ed95aa5dbd * Fix rignt spell error. 2021-08-26 17:08:09 +08:00
Guan Xiying 2d6419c497 * Adjust style of pipeline status. 2021-08-26 16:58:29 +08:00
Guan Xiying 0a88f13f16 - Delete list.html.php . 2021-08-26 16:46:47 +08:00
Guan Xiying 9b1ca198bc * Adjust style of view MR page. 2021-08-26 16:45:29 +08:00
Guan Xiying 7239c66129 * Add js file of mr diff page. 2021-08-26 14:22:19 +08:00
Guan Xiying 6e3158cc69 * Finish view mr codes diff page. 2021-08-26 14:20:52 +08:00
Guan Xiying 8e63fff93d * Trim token from form. 2021-08-25 11:30:36 +08:00
Guan Xiying 0acb0aadce * Add check token codes before import issue. 2021-08-25 11:16:36 +08:00
Guan Xiying c1059facef * Check gitlab token when create gitlab job. 2021-08-25 10:44:06 +08:00
Guan Xiying bf103ceb78 * Merge task #41371. 2021-08-25 10:39:29 +08:00
Guan Xiying eef945755f * Add diff page. 2021-08-25 10:36:18 +08:00
Guan Xiying 22d79c2681 * Add extra param to scm::diff function. 2021-08-25 10:35:12 +08:00
Guan Xiying e578838258 * Add fromProject param for diff. 2021-08-25 10:33:53 +08:00
Guan Xiying 754163aae4 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-25 10:33:09 +08:00
Guan Xiying 7ed0e3c970 * Add getDiffs function. 2021-08-25 10:32:44 +08:00
Guan Xiying eb5e3dbac7 * Fix params of apiGetSingleDiffVersion and apiGetDiffVersions. 2021-08-23 17:14:34 +08:00
Guan Xiying 80c872be80 * Rename mrModel::edit function. 2021-08-23 17:08:03 +08:00
Guan Xiying d2e51fb7a3 * Rename mrModel::edit function. 2021-08-23 17:07:26 +08:00
Guan Xiying 1e26528ffe Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-23 17:06:34 +08:00
Guan Xiying 82ba7789b6 * Fix params of get versions api. 2021-08-23 17:06:21 +08:00
Guan Xiying 7ccb99423b * Fix delete mr error. 2021-08-23 17:04:51 +08:00
Guan Xiying f0ed277adb * Fix browe mr page. 2021-08-23 14:15:55 +08:00
Guan Xiying 83d8d8477f * Check gitlab token when create gitlab job. 2021-08-23 13:25:18 +08:00
Guan Xiying d61afb2d76 * Add space. 2021-08-23 13:25:04 +08:00
Guan Xiying 9afcbc7a84 * Fix check admin tocken codes. 2021-08-23 13:13:57 +08:00
Guan Xiying b47ea4a052 * Add check admin tocken function. 2021-08-23 13:08:42 +08:00
Guan Xiying a04e1a0cb8 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-23 10:49:55 +08:00
Guan Xiying 569cbe909e Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-22 16:58:05 +08:00
Guan Xiying 30f4e19096 * Add disable attribute on disabled link. 2021-08-22 16:53:33 +08:00
Guan Xiying 5537f3500a * Remove extra line. 2021-08-19 16:32:40 +08:00
Guan Xiying e215bc47f3 * Review codes. 2021-08-19 13:27:17 +08:00
Guan Xiying 120a2cd068 * Fix create zt_mr table sql. 2021-08-19 10:20:38 +08:00
Guan Xiying 5c675fe85f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-13 10:40:20 +08:00
Guan Xiying 1488745195 * Fix sync gitlab scm by cron bug. 2021-08-13 10:39:39 +08:00
Guan Xiying 804fd2c559 * Fix ajaxLoadPorducts to ajaxLoadProducts. 2021-08-05 16:32:16 +08:00
Guan Xiying 27515c52cf * Fix ajax load products bug. 2021-08-05 15:54:35 +08:00
Guan Xiying 0c3817ded1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 15:48:15 +08:00
Guan Xiying b63623ad27 * Disable local git and svn repo in gitlab job. 2021-08-05 15:47:41 +08:00
Guan Xiying fff3e2eae0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 11:14:38 +08:00
Guan Xiying 97adda7087 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 11:14:17 +08:00
Guan Xiying 5b3a681b36 * Unset schedule triggerType for gitlab job. 2021-08-05 11:12:55 +08:00
Guan Xiying 1cf618686d * Fix prefix of gitlab repo. 2021-08-04 15:58:53 +08:00
Guan Xiying d19f75d212 * Adjust default per_page param for get commits from gitlab api. 2021-08-04 15:57:53 +08:00
Guan Xiying 68033ced56 * Execute process gitlab repo when upgrade from 15.3 . 2021-08-04 13:38:51 +08:00
Guan Xiying 111758fa4f * Add document ready. 2021-08-02 14:32:59 +08:00
Guan Xiying 800ff00032 * Fix exec gitlab pipeline function. 2021-07-29 17:28:51 +08:00
Guan Xiying 65593ba3d0 * Fix link of refresh button of compile logs page. 2021-07-29 16:28:13 +08:00
Guan Xiying 6fe756fb14 * Adjust param of ciModel::checkCompileStatus function. 2021-07-29 16:26:20 +08:00
Guan Xiying d180d67c91 * Adjust syncGitlabTaskStatus function. 2021-07-29 16:13:58 +08:00
Guan Xiying f053df8912 * Rename jobModel::getGitlabProjectName to gitlabModel::getObjectNameForJob. 2021-07-29 15:51:11 +08:00
Guan Xiying 45502452f1 * Fix . in zh-cn lang. 2021-07-29 15:32:59 +08:00
Guan Xiying 25433731e2 * Remove extra space from repoModel::processGitlab function. 2021-07-29 15:23:26 +08:00
Guan Xiying 4f3ede468c * Clear codes for sync gitlab issues. 2021-07-29 15:11:31 +08:00
Guan Xiying db0416297a * Clear codes for sync gitlab isssues. 2021-07-29 14:22:04 +08:00
Guan Xiying 5fa44cf80f * Clear codes for GitLab issue synchronous operation. 2021-07-29 13:49:55 +08:00
Guan Xiying 6f851b6a33 * Revert sync issues menu. 2021-07-29 13:37:33 +08:00