Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
35,917 Commits 2 Branches 292 Tags
e7503d435d3b4e018abcbe3ad26ce6b9e463bc13
Commit Graph
35917 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 e7503d435d Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!2416
 2022-03-22 01:39:02 +00:00
xieqiyu f1aa12aae3 * Fix bug. 2022-03-22 09:36:32 +08:00
王怡栋 18298694c6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 09:36:30 +08:00
王怡栋 e4c3911d5f * fix bug for setstage. 2022-03-22 09:36:07 +08:00
王怡栋 44bb282b85 Merge branch 'sprint/lite6_lwr_fix_id_batch_create' into 'master' 
* use correct id for input errors on batch create, task #51316, bug #20963.

See merge request easycorp/zentaopms!2414
 2022-03-22 01:24:17 +00:00
王怡栋 28ae0532d9 Merge branch 'sprint/lite6_lwr_api_action' into 'master' 
* do not create api actions if vision is lite only, task #51319, bug #20960.

See merge request easycorp/zentaopms!2411
 2022-03-22 01:23:15 +00:00
王怡栋 b03ae00460 Merge branch 'sprint/lite6_lwr_hide_region_lane' into 'master' 
* hide region and lane if actually not configurable, task #51308.

See merge request easycorp/zentaopms!2405
 2022-03-22 01:19:45 +00:00
王怡栋 50249afe81 Merge branch 'sprint/lite6_lwr_tweak_about' into 'master' 
* use lite version and remove upgrade link from about panel of lite vision,...

See merge request easycorp/zentaopms!2402
 2022-03-22 01:19:12 +00:00
王怡栋 f8ffe0ef23 Merge branch 'sprint/lite6_lwr_rename_common_kanban' into 'master' 
* remove 'common' from kanban for lite vision, task #51334, bug #20995.

See merge request easycorp/zentaopms!2399
 2022-03-22 01:18:41 +00:00
王怡栋 ab6a3eeeb7 Merge branch 'sprint/lite6_lwr_remove_score' into 'master' 
* remove score menus from lite vision, task #51309.

See merge request easycorp/zentaopms!2397
 2022-03-22 01:18:23 +00:00
王怡栋 08350a9795 Merge branch 'sprint/fixbug_hufangzhou_16114' into 'master' 
* Fix bug #16114, #16204.

See merge request easycorp/zentaopms!2415
 2022-03-22 01:17:53 +00:00
王怡栋 ff22527151 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master' 
* fix task #51306,#51304

See merge request easycorp/zentaopms!2395
 2022-03-22 01:17:19 +00:00
Zongjun Lan 1e8b5800be * fix task #51306,#51304 2022-03-22 09:16:16 +08:00
Wenrui LI d48f1b6d41 * remove flow as well. 2022-03-22 09:07:43 +08:00
hufangzhou a9eebef134 * Fix bug #16114, #16204. 2022-03-22 09:06:37 +08:00
Wenrui LI 90ab73d1f7 * use correct id for input errors on batch create, task #51316, bug #20963. 2022-03-22 09:02:40 +08:00
王怡栋 9ab0bd99c8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 09:01:14 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
朱金勇 6272c75817 Merge branch 'sprint/sunhao/fix_paste_image' into 'master' 
* Fix paste image from dingding not work @mayue.

See merge request easycorp/zentaopms!2408
 2022-03-22 00:55:47 +00:00
朱金勇 d4ae966ebc Merge branch 'sprint/xuanxuan_93' into 'master' 
Zentaoclient related changes from xuanxuan sprint 93

See merge request easycorp/zentaopms!2398
 2022-03-22 00:55:07 +00:00
孙广明 ec07938f4c Merge branch 'pailei2_xieqiyu_createBug' into 'pailei2' 
* Modify create bug.

See merge request easycorp/zentaopms!2410
 2022-03-22 00:45:36 +00:00
