 tianshujie
|
00ac35c9db
|
* Delete extra blank lines.
|
2021-12-02 08:46:01 +08:00 |
|
|
tianshujie
|
be83274876
|
* Fix the problem of recording product cookies.
|
2021-12-02 08:43:44 +08:00 |
|
|
tianshujie
|
3accd38185
|
* Remove useless code.
|
2021-12-01 13:14:06 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
朱金勇
|
293a375ec8
|
Merge branch 'sprint/174_mayue_16605' into 'master'
Fix bug #16605.
See merge request easycorp/zentaopms!616
|
2021-11-25 06:45:58 +00:00 |
|
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
|
朱金勇
|
8cdf02366c
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
* Add the branch switcher in tree browse page.
See merge request easycorp/zentaopms!614
|
2021-11-25 05:05:20 +00:00 |
|
|
hufangzhou
|
e431847c58
|
* Add the branch switcher in tree browse page.
|
2021-11-25 12:22:56 +08:00 |
|
|
王怡栋
|
9a80f35962
|
Merge branch 'sprint/app10'
|
2021-11-25 10:25:05 +08:00 |
|
|
mayue
|
c40360d556
|
* Fix bug #16605.
|
2021-11-25 09:43:34 +08:00 |
|
|
xieqiyu
|
501e80ddf2
|
* Fix bug#16606.
|
2021-11-24 10:03:09 +08:00 |
|
|
zhouxin
|
2b3df26fd8
|
Fix bug 16564.
|
2021-11-23 18:47:56 +08:00 |
|
|
hufangzhou
|
5ac4cfe9f9
|
* Code for bug #16559.
|
2021-11-23 14:13:44 +08:00 |
|
|
hufangzhou
|
c0d4264148
|
* Fix bug #16564.
|
2021-11-23 10:10:14 +08:00 |
|
|
hufangzhou
|
984aa6b1e7
|
* Fix bug #16559.
|
2021-11-23 09:27:08 +08:00 |
|
|
xieqiyu
|
1fe78e5771
|
* Fix bug#16489.
|
2021-11-21 00:55:33 +08:00 |
|
|
王怡栋
|
eb63a17885
|
* code for task #44313.
|
2021-11-19 09:08:03 +08:00 |
|
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08:00 |
|
|
李玉春
|
e41ccac2b7
|
Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
# module/build/view/create.html.php
# module/project/model.php
|
2021-11-18 05:15:10 +00:00 |
|
|
xieqiyu
|
47cdcd78c0
|
* Code for task#44497.
|
2021-11-17 19:30:13 +08:00 |
|
|
lizhiqiang
|
1fb7da9222
|
*Finish bug #16363.
|
2021-11-17 16:36:28 +08:00 |
|
|
lizhiqiang
|
7d2daa9302
|
* Fix bug 16302
|
2021-11-17 11:09:55 +08:00 |
|
|
lizhiqiang
|
2dcd335698
|
* Fix bug 16302
|
2021-11-17 11:09:25 +08:00 |
|
|
王怡栋
|
35cbf3830d
|
* code for task #44309.
|
2021-11-17 10:36:56 +08:00 |
|
|
王怡栋
|
ba48e8e38f
|
* code for task #43761.
|
2021-11-16 17:09:15 +08:00 |
|
|
liyuchun
|
412fbb2305
|
* Finish task #44370.
|
2021-11-16 16:25:00 +08:00 |
|
|
李玉春
|
b74f5ab258
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Fix bug #43916.
See merge request easycorp/zentaopms!465
|
2021-11-16 03:20:54 +00:00 |
|
|
zhouxin
|
b521b7f6d0
|
Fix bug.
|
2021-11-16 11:19:02 +08:00 |
|
|
zhouxin
|
dd5cf8c7bd
|
Fix bug #43916.
|
2021-11-15 19:15:20 +08:00 |
|
|
王怡栋
|
dff6726c6b
|
* code for task #44305.
|
2021-11-15 17:11:12 +08:00 |
|
|
mayue
|
a2f3100ea5
|
* Modify branch.
|
2021-11-15 16:18:26 +08:00 |
|
|
tianshujie
|
b175a5057b
|
* Fix bug #16293.
|
2021-11-15 16:13:51 +08:00 |
|
|
李玉春
|
a8523d317a
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.
See merge request easycorp/zentaopms!437
|
2021-11-15 05:05:00 +00:00 |
|
|
zhouxin
|
b5ab5a03d7
|
Finish task #43916.
|
2021-11-15 10:07:01 +08:00 |
|
|
liyuchun
|
0c7bcaf928
|
* Fix error of manage product.
|
2021-11-12 15:07:42 +08:00 |
|
|
zhouxin
|
e57d1d1cc7
|
Finish task #43916.
|
2021-11-12 14:06:44 +08:00 |
|
|
liyuchun
|
1838b65ad1
|
* Fix bug #16182.
|
2021-11-12 11:29:46 +08:00 |
|
|
tianshujie
|
b218a43b63
|
* Fix bug #16195.
|
2021-11-11 17:38:27 +08:00 |
|
|
hufangzhou
|
4163d17335
|
* Fix bug #16169, bug#16179.
|
2021-11-11 15:31:37 +08:00 |
|
|
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 |
|