Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,887 Commits 2 Branches 292 Tags
e3549fe24c8d84d9c4bc2da1e9e7a1edd8720321
Commit Graph
603 Commits
Author SHA1 Message Date
tianshujie fbf487dce8 * Fix code errors. 2021-11-11 11:19:06 +08:00
李玉春 ccf0c59981 Update model.php 2021-11-11 02:56:33 +00:00
tianshujie 8b9ee17312 * Restore code. 2021-11-11 10:47:28 +08:00
tianshujie 160b1c9fca * Restore code. 2021-11-11 10:44:07 +08:00
tianshujie c08bd0faef * Fix the problem of judging product permissions. 2021-11-11 10:30:29 +08:00
tianshujie ce001d77e3 * Fix the problem of judging product permissions. 2021-11-11 10:27:24 +08:00
tianshujie 41045ea4bc * Replace session with productID. 2021-11-11 10:18:59 +08:00
tianshujie 2ebd3b2b50 * Modify the logic of the product record session. 2021-11-11 10:13:01 +08:00
tianshujie 603f57a826 * Fix the problem of storing cookies in product branches. 2021-11-11 09:59:16 +08:00
李玉春 28043927ac Update model.php 2021-11-10 06:04:19 +00:00
tianshujie 41294b083e * Finish task #43921. 2021-11-10 14:00:12 +08:00
李玉春 98f519fe31 Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901' 
# Conflicts:
#   module/branch/model.php
#   module/story/model.php
 2021-11-09 07:53:17 +00:00
tianshujie 8e9dd74c0d * Modify code logic. 2021-11-09 15:47:31 +08:00
tianshujie 5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
hufangzhou 9c7884d905 * Code for task #43891. 2021-11-09 11:09:48 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
李玉春 09d50fd19c Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170' 
Finish task #43916.

See merge request easycorp/zentaopms!338
 2021-11-08 07:25:33 +00:00
zhouxin 92fb767ff9 Finish task #43916. 2021-11-08 14:34:44 +08:00
hufangzhou 9732ba073a * Modify the cookie of preBranch type. 2021-11-08 10:19:56 +08:00
hufangzhou d279c5d7d7 * Finish task #43891. 2021-11-05 18:47:39 +08:00
tianshujie 6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
tianshujie f78f9ecdfe * Finish task #43621. 2021-11-01 10:18:21 +08:00
mayue 539fb5d7b0 *Fix a bug #15778. 2021-10-28 15:13:15 +08:00
mayue 936770dc65 *Fix a bug #15778. 2021-10-28 14:48:20 +08:00
mayue 92b450679a *Fix a bug #15776. 2021-10-28 13:32:15 +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
李玉春 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
tianshujie f5e1ceb880 * Finish task #43169. 2021-10-14 09:24:16 +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
dingna 27670f7b3a * Finish task #42851. 2021-09-24 09:31:23 +08:00
zenggang 497bcdb574 * Fix bug#14490 2021-09-17 11:11:36 +08:00
zenggang c352c8b9df * Fix bug#14830 2021-09-16 09:43:41 +08:00
hufangzhou 8847360d38 * Fix bug #15197. 2021-09-15 15:06:02 +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
tianshujie c473a76d01 * Fix bug #15136. 2021-09-14 08:56:22 +08:00
hufangzhou 01fe1161a9 * Fix bug #15133. 2021-09-13 15:25:45 +08:00
王怡栋 c9eb3ebfa1 * fix bug for finish task by repo. 2021-09-13 11:14:54 +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
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
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
hufangzhou aa35ebd821 * Product Kanban compatible with classic mode. 2021-09-08 13:45:21 +08:00
hufangzhou a69ffad760 * Product Kanban is compatible with the classic model. 2021-09-06 09:30:05 +08:00
tianshujie 8088a0c285 * Finish task #42146. 2021-09-02 14:33:50 +08:00