Commit Graph

634 Commits

Author SHA1 Message Date
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
wangyidong
17d1e3301b * code for #54801. 2022-05-20 15:54:35 +08:00
daitingting
00ebebb6ed * Check privilege by buildMenu. 2022-05-20 07:38:22 +00:00
daitingting
95aa1fc331 * Finish task #54801. 2022-05-19 06:34:06 +00:00
lanzongjun
867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun
ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
lanzongjun
10eebbd136 * fix bug #22570 2022-05-17 17:13:17 +08:00
tanghucheng
d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
liumengyi
566b87823f * Finish task #54346,#54345. 2022-05-17 10:07:26 +08:00
wangyuting2
41f8454bb4 * Adjust release action menu. 2022-05-11 16:52:02 +08:00
sunjun
eab7a12eff *Fixbug_sunjun_22310 2022-05-11 06:21:41 +00:00
sunjun
93d72810eb *Fixbug_sunjun_22310 2022-05-11 05:44:14 +00:00
孙广明
69d9ffe9ae Merge branch 'task_sunjun_53672' into 'master'
*task_sunjun_53672

See merge request easycorp/zentaopms!3300
2022-05-10 08:28:14 +00:00
sunjun
6abe1812a0 task_sunjun_53672 2022-05-10 08:23:33 +00:00
sunjun
0a23be8a5b task_sunjun_53672 2022-05-10 08:22:25 +00:00
sunjun
57b5a8a1c5 task_sunjun_53672 2022-05-10 08:13:05 +00:00
李玉春
25a2285ccc Merge branch 'sprint_sunjun_53654' into 'master'
Sprint sunjun 53654

See merge request easycorp/zentaopms!3308
2022-05-10 07:43:55 +00:00
sunjun
14b9350a1c sprint_sunjun_53654 2022-05-10 07:40:57 +00:00
sunjun
d88c1310b6 sprint_sunjun_53654 2022-05-10 07:37:12 +00:00
sunjun
84ad06f3ec *task_sunjun_53672 2022-05-10 01:37:07 +00:00
zhouxudong
a5fe4b5387 * Fix bug. 2022-05-10 00:37:24 +00:00
daitingting
d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
tianshujie
873fabb024 * Fix bug #21970. 2022-04-25 10:50:46 +08:00
zhouxin
f1c7bd99e7 * Fix bug #21637. 2022-04-14 06:02:13 +00:00
hufangzhou
df4c83b23a * Fix bug #21184. 2022-04-11 10:08:13 +08:00
mayue
1a7d18a377 * Optimize code. 2022-03-28 16:38:59 +08:00
mayue
779f02c9ec * Optimize code. 2022-03-28 11:14:39 +08:00
mayue
1842ec83a2 * Fix bug #18310. 2022-03-28 10:36:24 +08:00
mayue
63300ff29e Optimize code. 2022-03-22 16:13:52 +08:00
mayue
894cad15a2 Optimize code. 2022-03-22 16:08:29 +08:00
mayue
ceb7030aeb * Optimize code. 2022-03-22 15:43:04 +08:00
mayue
4b4b04f19b * Optimize code. 2022-03-22 15:21:34 +08:00
mayue
f83ca0241b * Fix bug #6907. 2022-03-18 14:25:12 +08:00
zhengrunyu
b641170d85 * Fix bug 19941 19923 19922 19787. 2022-02-25 11:01:31 +08:00
李玉春
9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zhengrunyu
0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
xieqiyu
11a69d6206 * Adjust classic mode. 2022-01-26 09:47:01 +08:00
xieqiyu
c582ffed5b * Code for task#47989. 2022-01-24 09:20:26 +08:00
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
mayue
14a7faf16d * Optimize code. 2021-12-22 10:36:55 +08:00
mayue
111521f560 * Optimize code. 2021-12-21 17:02:46 +08:00
mayue
d080173ef8 * Optimize code. 2021-12-21 16:51:35 +08:00
mayue
75a1a27b08 * Optimize code. 2021-12-21 16:47:48 +08:00
mayue
ee98b305f2 * Finish task #46098. 2021-12-21 16:01:06 +08:00
mayue
77d36b7467 * Finish a task #45544. 2021-12-14 09:49:46 +08:00
mayue
99e725ef37 * Finish task #45544. 2021-12-08 13:25:50 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明
22ac002432 * Fix code error. 2021-12-06 13:59:36 +08:00
孙广明
c3836a8327 * Fix release lang. 2021-12-06 08:22:31 +08:00