Commit Graph
33880 Commits
Author SHA1 Message Date
tianshujie 24fcb20079 * Finish task #57895. 2022-06-20 17:04:29 +08:00
tanghucheng bd259de8ca * Fix bug . 2022-06-20 16:54:25 +08:00
zhouxudong 64310b7dfb * Finish task #57871. 2022-06-20 08:17:44 +00:00
zhouxudong e2d00ec066 * Finish task #57880 #57881 #57866. 2022-06-20 08:11:52 +00:00
孙广明 82245e8a88 * Fix misc-ping bug. 2022-06-20 16:04:07 +08:00
zhouxudong 32c34c35e9 * Finish task #57880 #57881 #57866. 2022-06-20 07:43:08 +00:00
guofeilong a76044dff8 * fix bug #23659 2022-06-20 07:18:41 +00:00
宋辰轩 9460102a29 * Format. 2022-06-20 15:11:29 +08:00
宋辰轩 0b83f28fe9 * CommonLang. 2022-06-20 15:09:59 +08:00
leiyong 101c0f58a5 * Finish task#57863. 2022-06-20 06:58:29 +00:00
tianshujie 503f0feaa1 * Delete useless code. 2022-06-20 14:41:23 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
zhouxudong 19d289455a * Finish task #57880 #57881 #57866. 2022-06-20 06:34:29 +00:00
caoyanyi e138da8508 * Finish task #57665. 2022-06-20 13:02:32 +08:00
王怡栋 233d78e4b7 Merge branch 'fixbug' into 'master'
* Fix bug #23908,23888.

See merge request easycorp/zentaopms!4016
2022-06-20 03:18:37 +00:00
tanghucheng 09268cfe23 * Fix bug . 2022-06-20 10:50:54 +08:00
zhujinyong c2bff85082 * Fix fail of ciresult. 2022-06-20 08:50:47 +08:00
孙广明 11c5cd1999 Merge branch 'sprint/sunhao/apps_loading_state' 2022-06-18 00:10:31 +08:00
Hao Sun ef0f9634be * add loading indicator on loading apps. 2022-06-17 15:35:36 +00:00
dingyongliang 0774bce6ef * electron/zentao: merge navigation bar and control bar. 2022-06-17 09:18:07 +00:00
王怡栋 619c03be5d Merge branch 'sgm_fixbug' into 'master'
* Code for product order.

See merge request easycorp/zentaopms!4012
2022-06-17 08:26:27 +00:00
孙广明 9ac3ed7851 * Code for product order. 2022-06-17 16:23:46 +08:00
王怡栋 e2439f2a5c Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23891.

See merge request easycorp/zentaopms!4011
2022-06-17 08:19:30 +00:00
孙广明 6ff93fcc13 Merge branch 'sprint/sunhao/optimize_program_list' into 'master'
* optimize program list, support to preserve nested state.

See merge request easycorp/zentaopms!4010
2022-06-17 08:06:58 +00:00
Hao Sun 72d4c854d3 * prevent user move row by click a link. 2022-06-17 07:39:03 +00:00
Hao Sun 775746df0a * optimize program list, support to preserve nested state. 2022-06-17 07:31:51 +00:00
tanghucheng 9d92db9900 * Fix bug #23891. 2022-06-17 15:25:12 +08:00
孙广明 642b518397 Merge branch 'codeReview' into 'master'
codeReview

See merge request easycorp/zentaopms!4004
2022-06-17 07:11:23 +00:00
sunjun ca2b45736b codeReview 2022-06-17 07:04:52 +00:00
tianshujie d95a2fee68 * Fix bug #23918. 2022-06-17 14:59:22 +08:00
mayue 2295ee69d5 * Fix bug #23868. 2022-06-17 14:55:25 +08:00
孙广明 6d815e5c33 Merge branch 'sprint202_leiyong_fix_bug_23874' into 'master'
* Adjust CSS.

See merge request easycorp/zentaopms!4006
2022-06-17 06:15:47 +00:00
孙广明 0a00dfe217 Merge branch 'sprint/203_mayue_bug#23865#23869' into 'master'
* Fix bug #23865#23869.

See merge request easycorp/zentaopms!4000
2022-06-17 06:15:36 +00:00
mayue 49db5d2b2e * Fix bug #23870#23868. 2022-06-17 14:12:47 +08:00
李玉春 6429293b82 Merge branch 'zhouxin_codereview' into 'master'
* Code for review.

See merge request easycorp/zentaopms!4001
2022-06-17 05:38:33 +00:00
leiyong eb6e217f3c * Adjust CSS. 2022-06-17 05:21:40 +00:00
leiyong c9f1e15c2f * Adjust CSS. 2022-06-17 05:20:32 +00:00
孙广明 b345f5510c Merge branch 'sprint/tianshujie_modifyTip' into 'master'
* Modify Modify program prompt when editing a product.

See merge request easycorp/zentaopms!3996
2022-06-17 05:17:41 +00:00
孙广明 b52ef1c426 Merge branch 'sprint/204_tianshujie_optimize' into 'master'
* Optimize the code.

See merge request easycorp/zentaopms!4005
2022-06-17 05:16:52 +00:00
tianshujie 33cecbfcd3 * Optimize the code. 2022-06-17 13:14:55 +08:00
zhouxin 600a10d7ac * Fix bug #23635. 2022-06-17 05:09:13 +00:00
sunjun fec9f4f1dd codeReview 2022-06-17 05:05:44 +00:00
Hao Sun 834689d226 * bug #23877, fix user picker not work as expected. 2022-06-17 04:04:28 +00:00
tianshujie a974f333d2 * Modify Edit logic for switching program. 2022-06-17 11:46:43 +08:00
tianshujie a2421b85bb * Modify Edit logic for switching program. 2022-06-17 11:37:40 +08:00
zhouxin a6c7038d6c * Code for review. 2022-06-17 03:19:45 +00:00
mayue dc8e372a00 * Fix bug #23865#23869. 2022-06-17 11:18:25 +08:00
孙广明 694862f38d * Code for zentao license. 2022-06-17 11:09:57 +08:00
wangyidong 182f601ed2 * fix bug #23740. 2022-06-17 10:32:31 +08:00
王怡栋 3264102179 Merge branch 'sprint202_leiyong_fix_bug_23841' into 'master'
* Fix bug#23841.

See merge request easycorp/zentaopms!3997
2022-06-17 02:07:06 +00:00