Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
30,840 Commits 2 Branches 292 Tags
c1db0bcb0155fd5ac79a6776ab1c96b91b923ddf
Commit Graph
30840 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
liyuchun c1db0bcb01 * Finish task #45442. 2021-12-08 13:04:29 +08:00
王怡栋 0de19226e5 Merge branch 'sprint/devops_liyuchun_45491' into 'sprint/devops16' 
* Finish task #45491.

See merge request easycorp/zentaopms!819
 2021-12-08 02:07:48 +00:00
liyuchun 8d32dd3cf1 * Finish task #45446. 2021-12-08 10:02:21 +08:00
liyuchun 8b0da7b97c * Finish task #45491. 2021-12-08 09:53:08 +08:00
李玉春 8b1b85dc59 Merge branch 'sprint/devops16_sunhao/icons' into 'sprint/devops16' 
* Update icons, add new icons: 'icon-code-fork', 'icon-diff'.

See merge request easycorp/zentaopms!813
 2021-12-08 01:01:35 +00:00
王怡栋 fda32ead41 Merge branch 'sprint/devops_liyuchun_45491' into 'sprint/devops16' 
* Finish task #45491.

See merge request easycorp/zentaopms!818
 2021-12-08 00:59:59 +00:00
liyuchun d40736d387 * Finish task #45491. 2021-12-08 08:56:39 +08:00
李玉春 7ad1c3e550 Merge branch 'sprint/devops16_task45434' into 'sprint/devops16' 
* Finish task#45434

See merge request easycorp/zentaopms!814
 2021-12-08 00:30:23 +00:00
李玉春 cb6364b19d Merge branch 'sprint/devops16_45500' into 'sprint/devops16' 
* Finish task#45500

See merge request easycorp/zentaopms!804
 2021-12-07 09:47:43 +00:00
zenggang 5e006ac204 * Finish task#45434 2021-12-07 09:40:28 +00:00
Hao Sun 34c03b2cd5 * Update icons, add new icons: 'icon-code-fork', 'icon-diff'. 2021-12-07 17:22:03 +08:00
zenggang 4b83b4bee6 * Adjust code 2021-12-07 09:13:17 +00:00
zenggang e79f4b28ea * Adjust code 2021-12-07 09:08:56 +00:00
zenggang 58320d3756 Merge branch 'sprint/devops16_45500' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/devops16_45500 2021-12-07 09:05:28 +00:00
zenggang 1246c4f15d * Adjust code 2021-12-07 09:04:49 +00:00
李玉春 bb44039a30 Merge branch 'sprint/devops16' into 'sprint/devops16_45500' 
# Conflicts:
#   module/gitlab/control.php
 2021-12-07 08:54:25 +00:00
王怡栋 ae3fea2f3a Merge branch 'cherry-pick-ff06288d' into 'sprint/devops16' 
Merge branch 'sprint/devops16_liyuchun_45491' into 'master'

See merge request easycorp/zentaopms!807
 2021-12-07 08:51:24 +00:00
王怡栋 cf280763b2 Merge branch 'sprint/devops16_liyuchun_45491' into 'master' 
* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
 2021-12-07 08:49:16 +00:00
zenggang b4685be3de * Finish task#45500 2021-12-07 08:15:04 +00:00
李玉春 3d1d34e383 Merge branch 'sprint/174_tianshujie_17115' into 'master' 
* Fix bug #17115.

See merge request easycorp/zentaopms!785
 2021-12-06 07:18:57 +00:00
李玉春 9db701d207 Merge branch 'sptint/174_xieqiyu_17079' into 'master' 
* Fix bug#17113.

See merge request easycorp/zentaopms!788
 2021-12-06 07:18:39 +00:00
李玉春 fd5cca16b3 Merge branch 'sgm_fixbug' into 'master' 
* Fix code error.

See merge request easycorp/zentaopms!790
 2021-12-06 07:15:25 +00:00
王怡栋 7091037194 Merge branch 'sprint/175_sgm_upgrade' into 'master' 
Sprint/175 sgm upgrade

