Commit Graph

1113 Commits

Author SHA1 Message Date
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
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
孙广明
3c35bd84ea Merge branch 'sprint/201_tianshujie_23855' into 'master'
* Fix bug #23855.

See merge request easycorp/zentaopms!3980
2022-06-16 08:37:23 +00:00
tianshujie
b438c9882a * Fix bug #23855. 2022-06-16 16:31:01 +08:00
wangyidong
d5bdb62738 * fix bug #23814. 2022-06-16 16:19:03 +08:00
tianshujie
d9731bb06c * Fix bug #23855. 2022-06-16 16:12:37 +08:00
tianshujie
641c13383b * Fix bug #23855. 2022-06-16 16:06:55 +08:00
tianshujie
61d8ccda45 * Fix bug #23855. 2022-06-16 15:37:59 +08:00
李玉春
a3440508a4 Merge branch 'sprint/wangzemei/23705' into 'master'
* fix bug 23705

See merge request easycorp/zentaopms!3940
2022-06-16 03:04:15 +00:00
wangzemei
ea0aeec4e8 * delete space 2022-06-16 00:57:37 +00:00
wangzemei
1ccd06777c * delete extra code about 23705 2022-06-16 00:46:27 +00:00
wangzemei
141f8bd24a * fix bug 23705 2022-06-15 07:28:04 +00:00
孙广明
418abdf41c * Fix program list bug. 2022-06-15 14:34:25 +08:00
xieqiyu
770f4f978d * Fix bug of program list in normal user. 2022-06-15 10:03:14 +08:00
zhouxudong
483ecf2847 * Finish task #56908. 2022-06-13 08:01:10 +00:00
zhouxudong
f6c4b3adb1 * Finish task #56908. 2022-06-13 07:59:29 +00:00
zhouxudong
9743e0031b * Finish task #56908. 2022-06-13 07:46:52 +00:00
zhouxudong
d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
xieqiyu
6fdcc5f826 * Modify review code for bug#23185. 2022-06-01 23:34:48 +08:00
xieqiyu
b0bac9dfae * Fix bug#23185. 2022-06-01 23:21:22 +08:00
xieqiyu
6e6d83b814 * Fix bug#23185. 2022-06-01 21:36:15 +08:00
xieqiyu
1a24cdbc80 * Fix bug#23185. 2022-06-01 21:29:30 +08:00
王怡栋
f64b61a487 Merge branch 'sprint/196' into 'master'
Sprint/196

See merge request easycorp/zentaopms!3677
2022-06-01 02:28:26 +00:00
tanghucheng
f3a1f7cf2a * Fix bug #23114. 2022-05-31 16:47:13 +08:00
xieqiyu
7255e0dedc * Add notes for task#55628. 2022-05-31 02:58:56 +08:00
xieqiyu
95f202ade2 * Code for task#55628. 2022-05-31 01:37:02 +08:00
xieqiyu
833e82205c * Code for bug#23055. 2022-05-29 22:16:17 +08:00
xieqiyu
a9ce5f8e01 * Restore code for task#54988. 2022-05-27 02:17:08 +08:00
xieqiyu
c33f911e59 * Modify review code. 2022-05-26 11:19:36 +08:00
xieqiyu
fce652ac7c * Finish task#54988. 2022-05-26 11:03:24 +08:00
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
王怡栋
e093aac4ca Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477

See merge request easycorp/zentaopms!3541
2022-05-20 06:07:46 +00:00
leiyong
df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
xieqiyu
cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
leiyong
77a180d4ad * Fix bug#22713. 2022-05-20 00:37:44 +00:00
李玉春
088bea319e Merge branch 'sprint/192_leiyong_task_54469' into 'master'
Sprint/192 leiyong task 54469

See merge request easycorp/zentaopms!3517
2022-05-19 07:53:10 +00:00
leiyong
4c14307de1 * Adjust CSS. 2022-05-19 07:44:47 +00:00