Commit Graph

2624 Commits

Author SHA1 Message Date
zhangzilong
ccc4ce9298 * Code for bug #49297. 2022-03-02 10:10:47 +08:00
xieqiyu
996992936e * Change branches for batch create bug in execution. 2022-03-02 10:00:08 +08:00
zhangzilong
3b5ebbda16 * Finish task #49297. 2022-03-01 14:57:23 +08:00
孙广明
7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
2022-02-25 05:26:24 +00:00
zhengrunyu
748fbfe340 * Fix bug. 2022-02-25 13:24:30 +08:00
tianshujie
b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +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
xieqiyu
da00225feb * Fix bug. 2022-02-22 11:11:43 +08:00
xieqiyu
8cac8975bb * Adjust code. 2022-02-22 11:09:16 +08:00
xieqiyu
c053468aa6 * Fix bug. 2022-02-22 11:05:45 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhengrunyu
0805d25735 * Finish task 49283. 2022-02-21 10:47:27 +08:00
孙广明
ffbbfe417f Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'
# Conflicts:
#   db/update16.4.sql
2022-02-18 06:23:22 +00:00
王怡栋
3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
zhangzilong
4e84e5cbd7 * Finish task #49284. 2022-02-17 17:35:11 +08:00
zhengrunyu
aa444513d6 * Finish task 49283. 2022-02-17 16:13:24 +08:00
王怡栋
3ebcfb1ddc * fix bug #19693. 2022-02-17 11:06:28 +08:00
tianshujie
e22bd59961 * Fix bug #19306. 2022-02-16 09:57:17 +08:00
李玉春
7edeab44af Merge branch 'sprint/task_zhouxudong_48844' into 'master'
Sprint/task zhouxudong 48844

See merge request easycorp/zentaopms!1795
2022-02-15 05:05:31 +00:00
hufangzhou
aaeeaf1743 * Add the new version. 2022-02-15 08:47:29 +08:00
李玉春
679e06a7d0 Merge branch 'devops21_zhangzilong_19255' into 'master'
* Code for bug #19255.

See merge request easycorp/zentaopms!1791
2022-02-14 08:52:02 +00:00
zhouxudong
c8bfc2716b *Fix bug #48844. 2022-02-14 16:42:58 +08:00
zhangzilong
921e887dbe * Code for bug #19255. 2022-02-14 16:30:03 +08:00
李玉春
eeefcf84ab Merge branch 'sunhuawei_fixbug_19425' into 'master'
Fix bug #19425.

See merge request easycorp/zentaopms!1786
2022-02-14 06:56:36 +00:00
孙华伟
aa3b14326c Fix bug #19425. 2022-02-14 14:53:32 +08:00
李玉春
2a5b157a7f Merge branch 'sprint/fixbug_zxd_19460' into 'master'
*Fux bug #19460 #19458.

See merge request easycorp/zentaopms!1784
2022-02-14 06:40:59 +00:00
zhouxudong
a13a78f7bb *Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458. 2022-02-14 13:17:45 +08:00
liyuchun
5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
李玉春
c856323c92 Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1773
2022-02-14 00:26:45 +00:00
周旭东
84b35d270b Update control.php 2022-02-14 00:26:15 +00:00
zhouxudong
c3112657d2 *Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844. 2022-02-11 17:33:22 +08:00
李玉春
4bf3353189 Merge branch 'devops21_zhangzilong_19255' into 'devops21'
* Fix bug #19255.

See merge request easycorp/zentaopms!1771
2022-02-11 09:10:40 +00:00
zhangzilong
b7f793a9eb * Code for bug #19255. 2022-02-11 17:09:50 +08:00
zhangzilong
2b58859434 * Code for bug #19255. 2022-02-11 16:54:49 +08:00
zhangzilong
789a1292ac * Fix bug #19255. 2022-02-11 16:49:32 +08:00
zhangzilong
741f568164 * Fix bug #19255. 2022-02-11 16:37:39 +08:00
zhangzilong
e45058a891 * Fix bug *19255. 2022-02-11 16:20:41 +08:00
李玉春
1e9277e1eb Merge branch 'sprint/task_zhouxudong_48844' into 'master'
Sprint/task zhouxudong 48844

See merge request easycorp/zentaopms!1768
2022-02-11 08:20:22 +00:00
周旭东
a1529b8b5a Update linkbugs.html.php 2022-02-11 08:14:20 +00:00
zhouxudong
0e5f623acc *Finish task #48844. 2022-02-11 16:10:32 +08:00
zhangzilong
2317288f0a * Fix bug #19225. 2022-02-11 15:00:19 +08:00
zhouxudong
8af167a379 *Finish task #48844. 2022-02-11 13:04:08 +08:00
李玉春
fe0504586a Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.

See merge request easycorp/zentaopms!1759
2022-02-11 01:08:59 +00:00
liyuchun
e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
zhouxudong
818bb2ef63 *Finish task #48844. 2022-02-10 14:04:19 +08:00
zhangzilong
51d376d4f3 * Code for bug #19255. 2022-02-09 16:01:28 +08:00
zhangzilong
a4e02734f6 * Code for bug 19255. 2022-02-09 15:03:33 +08:00
tanghucheng
f1cda6821d * Fix bug. 2022-02-09 13:04:16 +08:00
zhangzilong
3c8b864a94 * Code for bug #19255. 2022-02-09 09:52:58 +08:00
zhangzilong
ec4003a9a0 * Fix bug #19255. 2022-02-08 15:50:12 +08:00