See merge request easycorp/zentaopms!786
 2021-12-06 07:14:51 +00:00
李玉春 a339b6e024 Merge branch 'sprint/175_sgm_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!792
 2021-12-06 07:14:23 +00:00
孙广明 bd28d11c75 * Fix bug. 2021-12-06 15:04:33 +08:00
孙广明 22ac002432 * Fix code error. 2021-12-06 13:59:36 +08:00
孙广明 f3bd7149f9 Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' 
* Improve kanban UI, bug #17063.

See merge request easycorp/zentaopms!787
 2021-12-06 05:11:11 +00:00
孙广明 e24ded1429 Merge branch 'sprint/174_hufangzhou_17116' into 'master' 
* Fix bug #17116, bug #17117.

See merge request easycorp/zentaopms!789
 2021-12-06 05:07:38 +00:00
hufangzhou 05d9182e31 * Fix bug #17116, bug #17117. 2021-12-06 12:09:15 +08:00
王怡栋 2dc3e19e7d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-06 11:56:16 +08:00
王怡栋 641929d5fc * adjust for status name for api. 2021-12-06 11:55:50 +08:00
xieqiyu 0dc84860e9 * Fix bug#17113. 2021-12-06 11:55:46 +08:00
Hao Sun 9b7a85cdd7 * Fix kanban columns width not fit the layout sometimes in flex mode. 2021-12-06 11:44:12 +08:00
tianshujie bb635e3c48 * Modify the code format of caselib js file. 2021-12-06 11:36:33 +08:00
Hao Sun 18c0ef3210 * Custom dnd rules for project kanban. 2021-12-06 11:30:11 +08:00
tianshujie 78af43d78c * Fix bug #17115. 2021-12-06 11:26:27 +08:00
孙广明 8debfb8ad8 * Remove version. 2021-12-06 11:25:34 +08:00
李玉春 4a2d21595e Merge branch 'sptint/174_xieqiyu_17079' into 'master' 
* Fix bug#17079.

See merge request easycorp/zentaopms!778
 2021-12-06 03:22:48 +00:00
Hao Sun 50ad00b1c4 * Fix dnd not work in project kanban. 2021-12-06 11:19:05 +08:00
Hao Sun 8d08be2f57 * Fix cards count incorrect on some kanbans. 2021-12-06 11:18:49 +08:00
孙广明 b8432110bf Merge branch 'sprint/174_songchenxuan_17111' into 'master' 
*Fix bug #17111.

See merge request easycorp/zentaopms!784
 2021-12-06 03:18:06 +00:00
孙广明 7ebdc11ad1 Merge branch 'sprint/174_songchenxuan_17109' into 'master' 
Sprint/174 songchenxuan 17109

See merge request easycorp/zentaopms!780
 2021-12-06 03:16:28 +00:00
songchenxuan bb6dba1a78 *Fix bug #17111. 2021-12-06 11:12:21 +08:00
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
李玉春 7cd00e0d84 Merge branch 'revert-aacf4ec4' into 'master' 
Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'"

See merge request easycorp/zentaopms!783
 2021-12-06 02:41:55 +00:00
孙广明 679d8aeb5e Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' 
* Bug #17056, fix duplicated modal in execution kanban page.

See merge request easycorp/zentaopms!782
 2021-12-06 02:39:26 +00:00
孙广明 11d9ad6044 Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'" 
This reverts merge request !781
 2021-12-06 02:37:20 +00:00
孙广明 ad1cc7c04f Merge branch 'sprint/174_hufangzhou_17077' into 'master' 
* Fix bug #17077.

See merge request easycorp/zentaopms!774
 2021-12-06 02:33:35 +00:00
hufangzhou 145fc2a461 * Fix bug #17074. 2021-12-06 10:27:51 +08:00
孙广明 aacf4ec487 Merge branch 'sprint/175_tianshujie_17056' into 'master' 
* Fix bug #17056.

See merge request easycorp/zentaopms!781
 2021-12-06 02:26:51 +00:00