Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
29,031 Commits 2 Branches 292 Tags
da47c729d9a5c87ee04b34fed388de150e52cd4d
Commit Graph
29031 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
liyuchun da47c729d9 * Adjust execution button name. 2021-11-22 13:36:52 +08:00
孙广明 319e30a822 Merge branch 'sprint/172_liyuchun_16510' into 'sprint/168' 
Sprint/172 liyuchun 16510

See merge request easycorp/zentaopms!565
 2021-11-22 02:36:53 +00:00
李玉春 bc262dd295 Merge branch 'sprint/168_liumengyi_16505' into 'sprint/168' 
* Fix Bug #16505.

See merge request easycorp/zentaopms!567
 2021-11-22 02:31:29 +00:00
liumengyi e477c580bf * Fix Bug #16505. 2021-11-22 10:28:18 +08:00
liumengyi 3836941efd * Fix Bug #16505. 2021-11-22 10:26:45 +08:00
liyuchun fb594d53f8 * Fix bug #16518. 2021-11-22 10:23:52 +08:00
liyuchun 98061fa481 * Fix bug #16513. 2021-11-22 10:15:03 +08:00
liyuchun 48909fa19b * Fix bug #16511. 2021-11-22 10:06:49 +08:00
liyuchun 83d49cb8d9 * Fix bug #16510. 2021-11-22 10:01:31 +08:00
liyuchun 55d9e9f7d1 Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168 2021-11-22 09:53:54 +08:00
孙广明 11f2c39369 Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168' 
Sprint/172 liyuchun bug

See merge request easycorp/zentaopms!561
 2021-11-22 01:13:44 +00:00
liyuchun f943413c6d * Adjust style. 2021-11-22 09:12:08 +08:00
zhujinyong 9bfa67680f Merge branch 'sprint/168_chaideqing_44636' into sprint/168 2021-11-22 08:56:02 +08:00
zhujinyong 3d89875eb0 Merge branch 'sprint/168_chaideqing_44634' into sprint/168 2021-11-22 08:53:58 +08:00
zhujinyong b5706189c3 Merge branch 'sprint/168_chaideqing_44635' into sprint/168 2021-11-22 08:51:49 +08:00
liyuchun 9502610ece * Fix error for task #44358. 2021-11-22 08:39:34 +08:00
文睿 李 68edb2f0a4 Merge branch 'sprint/168' into 'sprint/168_chaideqing_44636' 
# Conflicts:
#   module/task/css/x.view.css
 2021-11-22 00:23:57 +00:00
文睿 李 36c7fc5a94 Merge branch 'sprint/168' into 'sprint/168_chaideqing_44635' 
# Conflicts:
#   module/bug/css/x.view.css
 2021-11-22 00:23:13 +00:00
文睿 李 5c6023a75e * resolve conflict, Merge branch 'sprint/168' into 'sprint/168_chaideqing_44634' 
# Conflicts Resolved:
#   module/story/css/x.view.css
 2021-11-22 00:21:55 +00:00
liyuchun a946e26bfc Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168 2021-11-22 08:16:01 +08:00
朱金勇 b3762e84aa Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168' 
* beautify scroll bar for task/bug/story card

See merge request easycorp/zentaopms!519
 2021-11-22 00:14:33 +00:00
chaideqing 7bfb998913 * refactor 2021-11-19 16:14:47 +08:00
chaideqing be154ba960 * refactor 2021-11-19 16:12:10 +08:00
chaideqing 7f72b77b36 * refactor 2021-11-19 16:01:00 +08:00
liyuchun d185d6db49 * Fix bug #16380,#16387. 2021-11-19 15:13:34 +08:00
李玉春 1e6832e7d6 Merge branch 'sprint/168_hufangzhou_datatable' into 'sprint/168' 
* Update the datatable min.js and min.css file.

See merge request easycorp/zentaopms!554
 2021-11-19 06:28:40 +00:00
hufangzhou 35915aa0de * Update the datatable min.js and min.css file. 2021-11-19 14:16:19 +08:00
孙广明 54816620c8 Merge branch 'sprint/172_liyuchun_44358' into 'sprint/168' 
* Finish task #44357,#44358.

See merge request easycorp/zentaopms!553
 2021-11-19 05:01:47 +00:00
李玉春 0afa9524f9 Merge branch 'sprint/172_sgm_44349' into 'sprint/168' 
* Finish task #44349.

See merge request easycorp/zentaopms!551
 2021-11-19 04:30:31 +00:00
liyuchun 8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00
孙广明 7ed253e111 * Finish task #44349. 2021-11-19 11:08:04 +08:00
李玉春 e1a10d9333 Merge branch 'sprint/168_liumengyi_16467' into 'sprint/168' 
* Fix bug #16467.

See merge request easycorp/zentaopms!547
 2021-11-19 02:47:57 +00:00
chaideqing 55e85f39ac * task #44634, optimize story card in xuanxuan 2021-11-19 10:44:01 +08:00
liumengyi 4ffbc120a0 * Fix bug #16467. 2021-11-19 10:14:47 +08:00
李玉春 c546e57c62 Merge branch 'sprint/168_liumengyi_16467' into 'sprint/168' 
* Fix bug #16467.

See merge request easycorp/zentaopms!545
 2021-11-19 02:14:19 +00:00
liumengyi c38383ad40 * Fix bug #16467. 2021-11-19 10:08:40 +08:00
liumengyi 5d7ae6a71b * Fix bug #16467. 2021-11-19 10:06:56 +08:00
chaideqing e792607430 * task #44635, optimize bug card in xuanxuan 2021-11-19 10:04:30 +08:00
chaideqing c36c339848 * task #44636, optimize task card in xuanxuan 2021-11-19 09:45:06 +08:00
孙广明 24d18f9c01 Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168' 
Sprint/172 liyuchun bug

See merge request easycorp/zentaopms!535
 2021-11-19 00:58:44 +00:00
孙广明 275404e672 Merge branch 'sprint/172_liyuchun_45368' into 'sprint/168' 
* Finish task #44368.

See merge request easycorp/zentaopms!533
 2021-11-19 00:40:37 +00:00
liyuchun a240c9aa23 * Fix bug #16426,#16393. 2021-11-18 23:17:15 +08:00
liyuchun d188fbd7b8 * Fix bug #16389,#16387. 2021-11-18 22:54:48 +08:00
liyuchun 8980685d6b Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into 168 2021-11-18 21:56:48 +08:00
李玉春 6feb9a878b Merge branch 'sprint/168_sunhao/improve_product_list' into 'sprint/168' 
* Task #44364, improve UI for page product/all.

See merge request easycorp/zentaopms!531
 2021-11-18 09:30:27 +00:00
李玉春 683b082095 Merge branch 'sprint/168_sunhao/task44357' into 'sprint/168' 
* Task #44357, refactor executions kanban with kanban component and support dnd.

See merge request easycorp/zentaopms!497
 2021-11-18 09:23:47 +00:00
李玉春 6d3d9d94e1 Merge branch 'sprint/168_tengfei_16386' into 'sprint/168' 
* Edit lang for feedbackby.

See merge request easycorp/zentaopms!522
 2021-11-18 09:19:45 +00:00
Hao Sun c2b944d7e9 * adjust table layout for english environment. 2021-11-18 17:08:02 +08:00
Hao Sun 759533f592 * task #44364, improve layout for page product/all. 2021-11-18 16:45:11 +08:00
liyuchun 5705ff994f * Finish task #44368. 2021-11-18 16:25:33 +08:00