 hufangzhou
|
bf08427c9a
|
* Modify the cookie of storyModule.
|
2021-11-12 09:45:43 +08:00 |
|
|
tianshujie
|
b218a43b63
|
* Fix bug #16195.
|
2021-11-11 17:38:27 +08:00 |
|
|
李玉春
|
00abaf7745
|
Merge branch 'sprint/170_tianshujie_16192' into 'sprint/170'
* Fix bug #16192.
See merge request easycorp/zentaopms!415
|
2021-11-11 08:33:28 +00:00 |
|
|
tianshujie
|
93c8bb6ba8
|
* Modify the judgment logic.
|
2021-11-11 16:32:29 +08:00 |
|
|
李玉春
|
2ff4571f77
|
Merge branch 'sprint/170_hufangzhou_16169' into 'sprint/170'
* Fix bug #16169, bug#16179.
See merge request easycorp/zentaopms!412
|
2021-11-11 08:32:14 +00:00 |
|
|
李玉春
|
c8b1eaef62
|
Merge branch 'sprint/170_mayue_16191' into 'sprint/170'
* Fix bug #16191.
See merge request easycorp/zentaopms!414
|
2021-11-11 08:19:38 +00:00 |
|
|
tianshujie
|
78aee66c47
|
* Fix bug #16192.
|
2021-11-11 16:18:54 +08:00 |
|
|
李玉春
|
2c296a129b
|
Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170'
* Fix bug #16190.
See merge request easycorp/zentaopms!411
|
2021-11-11 08:09:59 +00:00 |
|
|
mayue
|
f8eebdf678
|
* Fix bug #16191.
|
2021-11-11 16:08:03 +08:00 |
|
|
李玉春
|
81f49bd434
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Fix bug #16191.
See merge request easycorp/zentaopms!413
|
2021-11-11 08:01:22 +00:00 |
|
|
mayue
|
c9996a26ec
|
* Fix bug #16191.
|
2021-11-11 15:54:22 +08:00 |
|
|
tianshujie
|
fd9423c737
|
* Remove useless code.
|
2021-11-11 15:42:42 +08:00 |
|
|
hufangzhou
|
4163d17335
|
* Fix bug #16169, bug#16179.
|
2021-11-11 15:31:37 +08:00 |
|
|
tianshujie
|
2eb1a00881
|
* Fix bug #16190.
|
2021-11-11 15:25:29 +08:00 |
|
|
tianshujie
|
4f4b683dbd
|
* Fix bug #16190.
|
2021-11-11 15:20:01 +08:00 |
|
|
李玉春
|
a02ebf672e
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!410
|
2021-11-11 06:49:40 +00:00 |
|
|
mayue
|
dfa82c09db
|
* Finish task #43892.
|
2021-11-11 14:48:02 +08:00 |
|
|
mayue
|
67ace49bea
|
* Finish task #43892.
|
2021-11-11 14:39:21 +08:00 |
|
|
mayue
|
af83e8a639
|
* Resolve display of list Settings #43892.
|
2021-11-11 13:56:02 +08:00 |
|
|
xieqiyu
|
b1098e7040
|
* Finish task#43890.
|
2021-11-11 13:53:24 +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 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +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 |
|
|
hufangzhou
|
d10834ab9f
|
* Code for task #43904.
|
2021-11-08 18:02:15 +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 |
|
|
孙广明
|
5812a1e510
|
Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task #43903
See merge request easycorp/zentaopms!319
|
2021-11-05 03:22:17 +00:00 |
|
|
tianshujie
|
6cb70ab01d
|
* Finish task #43903.
|
2021-11-05 08:59:55 +08:00 |
|
|
mayue
|
fb9bc91030
|
* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.
|
2021-11-03 15:38:49 +08:00 |
|
|
hufangzhou
|
8b1b92bdfc
|
* Add the version.
|
2021-11-02 12:37:51 +08:00 |
|
|
李玉春
|
d4fdd7b9e2
|
Merge branch 'sprint/169_tianshujie_43621' into 'sprint/169'
* Finish task #43621.
See merge request easycorp/zentaopms!249
|
2021-11-01 02:45:38 +00:00 |
|
|
tianshujie
|
96513f604e
|
* Modify and maintain product line logic.
|
2021-11-01 10:21:11 +08:00 |
|
|
tianshujie
|
f78f9ecdfe
|
* Finish task #43621.
|
2021-11-01 10:18:21 +08:00 |
|
|
孙广明
|
d17f0f28ce
|
Merge branch 'sprint/169_tanghucheng_43707' into 'sprint/169'
* Finish task #43707.
See merge request easycorp/zentaopms!236
|
2021-11-01 02:18:14 +00:00 |
|