Commit Graph

122 Commits

Author SHA1 Message Date
Guan Xiying
1c802f2a36 Merge branch 'jihu' 2021-07-14 09:48:58 +08:00
wangyidong
9d95d960e5 * finish task #40005. 2021-07-13 09:38:27 +08:00
qiyu-xie
ed019b72f5 * Fix bug#13287. 2021-07-06 16:21:09 +08:00
wangyidong
001e93c1f9 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-06 13:50:50 +08:00
wangyidong
3f0aeaf173 * finish task #39793. 2021-07-06 13:34:44 +08:00
holan20180123
c88110d8fc * Fix bug #13483. 2021-07-05 15:49:03 +08:00
wangyidong
c287a0cb49 * adjust code. 2021-07-01 16:56:59 +08:00
Yagami
26ec63969d * Fix code details. 2021-06-29 16:24:26 +08:00
Guan Xiying
69764ec2e2 * Remove gitlab param from getProducts function. 2021-06-23 15:14:56 +08:00
lichengjun
8defd7528f * Add code for gitlab. 2021-06-23 13:44:01 +08:00
wangyidong
ae771f7405 * finish task #39379. 2021-06-17 14:53:29 +08:00
wangyidong
b6676572f0 * merge from 15.0.beta3. 2021-06-06 09:05:34 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
tianshujie98
fd979e7e32 * Finish task #38888. 2021-06-04 15:20:59 +08:00
wangyidong
f6594c7022 * adjust version and adjust test. 2021-06-04 12:10:48 +08:00
tianshujie98
2dc084e911 * Modify the required item prompt language item. 2021-06-02 10:25:21 +08:00
tianshujie98
246f8c7232 * Edit required language. 2021-06-02 09:41:41 +08:00
tianshujie98
50e4f6611e * Fix bug #12955. 2021-06-02 09:24:18 +08:00
tianshujie98
0bff58d014 * Fix bug #12674. 2021-06-01 17:08:18 +08:00
tianshujie98
283683350d * Fix bug #12674. 2021-06-01 15:52:10 +08:00
wangyidong
1cae502aee * adjust for web html. 2021-05-20 16:55:12 +08:00
holan20180123
002f85e70b * Fix bug #12662. 2021-05-19 10:04:08 +08:00
wangyidong
8fbb5c1c89 * adjust for upgrade. 2021-04-30 11:23:46 +08:00
tianshujie98
95ff14e30f * Fix bug #12450. 2021-04-29 09:55:03 +08:00
tianshujie98
d6ff645901 * Fix bug #12440. 2021-04-28 16:01:01 +08:00
tianshujie98
9edbd23c41 * Fix bug #12440. 2021-04-28 15:19:26 +08:00
tianshujie98
9cd7618fbc * Remove useless code. 2021-04-28 08:29:25 +08:00
tianshujie98
df4a023a7d * Fix bug #12426. 2021-04-27 16:55:07 +08:00
hufangzhou
7f3145888c * Fix bug #12420. 2021-04-27 14:13:40 +08:00
tianshujie98
6141efa38c * Fix bug #12405. 2021-04-26 17:12:04 +08:00
tianshujie98
ce762a919a * Fix bug #12394. 2021-04-26 14:17:54 +08:00
hufangzhou
69fd07ac2f * Adjust the execution getSwitcher link when the execution do not link proudct. 2021-04-26 10:17:01 +08:00
hufangzhou
919fba9d2d * Fix bug #12365. 2021-04-26 09:35:50 +08:00
tianshujie98
64406fe023 * Fix bug #12272. 2021-04-22 11:38:54 +08:00
Yagami
b16e7eeeca * Fix bug. 2021-04-19 14:01:09 +08:00
tianshujie98
b942a675b8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 16:02:22 +08:00
tianshujie98
4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
holan20180123
205f3748cb * Finish task #37500. 2021-04-15 15:49:56 +08:00
leiyong
18840c71a4 * Adjust code. 2021-04-14 02:01:46 +00:00
tianshujie98
37791e8bfe Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 09:53:12 +08:00
tianshujie98
ba56961f03 * Fix bug #11544. 2021-04-14 09:52:47 +08:00
Yagami
16d12813c4 * Remove comment for execution setMenu. 2021-04-14 09:48:03 +08:00
leiyong
86d44e25a6 * Fix bug. 2021-04-13 16:00:45 +00:00
tianshujie98
edd4825045 * Fix bug #11934. 2021-04-09 16:34:26 +08:00
holan20180123
8f5471ebe6 * Fix bug #11006,#11058. 2021-04-06 11:19:09 +08:00
tianshujie98
2c3f528673 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-02 13:49:47 +08:00
tianshujie98
b1d9b5d1d4 * Solve the problem of adding projects to the classic version. 2021-04-02 13:43:14 +08:00
leiyong
fdeab69b16 * Fix bug. 2021-04-02 08:14:56 +03:00
hufangzhou
75415b2956 * Fix an error. 2021-04-02 09:26:47 +08:00
Yagami
00e1922daa * Fix error. 2021-04-01 16:06:08 +08:00