Commit Graph
1150 Commits
Author SHA1 Message Date
zenggang dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
王怡栋 d6ea8aea86 Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.

See merge request easycorp/zentaopms!4676
2022-07-28 00:52:40 +00:00
xieqiyu e927796641 * Fix bug#25004. 2022-07-28 08:16:07 +08:00
xieqiyu 0ec68feb10 * Fix bug#25004. 2022-07-27 21:38:28 +08:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
xieqiyu cd8247954c * Fix bug#25004. 2022-07-27 13:31:48 +08:00
zhouxudong 3e842a6316 * Fix bug #25696. 2022-07-26 08:53:24 +00:00
王怡栋 649950fa21 Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.

See merge request easycorp/zentaopms!4657
2022-07-26 07:14:19 +00:00
zhouxudong b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
zenggang c368f63f6d * Adjust code 2022-07-22 02:01:47 +00:00
zenggang dba57b45cd * Adjust code 2022-07-22 01:04:24 +00:00
zenggang 2c2141e055 * Fix bug#25591,25593 2022-07-21 09:04:46 +00:00
zenggang 0655809533 * Fix sprint217 bugs. 2022-07-21 04:06:11 +00:00
王怡栋 08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00:00
王怡栋 c0d3c1da7f Merge branch 'sprint/217_zg_61182' into 'master'
* Finish task#61182,61168

See merge request easycorp/zentaopms!4615
2022-07-20 09:29:07 +00:00
tianshujie 93f70dcf70 * Modify the jump link after saving the created program. 2022-07-20 17:25:25 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
tianshujie 68eecb775e * Fix bug #25483. 2022-07-20 16:07:50 +08:00
tianshujie c4ab5588af * Fix bug #25483. 2022-07-20 15:59:50 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
tianshujie 38325e32a8 * Fix bug #22964. 2022-07-13 09:05:36 +08:00
tianshujie b68d6cca86 * Fix bug #23119. 2022-07-13 08:37:52 +08:00
zhouxudong 951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
tianshujie fe226c094b * Fix bug #24913. 2022-07-08 15:17:02 +08:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zhouxudong bc16e41c73 * Fix bug #24472. 2022-06-30 02:44:29 +00:00
王怡栋 e00896f727 Merge branch 'sprint/master_zhouxudong_24417' into 'master'
Sprint/master zhouxudong 24417

See merge request easycorp/zentaopms!4237
2022-06-30 01:28:55 +00:00
zhouxudong 298493d3a1 * Fix bug #24417. 2022-06-30 00:57:18 +00:00
zhouxudong 461235a048 * Fix bug #24417. 2022-06-29 09:00:33 +00:00
tianshujie 105ab0aeeb * Fix bug #24365. 2022-06-29 13:39:26 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
liumengyi 3dda133a92 * Finish task #58561. 2022-06-28 11:08:30 +08:00
王怡栋 2a82c6a6a1 Merge branch 'sprint/master_zhouxudong_58576' into 'master'
Sprint/master zhouxudong 58576

See merge request easycorp/zentaopms!4163
2022-06-28 01:05:10 +00:00
zhouxudong 72200617d3 * Finish task #58576. 2022-06-28 00:57:01 +00:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
zhouxudong 69b87ae29f * Fix bug #24368. 2022-06-27 03:20:49 +00:00
zhouxudong 463b4d0710 * Finish task #57859. 2022-06-24 02:14:08 +00:00
王怡栋 4dab93ee3b Merge branch 'sprint/master_zhouxudong_57864' into 'master'
* Finish task #57864.

See merge request easycorp/zentaopms!4082
2022-06-23 00:40:27 +00:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
zhouxudong bc416e40fc * Finish task #57864. 2022-06-22 10:11:06 +00:00
tianshujie e2669481c7 * Added German and French. 2022-06-22 15:28:45 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08: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
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