Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,764 Commits 2 Branches 292 Tags
f011907e1f595235c7cf220e7d72a0f030d48c09
Commit Graph
2024 Commits
Author SHA1 Message Date
zenggang 51531e1e6b * Fix bug#15488 2021-10-26 09:39:25 +00:00
李玉春 83f19c2b65 Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167' 
* Finish task #43190.

See merge request easycorp/zentaopms!69
 2021-10-15 01:31:16 +00:00
tianshujie f0bd7efdef * Finish task #43190. 2021-10-14 16:42:04 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
xieqiyu b7da8b63b3 * Code for bug#15513. 2021-10-14 15:32:37 +08:00
xieqiyu 92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
李玉春 8e1161b02c Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167' 
* Finish task #43169.

See merge request easycorp/zentaopms!64
 2021-10-14 05:05:12 +00:00
xieqiyu b811e3c80d * Fix bug#15513. 2021-10-14 10:05:58 +08:00
tianshujie f5e1ceb880 * Finish task #43169. 2021-10-14 09:24:16 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
tianshujie d69aeae3b9 * Adjust the style of the project list under the product. 2021-10-11 15:58:09 +08:00
tianshujie 1af5598b1a * Finish task #43190. 2021-10-11 14:53:53 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
zenggang f139f00e61 * Task 42862,previously committed to the master branch, now resubmit to the 165 branch 2021-09-30 11:19:05 +08:00
朱金勇 aa86fdea50 Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165' 
* Finish task #42854.

See merge request easycorp/zentaopms!38
 2021-09-28 07:37:30 +00:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
dingna 27670f7b3a * Finish task #42851. 2021-09-24 09:31:23 +08:00
zenggang c6b7f25fa3 * Adjust code style. 2021-09-18 14:08:31 +08:00
zenggang 4380f4d4b0 * Fix bug#14580 2021-09-18 11:01:08 +08:00
zenggang 497bcdb574 * Fix bug#14490 2021-09-17 11:11:36 +08:00
zenggang 1a0effc1e6 * Fix bug15211,14525 2021-09-17 09:51:23 +08:00
zenggang ee07a042a4 * Fix bug#15211,14525 2021-09-16 17:31:40 +08:00
zenggang c352c8b9df * Fix bug#14830 2021-09-16 09:43:41 +08:00
tianshujie caaaa90cf5 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 15:56:33 +08:00
tianshujie 441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
xieqiyu 444b29404a * Fix bug#14585. 2021-09-15 15:36:09 +08:00
hufangzhou 8847360d38 * Fix bug #15197. 2021-09-15 15:06:02 +08:00
hufangzhou 9ff54e4738 * Fix bug #15150. 2021-09-15 09:12:28 +08:00
tianshujie 9691ae8a73 * Fix bug #15160,15159. 2021-09-14 15:07:38 +08:00
tianshujie 1916e9172a * Fix bug #15159. 2021-09-14 14:34:07 +08:00
liyuchun 59ef172f9c * Fix bug #14682. 2021-09-14 10:22:40 +08:00
tianshujie c473a76d01 * Fix bug #15136. 2021-09-14 08:56:22 +08:00
tianshujie 8497408724 * Fix bug #14810. 2021-09-13 13:28:32 +08:00
hufangzhou 933e352796 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-13 15:25:54 +08:00
hufangzhou 01fe1161a9 * Fix bug #15133. 2021-09-13 15:25:45 +08:00
xieqiyu 21ca95f7be * Fix bug#15090. 2021-09-13 13:56:56 +08:00
tianshujie 4f13760c32 * Fix bug #14810. 2021-09-13 13:17:05 +08:00
王怡栋 c9eb3ebfa1 * fix bug for finish task by repo. 2021-09-13 11:14:54 +08:00
zenggang 62bcf528b2 * Fix bug#15087 2021-09-13 09:17:09 +08:00
liyuchun 553c797c67 * Fix get products error. 2021-09-10 09:34:19 +08:00
tianshujie 0a7f3469e2 * Fix bug #14957. 2021-09-09 16:58:24 +08:00
Hao Sun 83e14d45f1 * bug #15082, fix php error in tutorial mode. 2021-09-09 16:50:36 +08:00
tianshujie 500555d173 * Fix bug #14948. 2021-09-09 15:33:37 +08:00
Hao Sun 0a57ae9e09 * bug #15017, adjust table style in product/all in tutorial mode. 2021-09-09 14:41:57 +08:00
Hao Sun c9d9a16b7d * align checkbox in product table list. 2021-09-09 14:25:24 +08:00
tianshujie 9e8583ee1e * Ignore admin when judging permissions. 2021-09-09 11:06:58 +08:00
tianshujie 2a86208f65 * Fix bug #14957. 2021-09-09 10:51:06 +08:00
hufangzhou 140a632498 * Finish task #42391. 2021-09-09 10:26:10 +08:00
liyuchun 69c1b44157 * Fix bug #15061. 2021-09-08 16:53:55 +08:00
hufangzhou 270e485602 * Fix bug #14946. 2021-09-08 16:43:56 +08:00