Commit Graph
23731 Commits
Author SHA1 Message Date
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +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
Hao Sun 75a2555bd8 * bug #14689, fix tip not show in manageTeam task in tutorial mode. 2021-09-07 17:42:52 +08:00
liyuchun a36720eed1 * Code for review. 2021-09-07 17:19:16 +08:00
Hao Sun 2ff5394542 * bug #14825, fix php error when click .btn-open-target-page. 2021-09-07 17:17:25 +08:00
Hao Sun 30fcb005cf * bug #14857, improve table layout of page company/browse for tutorial mode. 2021-09-07 17:13:04 +08:00
Hao Sun 29528a5cfb * bug #14852, fix tooltip format error. 2021-09-07 17:03:49 +08:00
Hao Sun 8d443af88e * fix php error in tutorial mode. 2021-09-07 16:58:00 +08:00
Hao Sun 41c5062265 * bug #14844, only show tutorial tasks that the user has permission access. 2021-09-07 16:37:58 +08:00
Hao Sun 47833b256d * fix en lang data. 2021-09-07 16:36:52 +08:00
Hao Sun 571306733c * bug #14846, fix show more than one tips in tutorial mode. 2021-09-07 16:28:25 +08:00
Hao Sun 92befce192 * refactor. 2021-09-07 16:27:56 +08:00
Guan Xiying 8d6ad93727 * Add gitlab browse to resoure list. 2021-09-07 16:13:52 +08:00
Hao Sun eef065aa39 * refactor: remove console.log. 2021-09-07 16:12:56 +08:00
Hao Sun 9803d12a21 * bug #14860, fix cannot click project name in tutorial mode sometimes. 2021-09-07 15:56:41 +08:00
Hao Sun a5e730c1f3 * fix name size in project table list. 2021-09-07 15:56:21 +08:00
dingguodong 4e08891ea9 * Optimize comment. 2021-09-07 15:46:40 +08:00
Hao Sun 995806614b * fix php error in tutorial mode. 2021-09-07 15:37:14 +08:00
dingguodong 154662d760 * Disable diff in MR feature. 2021-09-07 15:05:09 +08:00
Hao Sun 4220c08e08 * bug #14936, fix tasks count incorrect. 2021-09-07 13:47:06 +08:00
Hao Sun ba7b5fc6aa * task #42125, remove some kanban colors. 2021-09-07 13:43:53 +08:00
Hao Sun 13366dd44d * support to affix kanban board header on window scroll or resize. 2021-09-07 13:27:22 +08:00
孙广明 69c1e30959 * Fix code error. 2021-09-07 13:16:02 +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
Guan Xiying d5b52bc7ad * Fix viewDiif. 2021-09-07 10:50:34 +08: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
Hao Sun 13ff8a54b0 * improve UI for kanban. 2021-09-07 10:14:27 +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
lichengjun 90c3e3479f * Fix GitLab MR sync status. 2021-09-07 01:58:24 +00:00
Hao Sun 73ab091599 * improve UI for kanban. 2021-09-07 09:57:05 +08:00
tianshujie a19b2952b5 * Fix bug #14847. 2021-09-07 09:06:37 +08:00
zenggang 4ee76f3b82 * Fix bug#14923 2021-09-07 08:57:59 +08: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
Hao Sun d88a87d307 * implement kanban pages with kanban component. 2021-09-07 08:27:02 +08:00
Hao Sun 75ac012b6c + add common kanban component. 2021-09-07 08:27:02 +08:00
Guan Xiying 2d1bc4fcc7 * Finish task #41977. 2021-09-06 20:07:04 +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
zenggang 968e115af3 * Fix bug#14935 2021-09-06 17:50:28 +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
Hao Sun 1a6a47c844 * typo. 2021-09-06 17:19:24 +08:00