Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
36,223 Commits 2 Branches 292 Tags
d1f18c6b087580553c7201b05bfae14528ea46ea
Commit Graph
36223 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
liyuchun d1f18c6b08 Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-25 15:30:06 +08:00
王怡栋 67d4afd772 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package' 
* fix bug #21005

See merge request easycorp/zentaopms!2546
 2022-03-25 07:29:20 +00:00
liyuchun b664c25b21 * Fix bug #21171. 2022-03-25 15:28:14 +08:00
孙广明 da5795f6c5 Merge branch 'sprint/165_tanghucheng_fixbug' into 'sprint/165_package' 
* Fix bug #21164.

See merge request easycorp/zentaopms!2549
 2022-03-25 06:59:32 +00:00
tanghucheng 1954837f7f * Code for bug #21164. 2022-03-25 14:57:25 +08:00
hufangzhou ec34fa3832 * Update the library of parse markdown. 2022-03-25 14:46:14 +08:00
tanghucheng 4ecf869644 * Fix bug #21164. 2022-03-25 14:42:54 +08:00
Zongjun Lan 733cbedc1e * fix bug #21005 2022-03-25 14:26:17 +08:00
王怡栋 adee678647 Merge branch 'sprint/lite6_lwr_remove_score_notice' into 'sprint/165_package' 
* remove score notice for lite vision, bug #21119.

See merge request easycorp/zentaopms!2538
 2022-03-25 06:18:25 +00:00
王怡栋 cf767890c9 Merge branch 'sprint/lite6_lwr_fix_reorder_dynamic' into 'sprint/165_package' 
* fix unable to reorder in dynamic view, bug #21046.

See merge request easycorp/zentaopms!2537
 2022-03-25 06:17:53 +00:00
Wenrui LI aed115d5cf * remove score notice for lite vision, bug #21119. 2022-03-25 11:11:10 +08:00
Wenrui LI c3d025f199 * fix unable to reorder in dynamic view, bug #21046. 2022-03-25 11:05:46 +08:00
王怡栋 1ea49388a3 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package' 
* fix bug classic user edit and batchedit

See merge request easycorp/zentaopms!2531
 2022-03-25 02:17:18 +00:00
Zongjun Lan 47b88a959d * fix bug classic user edit and batchedit 2022-03-25 10:15:31 +08:00
songchenxuan ffbe60adf9 *English features. 2022-03-25 09:52:28 +08:00
songchenxuan 0444efa95f *English features. 2022-03-25 09:51:42 +08:00
朱金勇 f8911950dd Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package' 
* fix bug classic vision

See merge request easycorp/zentaopms!2529
 2022-03-25 01:39:47 +00:00
Zongjun Lan b80761648b * fix bug classic vision 2022-03-25 09:36:56 +08:00
hufangzhou a3c79e6a10 Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_package 2022-03-25 09:14:25 +08:00
hufangzhou 96de3c81b2 * Fix bug #21145. 2022-03-25 09:13:31 +08:00
李玉春 de368a9d90 Merge branch 'sprint/165_zhouxudong_16718' into 'sprint/165_package' 
* Fix bug #16718.

See merge request easycorp/zentaopms!2524
 2022-03-25 00:59:21 +00:00
zhouxudong a719a12cba * Fix bug #16718. 2022-03-25 08:38:22 +08:00
zhouxin 7d0d641629 * Fix bug #20813. 2022-03-24 09:31:57 +00:00
zhouxin eb977b865d Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into package 2022-03-24 08:57:23 +00:00
zhouxin 3291a491c9 Fix bug. 2022-03-24 08:55:56 +00:00
王怡栋 47318553e7 Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-24 16:41:06 +08:00
王怡栋 5831ae3b29 * fix bug. 2022-03-24 16:40:28 +08:00
王怡栋 e504d28044 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package' 
* fix bug #21088,#21077

See merge request easycorp/zentaopms!2507
 2022-03-24 08:39:06 +00:00
Zongjun Lan a37d937d63 * fix bug #21077 2022-03-24 16:35:51 +08:00
tianshujie b62c165dee Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-24 16:02:43 +08:00
tianshujie 9f3f0bd8c6 * Fix bug #20858. 2022-03-24 16:01:18 +08:00
李玉春 a71c0beef4 Merge branch 'sprint/fixbug_zhouxudong' into 'sprint/165_package' 
* Fix bug #21117.

See merge request easycorp/zentaopms!2514
 2022-03-24 07:43:42 +00:00
zhouxudong c76b1054d8 * Fix bug #21117. 2022-03-24 15:18:18 +08:00
王怡栋 642339d8e0 Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-24 14:57:03 +08:00
王怡栋 7d3fa9fbab * code for task #51509. 2022-03-24 14:56:40 +08:00
tianshujie ffcff9430c Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package 2022-03-24 14:56:14 +08:00
tianshujie a5db3ca766 * optimize UI for kanban and fix drop rules not work. 2022-03-24 14:54:11 +08:00
李玉春 d38471abfc Merge branch 'sprint/fixbug_zhouxudong' into 'sprint/165_package' 
* Fix bug #21117.

See merge request easycorp/zentaopms!2512
 2022-03-24 06:47:51 +00:00
zhouxudong 5aade964d5 * Fix bug #21117. 2022-03-24 14:44:30 +08:00
Zongjun Lan e3fe57931f * fix bug #21088 2022-03-24 14:21:29 +08:00
hufangzhou 6726a3d816 Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_package 2022-03-24 13:23:12 +08:00
hufangzhou ec827b7ed0 * Give config 777 permission. 2022-03-24 13:23:03 +08:00
王怡栋 7bc4187c55 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package' 
* fix bug #21084,#21078

See merge request easycorp/zentaopms!2501
 2022-03-24 04:17:59 +00:00
Zongjun Lan 53d6d33f5b * fix bug #21084 2022-03-24 11:11:34 +08:00
Zongjun Lan 30a9ffc5ed * fix bug #21078 2022-03-24 11:11:12 +08:00
hufangzhou 11e151a6fa * Add the new version. 2022-03-24 10:48:05 +08:00
王怡栋 7c8dcef938 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-23 17:28:59 +08:00
孙广明 85c0bedc77 Merge branch 'master_xieqiyu_21037' into 'master' 
* Fix bug#21037.

See merge request easycorp/zentaopms!2480
 2022-03-23 09:27:21 +00: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