Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
36,422 Commits 2 Branches 292 Tags
93d7e2dd1de2d3747494edc8260c51c76a007b14
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 ceb70f1ad1 Merge branch 'fixbug' into 'master' 
* Fix bug #21177,21009,21211.

See merge request easycorp/zentaopms!2558
 2022-03-28 07:01:13 +00:00
王怡栋 4cc935e4e4 Merge branch 'sprint/fixbug_hufangzhou_15653' into 'master' 
* Fix bug #15653.

See merge request easycorp/zentaopms!2578
 2022-03-28 07:00:25 +00:00
王怡栋 76688d1718 Merge branch 'sprint/fixbug_hufangzhou_17995' into 'master' 
* Fix bug #17995.

See merge request easycorp/zentaopms!2573
 2022-03-28 05:03:35 +00:00
王怡栋 47686bb70b Merge branch 'sprint/fixbug_hufangzhou_17974' into 'master' 
* Fix bug #17974.

See merge request easycorp/zentaopms!2565
 2022-03-28 05:03:05 +00:00
王怡栋 45ba41e14e Merge branch 'fixbug' into 'master' 
* Fix bug #21034,21059.

See merge request easycorp/zentaopms!2542
 2022-03-25 06:16:55 +00:00
王怡栋 b1b05f4fc0 Merge branch 'sprint/fixbug_hufangzhou_markdown' into 'master' 
* Update the library of parse markdown.

See merge request easycorp/zentaopms!2544
 2022-03-25 06:16:30 +00:00
王怡栋 44d14b8c6a Merge branch 'sprint/lite6_lwr_fix_table_footer' into 'master' 
* set z-index to table-footer, fix bug #21053.

See merge request easycorp/zentaopms!2509
 2022-03-24 08:39:42 +00:00
王怡栋 2b3cb7a687 Merge branch 'sprint/fixbug_hufangzhou_16183' into 'master' 
* Fix bug #16183.

See merge request easycorp/zentaopms!2510
 2022-03-24 08:39:23 +00:00
王怡栋 f292ad9465 Merge branch 'sprint/master_lanzongjun_fixbug_add_params' into 'master' 
* add params

See merge request easycorp/zentaopms!2503
 2022-03-24 04:03:18 +00:00
王怡栋 7c8dcef938 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-23 17:28:59 +08:00
王怡栋 2f0f2e2965 * adjust for js default value and init userview in upgrade. 2022-03-23 17:19:41 +08:00
王怡栋 da33f252eb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-23 17:19:15 +08:00
王怡栋 d0db0db7bc * adjust for get langs api. 2022-03-23 17:18:43 +08:00
王怡栋 f41e6c2932 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master' 
* fix task #51328

See merge request easycorp/zentaopms!2489
 2022-03-23 08:56:06 +00:00
王怡栋 181c0025a4 Merge branch 'sprint/tianshujie_bug_20653' into 'master' 
* Fix bug #20653.

See merge request easycorp/zentaopms!2491
 2022-03-23 08:55:50 +00:00
王怡栋 5921641367 Merge branch 'sprint/hufangzhou_xuanxuan' into 'master' 
* Remove the code.

See merge request easycorp/zentaopms!2490
 2022-03-23 08:55:31 +00:00
王怡栋 b1adc7e106 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master' 
* fix bug #19605

See merge request easycorp/zentaopms!2487
 2022-03-23 08:20:22 +00:00
王怡栋 100c5e3506 Merge branch 'sprint/sunhao/optimize_kanban' into 'master' 
* Fix bugs for kanban, include bug #17938, bug #19116, bug #18935, bug #18985, bug #19078.

See merge request easycorp/zentaopms!2482
 2022-03-23 08:19:58 +00:00
王怡栋 fb917029b7 Merge branch 'fixbug' into 'master' 
* Fix bug #21032.

See merge request easycorp/zentaopms!2478
 2022-03-23 08:17:24 +00:00
王怡栋 b86c3a2a59 Merge branch 'sprint/hufangzhou_multipleConcurrency' into 'master' 
* Modify the makefile for multiple concurrency.

See merge request easycorp/zentaopms!2484
 2022-03-23 07:36:15 +00:00
王怡栋 c2d1285a2b Merge branch 'sprint/lite6_lwr_tweak_chat' into 'master' 
Tweak chat, rename xuan to chat and disable by default.

See merge request easycorp/zentaopms!2474
 2022-03-23 06:23:06 +00:00
王怡栋 3fb42d9983 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master' 
* fix task #51317

See merge request easycorp/zentaopms!2463
 2022-03-23 06:22:15 +00:00
王怡栋 8daf73d131 Merge branch 'sprint/fixbug_hufangzhou_xuanxuan' into 'master' 
* Temporary fix the navigation of xuanxuan conference.