liyuchun fc02079335 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 08:45:16 +08:00
Wenrui LI cb78ad0aeb * do not create api actions if vision is lite only, task #51319, bug #20960. 2022-03-22 08:45:11 +08:00
liyuchun 2c276b4322 Merge branch 'devops24' 2022-03-22 08:44:37 +08:00
xieqiyu 0d21516997 * Modify create bug. 2022-03-22 08:40:43 +08:00
孙广明 e43dddd2dd Merge branch 'devops24_liyuchun' into 'devops24' 
Fix bug 20580.

See merge request easycorp/zentaopms!2404
 2022-03-22 00:35:07 +00:00
孙广明 a222494e09 Merge branch 'sprint/sunhao/firefox_bug' into 'master' 
* Fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>.

See merge request easycorp/zentaopms!2401
 2022-03-22 00:34:50 +00:00
孙广明 abaf5322da Merge branch 'sprint/autoTest_liumengyi_bug' into 'master' 
*  Add auto test of bug.

See merge request easycorp/zentaopms!2409
 2022-03-22 00:34:11 +00:00
孙广明 386dd3f000 Merge branch 'pailei2_zhouxin_19382' into 'pailei2' 
Fix bug #19382.

See merge request easycorp/zentaopms!2392
 2022-03-22 00:33:36 +00:00
王怡栋 b0ebeb78c4 Merge branch 'sprint/master_lanzongjun_fixbug_version_biz' into 'master' 
* fix bug #15274

See merge request easycorp/zentaopms!2386
 2022-03-22 00:32:33 +00:00
王怡栋 a1f6d6153e Merge branch 'sprint/master_tanghucheng_fixbug' into 'master' 
* Fix bug #20968,20964.

See merge request easycorp/zentaopms!2406
 2022-03-22 00:32:01 +00:00
liumengyi 69539bd185 * Add auto test of bug. 2022-03-22 08:31:54 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
Hao Sun 83b20464e6 * Fix paste image from dingding not work @mayue. 2022-03-21 17:21:20 +08:00
tanghucheng 987d0d0443 * Fix bug #20968,20964. 2022-03-21 17:00:42 +08:00
Wenrui LI 1fae65d083 * hide region and lane if actually not configurable, task #51308. 2022-03-21 16:49:43 +08:00
liyuchun 8b2d19b30c * Fix bug #20580. 2022-03-21 16:47:57 +08:00
李玉春 f676dddc95 Merge branch 'pailei2_sunhao_bug20681' into 'pailei2' 
* update zui and fix z-index conflict with pager dropmenu for fixed header in datatable.

See merge request easycorp/zentaopms!2396
 2022-03-21 08:44:26 +00:00
李玉春 0e4e9594c7 Merge branch 'pailei2_mayue_bug#20808' into 'pailei2' 
* Fix bug #20808.

See merge request easycorp/zentaopms!2403
 2022-03-21 08:44:09 +00:00
mayue 8f09a4957c Optimize code. 2022-03-21 16:37:56 +08:00
mayue 710805bcb0 Optimize code. 2022-03-21 16:35:54 +08:00
mayue eb54393450 * Fix bug #20808. 2022-03-21 16:26:28 +08:00
Wenrui LI 33450fe66d * use lite version and remove upgrade link from about panel of lite vision, task #51320, bug #20959. 2022-03-21 16:24:36 +08:00
孙广明 9995d4c68d Merge branch 'fixbug' into 'master' 
* Fix bug for upgrade.

See merge request easycorp/zentaopms!2400
 2022-03-21 08:13:34 +00:00
孙广明 b7ccaaec25 Update model.php 2022-03-21 08:13:24 +00:00
tanghucheng 3bda7c38aa * Fix bug for upgrade. 2022-03-21 16:07:03 +08:00
Hao Sun aee62254eb * fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>. 2022-03-21 16:03:52 +08:00
Wenrui LI fad89ad0a8 * remove 'common' from kanban for lite vision, task #51334, bug #20995. 2022-03-21 15:55:12 +08:00
Wenrui LI a702b7cf5b * remove score menus from lite vision, task #51309. 2022-03-21 15:48:51 +08:00
Hao Sun 58cdb8c1b2 * update zui and fix z-index conflict with pager dropmenu for fixed header in datatable. 2022-03-21 15:23:44 +08:00