Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,495 Commits 2 Branches 292 Tags
e8b2344122c4ba928db758550e6e90c7237f2ad1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
dingguodong c9eee62003 * Remove bad comments and rename user to account. 2021-09-24 16:39:32 +08:00
dingguodong 9c8a10c5b6 * Optimize codes when one label not exist and fix bug for getting issue(s). 2021-09-24 16:08:52 +08:00
dingguodong b4d4406276 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-24 15:04:03 +08:00
dingguodong 1762865528 * Fix bug for getting all objects when one label is not exist. 2021-09-23 16:54:22 +08:00
dingguodong 7e2466b119 * Optimize and streamline the codes. 2021-09-15 16:31:57 +08:00
dingguodong adae84550c * Fix bug #15041. 2021-09-15 15:28:37 +08:00
dingguodong be3dfb76c9 * Change the begin time of todo to undefined for MR. 2021-09-15 13:29:30 +08:00
dingguodong db1c0ebb30 * Merge codes for gitlab from 15.5. 2021-09-15 10:57:05 +08:00
dingguodong abcc6dd948 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 10:38:00 +08:00
dingguodong 9cedf76f8c * Fix bug for the job with gitlab type, merged from master. 2021-09-15 10:36:36 +08:00
dingguodong 0947f1a7e1 * Improve code robustness for editing a job. 2021-09-15 10:09:10 +08:00
dingguodong 4eaf583ea8 * Fix bug when exec gitlab pipeline in job module. 2021-09-15 09:55:42 +08:00
dingguodong d85d84095a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-13 13:53:25 +08:00
dingguodong 7ba0c35e35 * Correct the misspelled word. 2021-09-13 10:45:02 +08:00
dingguodong 5b36670521 * Correct the wrong comments in the gitlab module. 2021-09-13 08:51:03 +08:00
dingguodong 663defda35 * Correct the misspelled word. 2021-09-13 08:35:41 +08:00
dingguodong 4a4afa23d9 * Rename function for display action(JIHU). 2021-09-10 08:53:13 +08:00
dingguodong c2f95a20c7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 18:00:03 +08:00
dingguodong 4c8a29b414 * Fix bug when call API due to actor of action is System. 2021-09-09 17:58:57 +08:00
dingguodong f748d83c35 * Rename index to key for array loop and improve robustness. 2021-09-09 17:27:55 +08:00
dingguodong 96474f4801 * Reformat code for API(JIHU). 2021-09-09 16:04:01 +08:00
dingguodong 56eb32dc3a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 14:48:23 +08:00
dingguodong 5b9332cfff * Remove mrapprove from todo type list due to incomplete implementation. 2021-09-09 14:47:27 +08:00
dingguodong 7cb746d5bb * Correct select merge request from db. 2021-09-09 13:30:39 +08:00
dingguodong 893f0455f5 * Fix bug when creating todo for mr. 2021-09-09 11:50:45 +08:00
dingguodong 6a6f5c1883 * Adjust sql location. 2021-09-09 11:43:28 +08:00
dingguodong ce3d71c795 * Add merge request title to that todo. 2021-09-09 11:30:50 +08:00
dingguodong 11c16786bf * Remove reviewer from lang thoroughly. 2021-09-09 11:23:05 +08:00
dingguodong b0b3ccd77b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 11:20:50 +08:00
dingguodong 1c45dfc33f * Fix bug #15033, complete TODO for merge request. 2021-09-09 11:19:55 +08:00
dingguodong aed241bd0e * Correct and optimize function apiGetTodoList. 2021-09-09 11:19:11 +08:00
dingguodong 842f2209a0 - Remove reviewer from creating and updating MR. 2021-09-09 09:44:04 +08:00
dingguodong 926d0cc794 * Change the lang for reviewer in MR module. 2021-09-09 09:35:48 +08:00
dingguodong db621d4f79 - Remove reviewer from creating and editing MR because of API issue. 2021-09-09 09:30:37 +08:00
dingguodong 9193387eb7 * Fix bug when deleting a MR in ZenTao. 2021-09-09 09:23:02 +08:00
dingguodong 44396cde9a * Create a todo item for this merge request. 2021-09-09 09:09:30 +08:00
dingguodong 81092346b7 * For compatibility with PHP 5.4 . 2021-09-08 18:00:43 +08:00
dingguodong 0f6b2b4a42 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 17:35:24 +08:00
dingguodong cf102db743 * Set menu in constructor of every module under devops. 2021-09-08 17:34:17 +08:00
dingguodong e9002f78c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:33:36 +08:00
dingguodong 47b838ddb5 * Merge code from ext to this branch for API(JIHU). 2021-09-08 16:33:05 +08:00
dingguodong 870c3be96e * Add lang for GitLab in MR creation. 2021-09-08 16:24:11 +08:00
dingguodong 57c7ed054d * Fixed GitLab selection when creating MR. 2021-09-08 14:54:27 +08:00
dingguodong 2c957c5970 * Adjust column width in MR browse page. 2021-09-08 14:29:41 +08:00
dingguodong 1ec700ee17 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 14:11:52 +08:00
dingguodong 1dbceea571 * Remove needless prompt for required fields. 2021-09-08 14:10:08 +08:00
dingguodong 8ea07cce83 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 13:58:51 +08:00
dingguodong a4be8f518a * Fix bug #14996. 2021-09-08 13:58:22 +08:00
dingguodong 28965b2777 * Correct php warnings. 2021-09-08 10:55:21 +08:00
dingguodong 02a2892002 * Fix bug #14994 . 2021-09-08 10:54:50 +08:00
dingguodong c02049d5a5 * Remove extra character. 2021-09-07 20:50:03 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
dingguodong 448d1423a6 + Add SQL file for update version 15.4 . 2021-09-07 20:33:04 +08:00
dingguodong b1e05cd0f3 * Adjust display style. 2021-09-07 20:18:50 +08:00
dingguodong 6de75d2fcb * Fix bug for sync mr. 2021-09-07 20:17:31 +08:00
dingguodong 74d6b1895a * Update accept MR display style. 2021-09-07 18:12:01 +08:00
dingguodong 4e08891ea9 * Optimize comment. 2021-09-07 15:46:40 +08:00
dingguodong 154662d760 * Disable diff in MR feature. 2021-09-07 15:05:09 +08:00
dingguodong 70f0136b2b Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 10:51:12 +08:00
dingguodong 8e8875319f * Optimize function getDiffs. 2021-09-07 10:50:44 +08:00
dingguodong 701b000c09 * Optimize language file. 2021-09-07 10:13:57 +08:00
dingguodong 14c2e282f2 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 10:03:34 +08:00
dingguodong ee13e00554 * Add tips for merge code locally. 2021-09-07 10:02:52 +08:00
dingguodong 7322869f8d Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-06 17:59:42 +08:00
dingguodong 9d5c1de0ab * Sync MR in ZenTao database whatever status of MR in GitLab. 2021-09-06 17:57:27 +08:00
dingguodong e664627f12 * Add en lang for MR in DevOps menu. 2021-09-06 11:31:56 +08:00
dingguodong 94f4d91107 * Modify en lang for MR. 2021-09-06 11:31:01 +08:00
dingguodong fde5d66e3c * Adjust function comment. 2021-09-03 14:54:35 +08:00
dingguodong 82d9ac3b02 + Add apiGetProjectMembers apiGetProjectMember functions. 2021-09-03 14:52:51 +08:00
dingguodong c80ce42a12 * Reformat code for accept MR. 2021-09-03 13:39:54 +08:00
dingguodong 13506c3cbd * Add locate redirection but test not passed. 2021-09-03 13:37:41 +08:00
dingguodong 7a7c63499f * Fix bug for no response after accept view. 2021-09-03 13:21:14 +08:00
dingguodong 7d83d3110f * Fix bug when sudo as user. 2021-09-03 13:20:53 +08:00
dingguodong 2a68d2ac83 * Adjust the action for JIHU API. 2021-09-03 09:52:42 +08:00
dingguodong 3d360a1e4e * Bug fix and reduce PHP notices. 2021-09-02 16:49:52 +08:00
dingguodong d272eeeefc * Optimize fetching data from API. 2021-09-02 15:39:34 +08:00
dingguodong 1b41b61cee * Using sudo to accept merge request. 2021-09-02 15:21:19 +08:00
dingguodong 8201fafc46 + Get sudo user ID in GitLab. 2021-09-02 15:20:21 +08:00
dingguodong 1009626f39 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-02 14:20:45 +08:00
dingguodong cbf7227e89 * Correct the bug when a API error is raised. 2021-09-02 14:19:43 +08:00
dingguodong 5e5cbe2d2f * Update and correct editing a MR. 2021-09-01 11:08:34 +08:00
dingguodong 8b17a74a1c * Update fetching users list when creating a MR. 2021-09-01 10:36:02 +08:00
dingguodong 5ebad79a99 * Fix bug when getting gitlab projects list. 2021-09-01 10:33:55 +08:00
dingguodong e679938379 * Update ajaxGetMRUserPairs function. 2021-09-01 10:29:03 +08:00
dingguodong 3209790874 + Add apiGetProjectUsers function. 2021-09-01 10:28:06 +08:00
dingguodong 761c5d282e * Fix bug when getting gitlab projects list. 2021-09-01 09:40:46 +08:00
dingguodong 71a023247a - Remove getGitlabProjects function from repo model. 2021-08-31 16:09:43 +08:00
dingguodong 174518c1b5 * Remove membership filter. 2021-08-31 16:09:03 +08:00
dingguodong d36c7fbc20 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-31 15:24:27 +08:00
dingguodong 3fbc826d42 * Format user detail and date. 2021-08-31 15:24:12 +08:00
dingguodong 3e7f292efc * Json encode the issue with JSON_HEX_TAG. 2021-08-31 15:22:37 +08:00
dingguodong 33b287b427 - Remove extra lines which should be deleted. 2021-08-31 11:10:50 +08:00
dingguodong 0d11868895 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/dingguodong/zentaopms into jihuMR 2021-08-31 11:06:50 +08:00
dingguodong 1632859faf * Update MR view and lang. 2021-08-31 11:05:22 +08:00
dingguodong 95c2adad70 * Correct apiAcceptMR and update functions. 2021-08-31 11:05:22 +08:00
dingguodong b2f1fd3f3c + Accept a MR. 2021-08-31 11:05:03 +08:00
dingguodong 587dd38b63 * Update MR view and lang. 2021-08-31 11:01:29 +08:00
dingguodong df881ebb35 * Correct apiAcceptMR and update functions. 2021-08-31 10:57:17 +08:00
dingguodong cebaa0cad1 + Accept a MR. 2021-08-31 10:56:41 +08:00
丁国栋 1b73c952ec Merge branch 'jihuMR' into 'jihuMR' 
* Fix bug when creating a repo without gitlabProject.

See merge request easycorp/zentaopms!7
 2021-08-27 09:48:39 +00:00