See merge request easycorp/zentaopms!2476
 2022-03-23 06:21:45 +00:00
王怡栋 a83c92fc96 Merge branch 'sprint/fixbug_hufangzhou_14233' into 'master' 
* Fix bug #14233.

See merge request easycorp/zentaopms!2471
 2022-03-23 06:21:21 +00:00
王怡栋 43d45de812 Merge branch 'sprint/fixbug_hufangzhou_16207' into 'master' 
* Fix bug #16207.

See merge request easycorp/zentaopms!2464
 2022-03-23 06:20:37 +00:00
王怡栋 39c46536f1 * code for task #51327. 2022-03-23 11:05:58 +08:00
王怡栋 45b5857ac8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-23 10:55:47 +08:00
王怡栋 d71568e98d * code for task #51327. 2022-03-23 10:55:05 +08:00
王怡栋 a18d75137f Merge branch 'sprint/lite6_lwr_task_batch_create_hide_region' into 'master' 
* optimize lane loading for task batchcreate, and remove region and lane...

See merge request easycorp/zentaopms!2452
 2022-03-23 00:48:46 +00:00
王怡栋 de9ababa43 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master' 
* fix bug #19816

See merge request easycorp/zentaopms!2449
 2022-03-23 00:47:55 +00:00
王怡栋 707f85bb13 Merge branch 'fixbug' into 'master' 
* Fix bug #51313,20782.

See merge request easycorp/zentaopms!2455
 2022-03-23 00:47:28 +00:00
王怡栋 3d64ad4392 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 16:28:26 +08:00
王怡栋 2684fd08fe * code for task #51330. 2022-03-22 16:27:54 +08:00
王怡栋 25f329403f Merge branch 'sprint/lite6_lwr_task_create_from_kanban_styles' into 'master' 
* fix chosen floating upon modal header on task create, task #51325, bug #20701.

See merge request easycorp/zentaopms!2434
 2022-03-22 05:20:33 +00:00
王怡栋 cb715c23e9 Merge branch 'sprint/lite6_lwr_dynamic_order_styles' into 'master' 
* fix dynamic order select styles, task #51310, bug #20973.

See merge request easycorp/zentaopms!2431
 2022-03-22 03:16:10 +00:00
王怡栋 f79a07116b Merge branch 'sprint/lite6_lwr_hide_visions' into 'master' 
* remove user vision field if there is no other vision available, task #51318, bug #20691.

See merge request easycorp/zentaopms!2407
 2022-03-22 03:15:40 +00:00
王怡栋 890b8a39c6 Merge branch 'sprint/lite6_lwr_filter_deleted_lanes' into 'master' 
* filter out deleted lanes, task #51311, bug #20972.

See merge request easycorp/zentaopms!2426
 2022-03-22 03:14:12 +00:00
王怡栋 6ed9d8fc31 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master' 
* Fix bug#20968,20997.

See merge request easycorp/zentaopms!2430
 2022-03-22 03:11:38 +00:00
王怡栋 792501cf85 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master' 
* fix task #51347,#51307

See merge request easycorp/zentaopms!2429
 2022-03-22 03:09:56 +00:00
王怡栋 28a23e9fce Merge branch 'sprint/fixbug_hufangzhou_17264' into 'master' 
* Fix bug #17264.

See merge request easycorp/zentaopms!2423
 2022-03-22 03:01:01 +00:00
王怡栋 d0b4e05307 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:54:25 +08:00
王怡栋 ff30f9fa2f * adjust for init story for batch create task. 2022-03-22 10:53:26 +08:00
王怡栋 ffae3aa899 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:32:40 +08:00
王怡栋 25b0c39dcc * fix bug #21029. 2022-03-22 10:31:47 +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
王怡栋 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
王怡栋 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
王怡栋 01abf2d1c6 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!2373
 2022-03-18 06:59:17 +00:00
王怡栋 3a2774b102 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master' 
* Fix bug#20897,20907.

See merge request easycorp/zentaopms!2359
 2022-03-18 06:58:41 +00:00
王怡栋 f00fe19d41 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'master' 
* fix bug #20922

See merge request easycorp/zentaopms!2362
 2022-03-18 04:12:25 +00:00
王怡栋 f9b078f056 Merge branch 'sprint/master_lanzongjun_fixbug_lite' 2022-03-18 10:16:02 +08:00
王怡栋 b7ffb3134b Merge branch 'master' into 'sprint/master_lanzongjun_fixbug_lite' 
# Conflicts:
#   extension/lite/install/ext/lang/zh-cn/lite.php
 2022-03-18 02:15:23 +00:00
王怡栋 24442be3c5 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #19287(biz)

See merge request easycorp/zentaopms!2357
 2022-03-18 01:58:27 +00:00
