Commit Graph
100 Commits
Author SHA1 Message Date
lichengjun 7a059c7cb6 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-17 07:15:24 +00:00
lichengjun b1dfaa21bb * Fix Bug #15200. 2021-09-17 07:14:30 +00:00
lichengjun 5fe40b698b Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 07:11:24 +00:00
lichengjun dd00b9801a * Fix bug#15073. 2021-09-15 07:10:28 +00:00
lichengjun a8c37fa1de * Fix bug#15073. 2021-09-15 06:55:09 +00:00
lichengjun 14993337db * Fix bug#14177. 2021-09-14 07:52:11 +00:00
lichengjun cef9898958 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 06:31:41 +00:00
lichengjun 5a27bc0249 * Adjust GitLab userbind browse html. 2021-09-14 06:29:58 +00:00
lichengjun aebeda9ce2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 03:33:13 +00:00
lichengjun fdb1aa702f * Adjust branch view manage code. 2021-09-14 03:32:20 +00:00
lichengjun 0dc8bcf781 * Add the back button. 2021-09-14 03:18:39 +00:00
lichengjun bbb3a6b780 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 03:02:55 +00:00
lichengjun 79ed71d8d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-13 07:39:29 +00:00
lichengjun 4bc78961be * Fix bug id15128. 2021-09-13 07:36:33 +00:00
lichengjun e4cf744e87 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-13 06:30:20 +00:00
lichengjun 3c75a3e024 * Fix bug #15012 2021-09-13 06:29:21 +00:00
lichengjun 13614e058b * Fix GitLab MR edit template style. 2021-09-13 05:04:18 +00:00
lichengjun 8dd99a2f51 * Adjust common model code style. 2021-09-13 04:50:56 +00:00
lichengjun 96ab6dbca2 * * Fix bug#14574 2021-09-13 04:48:16 +00:00
lichengjun d71edd6474 * Adjust GitLab MR text style. 2021-09-10 05:12:50 +00:00
lichengjun f686c987b7 * Adjust GitLab MR text style. 2021-09-10 05:09:32 +00:00
lichengjun 4dc316fb21 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 13:06:35 +00:00
lichengjun ff5288131b * Adjust Details Code Format. 2021-09-09 13:05:38 +00:00
lichengjun 7edde287ad Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 12:10:19 +00:00
lichengjun 0669d4653a * Adjust Details Code Format. 2021-09-09 12:08:58 +00:00
lichengjun b8e19bf4fc * Adjust GitLab MR Details Style. 2021-09-09 10:29:13 +00:00
lichengjun f2b7e270d3 * Fix gitlab mr details format. 2021-09-09 09:55:11 +00:00
lichengjun 31a0b96717 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-09 06:45:59 +00:00
lichengjun 30fc52a695 * Fix GitLab mr Details Style And API request condition status pending. 2021-09-09 06:42:09 +00:00
lichengjun b223736b18 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 02:38:43 +00:00
lichengjun 12935f3ead * Adjust GitLab MR TODO Detail. 2021-09-07 02:33:36 +00:00
lichengjun 90c3e3479f * Fix GitLab MR sync status. 2021-09-07 01:58:24 +00:00
lichengjun a786e5f00d * GitLab MR Code Merge. 2021-09-07 00:50:33 +00:00
lichengjun 1c3f706088 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-07 00:46:31 +00:00
lichengjun 7ca5893ce2 * Cancel GitLab SYNC Settings. 2021-09-07 00:44:34 +00:00
lichengjun 7e8705afcd Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-06 05:26:41 +00:00
lichengjun f16eba5b09 * Add GitLab Merge Request Permission configuration. 2021-09-06 05:22:27 +00:00
lichengjun 6441a8de44 * Add GitLab MR English Language. 2021-09-03 01:39:33 +00:00
lichengjun 425f6265b6 * fix bug 14612. 2021-09-02 08:35:06 +00:00
lichengjun db552dc428 * Adjust sync gitlab mr code. 2021-09-02 06:13:18 +00:00
lichengjun d2a348b57b Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-09-01 07:03:04 +00:00
lichengjun 7f71a63468 * Sync GitLab Todo ZenTao Todo. 2021-09-01 07:02:17 +00:00
lichengjun 99fdb29327 * Adjust GitLab view html. 2021-08-30 07:04:48 +00:00
lichengjun 95ea397519 * Add GitLab view html. 2021-08-30 06:55:05 +00:00
lichengjun 8f4cfb67da * Add Sync MR from GitLab API to Zentao database, default time 5 minutes to execute once. 2021-08-30 06:52:02 +00:00
lichengjun 2b03f84fe4 * Adjust GitLab browse template. 2021-08-27 08:10:04 +00:00
lichengjun 4cd4dd6a3d * Add GitLab view template and control view function. 2021-08-27 07:36:48 +00:00
lichengjun 38c327927f * Adjust GitLab history log. 2021-08-26 05:49:38 +00:00
lichengjun e3e8714d18 *Adjust GitLab code. 2021-08-24 07:39:28 +00:00
lichengjun 67569ee658 * Add GitLab log. 2021-08-24 07:36:22 +00:00
lichengjun 3dfbd1304b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-24 02:28:39 +00:00
lichengjun 0f4735080d *Adjust GitLab Token validation. 2021-08-24 02:27:40 +00:00
lichengjun 2c0f36696d * Adjust GitLab Token validation code. 2021-08-24 02:12:17 +00:00
lichengjun e2e6428ef9 * Add GitLab Token validation language. 2021-08-23 08:30:14 +00:00
lichengjun 581791948c * Fix GitLab bug. 2021-08-23 07:54:44 +00:00
lichengjun 7e4610ce9b * Adjust gitlab code. 2021-08-20 07:17:40 +00:00
lichengjun 773ac9ef95 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-20 06:29:09 +00:00
lichengjun 08f9e8e572 * Adjust GitLab MR Delete function. 2021-08-20 06:27:58 +00:00
lichengjun 60f9f418ea * Adjust gitlab token Permissions code. 2021-08-20 01:53:14 +00:00
lichengjun 6bd20ecaaf * Adjust GitLab admin token fix bug. 2021-08-20 01:28:54 +00:00
lichengjun 26a3ee3782 *Adjust GitLab code. 2021-08-20 01:01:53 +00:00
lichengjun c5a67c2808 * Adjust the gitlab permission to judge the presentation. 2021-08-20 00:45:10 +00:00
lichengjun b14f5af220 * Add GitLab Token authority verification. 2021-08-19 08:28:59 +00:00
lichengjun 9b20bfdf19 * Adjust jihuMR zh. 2021-08-19 08:20:09 +00:00
lichengjun e5e0ec2c8d * Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function. 2021-08-19 02:37:48 +00:00
lichengjun 8551ba49e3 * Adjust mr control browse function. 2021-08-19 00:46:15 +00:00
lichengjun 34391dbe4c * Adjust Gitlab list function. 2021-08-18 08:49:02 +00:00
lichengjun 6648beb067 * MR code merge. 2021-08-18 03:05:02 +00:00
lichengjun 4b278f6a93 Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-18 02:58:57 +00:00
lichengjun 2ae9360cdf * Add Gitlab MR List Function. 2021-08-18 02:57:36 +00:00
lichengjun 82cedbde1c Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR 2021-08-17 11:16:44 +00:00
lichengjun 8ebe5b4cc9 * adjust the GitLab list function 2021-08-17 11:14:56 +00:00
lichengjun 92cac9b4c2 * Adjust the gitlab validation style. 2021-08-16 07:29:19 +00:00
lichengjun b8113c047b * Add Language configuration items. 2021-08-12 06:24:48 +00:00
lichengjun b74462aa35 * Fix gitlabpipeline module code format. 2021-07-23 11:05:18 +08:00
lichengjun 029e98d6bf *Adjust code. 2021-07-23 10:59:33 +08:00
lichengjun ba5e6590cf Adjust code. 2021-07-23 10:07:51 +08:00
lichengjun 5a396b1a19 * Add gitlabpipeline module. 2021-07-23 09:57:31 +08:00
lichengjun 54e19553f5 *Add db update15.2.sql 2021-07-22 18:00:12 +08:00
lichengjun ba403ae524 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-19 10:41:38 +08:00
lichengjun cb82b46f52 * Fix GitLab Module code. 2021-07-19 10:37:45 +08:00
lichengjun b93f366581 * Adjust GitLab. 2021-07-16 16:12:17 +08:00
lichengjun c983c28857 *Turn off the new GItLab feature. 2021-07-16 16:01:28 +08:00
lichengjun 7811676145 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:40:29 +08:00
lichengjun a7d53c67e7 *Fix bug ID 40655. 2021-07-16 14:39:07 +08:00
lichengjun eec44392ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:32:31 +08:00
lichengjun 4e95021b08 Fix Bug ID 40660. 2021-07-16 14:32:26 +08:00
lichengjun 8710a08f6f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 10:08:23 +08:00
lichengjun fcf6f3149a Fix code bug. 2021-07-16 10:08:19 +08:00
lichengjun 9fea485339 *Skip gitlab menu. 2021-07-16 10:06:02 +08:00
lichengjun 3326a59cbd *Fix Bug ID 13665. 2021-07-16 09:46:01 +08:00
lichengjun ee5392f676 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-15 16:48:46 +08:00
lichengjun 53c075cbee *Adjust code. 2021-07-15 16:39:58 +08:00
lichengjun 5d46c91a6b *Fix bug 13651. 2021-07-15 09:34:33 +08:00
lichengjun a9862dc312 * Fix Bug 13654 and 13651. 2021-07-14 21:21:36 +08:00
lichengjun bf0716d462 *Fix repo. 2021-07-14 16:59:15 +08:00
lichengjun ecbcecd463 *Fix code format. 2021-07-14 15:21:05 +08:00
lichengjun 49844b90e6 *Fix code format. 2021-07-14 15:05:27 +08:00
lichengjun 28d9d2993a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 15:01:39 +08:00
lichengjun 6342f74031 *Fix code format. 2021-07-14 14:59:48 +08:00