 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 |
|
|
tianshujie
|
5582354037
|
* When repairing the project and execution linked products, the branch judgment problem.
|
2021-11-11 09:42:37 +08:00 |
|
|
tianshujie
|
16251869b4
|
* Modify the SQL statement linked to the query story plan.
|
2021-11-11 09:10:38 +08:00 |
|
|
tianshujie
|
11887cffe9
|
* The product is selected by default when modifying the branch.
|
2021-11-11 09:00:05 +08:00 |
|
|
李玉春
|
0c72b041b4
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!389
|
2021-11-11 00:30:32 +00:00 |
|
|
mayue
|
dbfabc47c2
|
* Finish task #43892.
|
2021-11-11 08:18:08 +08:00 |
|
|
zhujinyong
|
f77b0e6d2d
|
* Check compatibility.
|
2021-11-11 05:10:38 +08:00 |
|
|
zhujinyong
|
326a9f4ce1
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-10 16:02:17 +08:00 |
|
|
zhujinyong
|
9e996b6deb
|
* Fix code error of compatibility.
|
2021-11-10 16:01:47 +08:00 |
|
|
李玉春
|
09355e3de0
|
Merge branch 'sprint/170_hufangzhou_16140' into 'sprint/170'
* Fix bug #16140.
See merge request easycorp/zentaopms!386
|
2021-11-10 07:03:46 +00:00 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|
|
hufangzhou
|
98ec568b0f
|
* Fix bug #16140.
|
2021-11-10 14:48:09 +08:00 |
|
|
李玉春
|
1cfabe67d8
|
Merge branch 'sprint/170_tianshujie_43921' into 'sprint/170'
* Finish task #43921.
See merge request easycorp/zentaopms!383
|
2021-11-10 06:04:37 +00: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 |
|
|
zhujinyong
|
3ec178de54
|
* Fix sql error.
|
2021-11-10 13:52:25 +08:00 |
|
|
zhujinyong
|
c2feb4164f
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-10 13:50:45 +08:00 |
|
|
zhujinyong
|
40e2faf15e
|
* Fix sql error.
|
2021-11-10 13:50:29 +08:00 |
|
|
李玉春
|
8165200c74
|
Merge branch 'sprint/170_xieqiyu_43920' into 'sprint/170'
Sprint/170 xieqiyu 43920
See merge request easycorp/zentaopms!378
|
2021-11-10 05:20:01 +00:00 |
|
|
xieqiyu
|
d9564d624f
|
* Add comments.
|
2021-11-10 13:16:32 +08:00 |
|
|
李玉春
|
53d3014c45
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Finish task #43901.
See merge request easycorp/zentaopms!381
|
2021-11-10 05:16:26 +00:00 |
|
|
李玉春
|
562af98e17
|
Merge branch 'sprint/170_liumengyi_43909' into 'sprint/170'
Finish task #43909
See merge request easycorp/zentaopms!382
|
2021-11-10 05:14:37 +00:00 |
|
|
tianshujie
|
c29ea5077a
|
* Finish task #43901.
|
2021-11-10 13:10:11 +08:00 |
|
|
liumengyi
|
651af21958
|
* Finish task #43909.
|
2021-11-10 13:09:09 +08:00 |
|
|
李玉春
|
421b19928f
|
Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.
See merge request easycorp/zentaopms!379
|
2021-11-10 05:03:53 +00:00 |
|
|
xieqiyu
|
089238bd79
|
* Modify review questions.
|
2021-11-10 12:26:55 +08:00 |
|
|
liumengyi
|
a76e32591e
|
* Finish task #43909.
|
2021-11-10 11:30:04 +08:00 |
|
|
mayue
|
7247a7d4b5
|
* Finish task #43892.
|
2021-11-10 11:13:37 +08:00 |
|
|
李玉春
|
9b10cf663e
|
Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'
* Finish task #43901.
See merge request easycorp/zentaopms!372
|
2021-11-10 02:54:11 +00:00 |
|
|
李玉春
|
fe315477ea
|
Update manageproducts.html.php
|
2021-11-10 02:53:53 +00:00 |
|
|
xieqiyu
|
b185ef3ba9
|
* Batch edit one branch error.
|
2021-11-10 10:51:09 +08:00 |
|
|
tianshujie
|
0ac42fe56b
|
* Modify variable value.
|
2021-11-10 10:49:53 +08:00 |
|
|
xieqiyu
|
820fbef7b4
|
* Hidden merge button.
|
2021-11-10 10:09:46 +08:00 |
|
|
xieqiyu
|
36b8752cdd
|
* Fix a bug.
|
2021-11-10 10:03:10 +08:00 |
|
|
tianshujie
|
fb7f493036
|
* Modify the error code.
|
2021-11-10 09:58:49 +08:00 |
|
|
xieqiyu
|
adaa7cd1d2
|
* Add dynamic when batch edit main branch.
|
2021-11-10 09:50:43 +08:00 |
|
|
hufangzhou
|
a80cdfd6ec
|
Merge branch 'sprint/170_xieqiyu_43920' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_xieqiyu_43920
|
2021-11-10 09:49:31 +08:00 |
|
|
hufangzhou
|
9fa76f6912
|
* Modify the action of main branch.
|
2021-11-10 09:49:29 +08:00 |
|
|
xieqiyu
|
4f90b186ea
|
* Fix a bug: batch edit main branch error.
|
2021-11-10 09:37:59 +08:00 |
|
|
tianshujie
|
8174540183
|
* Remove useless code.
|
2021-11-10 09:22:08 +08:00 |
|
|
tianshujie
|
35504f6745
|
* Combine the acquisition branch into a function.
|
2021-11-10 09:17:28 +08:00 |
|
|
liumengyi
|
6bdf3553d1
|
* Finish task#43909.
|
2021-11-10 09:05:58 +08:00 |
|
|
liumengyi
|
8d79bbfd34
|
Merge branch 'sprint/170_liumengyi_43909' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_liumengyi_43909
|
2021-11-10 08:44:49 +08:00 |
|
|
zhujinyong
|
ea45b8f9ea
|
* Fix compatibility.
|
2021-11-09 20:43:53 +08:00 |
|
|
xieqiyu
|
76651524d9
|
* Add order.
|
2021-11-09 20:10:07 +08:00 |
|
|
tianshujie
|
fe99d1fafb
|
* Finish task #43901.
|
2021-11-09 19:56:48 +08:00 |
|
|
xieqiyu
|
0a3dc10f4a
|
* Finish task#43905.
|
2021-11-09 19:46:08 +08:00 |
|
|
hufangzhou
|
c14d00e710
|
* Code for task #43898.
|
2021-11-09 19:23:51 +08:00 |
|