王怡栋 897ae6e1b2 Merge branch 'sprint/master_lanzongjun_fixbug_nopermission' into 'master' 
* fix bug no permisssion

See merge request easycorp/zentaopms!2347
 2022-03-18 01:51:46 +00:00
王怡栋 7216dbd7c9 Merge branch 'sprint/master_tanghucheng_install' into 'master' 
* Adjust for lite install.

See merge request easycorp/zentaopms!2354
 2022-03-18 01:51:05 +00:00
王怡栋 7638020fad Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-18 09:49:48 +08:00
王怡栋 b3cca161cc * adjust for install page in lite. 2022-03-18 09:49:05 +08:00
王怡栋 5117bf7541 * fix bug #15347,15345. 2022-03-17 11:26:01 +08:00
王怡栋 7e0a6e8b11 * fix bug #19267. 2022-03-17 09:41:28 +08:00
王怡栋 e865920607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 16:46:25 +08:00
王怡栋 69d7749489 * code for welcome block. 2022-03-16 16:35:33 +08:00
王怡栋 83738dadb6 Merge branch 'sgm_unittest' into 'master' 
Sgm unittest

See merge request easycorp/zentaopms!2310
 2022-03-16 07:20:59 +00:00
王怡栋 22406348f6 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #20787

See merge request easycorp/zentaopms!2306
 2022-03-16 07:14:08 +00:00
王怡栋 6b44c9e08b Merge branch 'sprint/187_hufangzhou_globalSearch' into 'master' 
* Adjust the width of global search box.

See merge request easycorp/zentaopms!2309
 2022-03-16 07:09:02 +00:00
王怡栋 a7f00ab8db Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 14:07:07 +08:00
王怡栋 5dcb56bf35 * remove ldap dependent when build rpm and deb. 2022-03-16 14:05:58 +08:00
王怡栋 e187adafd8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 13:27:01 +08:00
王怡栋 eac22108fe * code for story #31383. 2022-03-16 13:25:44 +08:00
王怡栋 74280e35c8 Merge branch 'sprint/pailei2_tianshujie_19314' into 'pailei2' 
Sprint/pailei2 tianshujie 19314

See merge request easycorp/zentaopms!2293
 2022-03-16 05:04:59 +00:00
王怡栋 371b7a7d7d Merge branch 'sprint/pailei2_tianshujie_17944' into 'pailei2' 
* Fix bug #17944.

See merge request easycorp/zentaopms!2292
 2022-03-16 05:04:22 +00:00
王怡栋 cc6c164063 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!2290
 2022-03-16 02:00:35 +00:00
王怡栋 f8b6ae99bb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-15 17:17:49 +08:00
王怡栋 c2e8cea442 * adjust code for check update. 2022-03-15 17:17:12 +08:00
王怡栋 092c020b32 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #20692

See merge request easycorp/zentaopms!2272
 2022-03-15 08:42:55 +00:00
王怡栋 fd54aab208 Merge branch 'sprint/pailei2_tianshujie_19312' into 'pailei2' 
* Fix bug #19312.

See merge request easycorp/zentaopms!2276
 2022-03-15 08:41:47 +00:00
王怡栋 2acf7fd44e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #20760,#20761,#20762,#20763

See merge request easycorp/zentaopms!2267
 2022-03-15 07:24:22 +00:00
王怡栋 78de67f523 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-15 14:31:51 +08:00
王怡栋 9ffa55da56 * fix bug #20682. 2022-03-15 14:31:01 +08:00
王怡栋 286aa9c7d0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #19535

See merge request easycorp/zentaopms!2260
 2022-03-15 03:29:28 +00:00
王怡栋 2ae8b25fa9 Merge branch 'sprint/master_tanghucheng_fix' into 'master' 
* Fix bug #20754,20776,20759.

See merge request easycorp/zentaopms!2262
 2022-03-15 03:27:08 +00:00
王怡栋 6e9d75f2bd Merge branch 'sprint/master_tanghucheng_fix' into 'master' 
* Fix bug #20741,20737,20734,20733.

See merge request easycorp/zentaopms!2254
 2022-03-15 01:11:38 +00:00
王怡栋 c5d1d463a8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #20703,#19430

See merge request easycorp/zentaopms!2235
 2022-03-15 00:58:13 +00:00
王怡栋 e2fad711b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 17:28:35 +08:00
王怡栋 3c1865c527 * adjust code for order by. 2022-03-14 17:28:14 +08:00
王怡栋 8bc5c57b78 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 16:09:24 +08:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
王怡栋 e08cbf07d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-14 15:52:40 +08:00
王怡栋 aa38fe6ec9 * adjust for compute burn. 2022-03-14 15:50:57 +08:00
王怡栋 7fd6757311 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Modify the problem that the execution label cannot be fully displayed.

See merge request easycorp/zentaopms!2220
 2022-03-14 00:58:01 +00:00