 tianshujie
|
0df81d9a3b
|
* Fix bug #26817.
|
2022-08-24 10:19:19 +08:00 |
|
|
李玉春
|
3e487df2b3
|
Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.
See merge request easycorp/zentaopms!5067
|
2022-08-23 08:26:36 +00:00 |
|
|
liumengyi
|
c95ecbd1a6
|
* Optimize code for task #65808.
|
2022-08-23 16:19:20 +08:00 |
|
|
liumengyi
|
545d74f7d0
|
* Optimize code for task #65808, #65807.
|
2022-08-23 14:50:40 +08:00 |
|
|
liumengyi
|
cc92f9d3ef
|
* Optimize code.
|
2022-08-23 13:54:29 +08:00 |
|
|
liumengyi
|
617122882a
|
* Finish task #65807.
|
2022-08-23 13:45:44 +08:00 |
|
|
xieqiyu
|
99e4534f38
|
Merge branch 'master' into master_xieqiyu_draftStory
|
2022-08-22 17:29:21 +08:00 |
|
|
tianshujie
|
c0e97a501c
|
* Finish task #64976.
|
2022-08-18 14:33:10 +08:00 |
|
|
xieqiyu
|
17773dee90
|
* Code for story of add draft status.
|
2022-08-12 16:00:00 +08:00 |
|
|
xieqiyu
|
69830e04d7
|
* Fix bug#26097.
|
2022-08-08 13:14:21 +08:00 |
|
|
王怡栋
|
1c54132793
|
Merge branch 'master_liuhong_24281' into 'master'
Master liuhong 24281
See merge request easycorp/zentaopms!4752
|
2022-08-03 02:13:32 +00:00 |
|
|
liuhong
|
1e6366945d
|
*Fix bug #24281
|
2022-08-03 01:44:41 +00:00 |
|
|
liuhong
|
abcbe76d24
|
*Fix bug 24281
|
2022-08-03 01:40:55 +00:00 |
|
|
zenggang
|
d9e251ea26
|
* Fix bug#25416
|
2022-08-02 09:29:33 +00:00 |
|
|
xieqiyu
|
22327a069c
|
* Fix bug#25764.
|
2022-07-27 15:22:20 +08:00 |
|
|
zenggang
|
38e996bd18
|
* Fix bug#25222,25232
|
2022-07-14 01:38:00 +00:00 |
|
|
zhouxudong
|
b5475f51b2
|
* Finish task #60394 #60392 #60389.
|
2022-07-11 03:28:17 +00:00 |
|
|
tianshujie
|
abce7ba766
|
* Fix bug #24314.
|
2022-07-08 10:55:17 +08:00 |
|
|
tianshujie
|
7528cdfdcf
|
* Fix bug #24554.
|
2022-06-30 13:16:31 +08:00 |
|
|
孙广明
|
f3d496d7fe
|
更新module/product/control.php
|
2022-06-28 01:27:25 +00:00 |
|
|
孙广明
|
da315c7aaf
|
* Fix product order bug.
|
2022-06-28 08:15:51 +08:00 |
|
|
孙广明
|
9ac3ed7851
|
* Code for product order.
|
2022-06-17 16:23:46 +08:00 |
|
|
孙广明
|
45cb7876dc
|
Merge branch 'sprint/tianshujie' into 'master'
* If the project linked with the product belongs to the changed program, the...
See merge request easycorp/zentaopms!3991
|
2022-06-16 09:19:18 +00:00 |
|
|
sunjun
|
67dbc57ea8
|
fixbug_php
|
2022-06-16 09:13:03 +00:00 |
|
|
tianshujie
|
5bcad0bd62
|
* If the project linked with the product belongs to the changed program, the unmodifiable information will not be prompted.
|
2022-06-16 17:09:30 +08:00 |
|
|
sunjun
|
fa3a7a318c
|
fixbug_php
|
2022-06-16 09:04:42 +00:00 |
|
|
sunjun
|
977a81d359
|
fixbug_sunjun_23810
|
2022-06-16 06:31:49 +00:00 |
|
|
孙广明
|
8db0b61c87
|
Merge branch 'sprint_204_57091' into 'master'
Sprint 204 57091
See merge request easycorp/zentaopms!3948
|
2022-06-16 00:28:26 +00:00 |
|
|
sunjun
|
9d2b2a530e
|
sprint_204_57091
|
2022-06-15 09:04:38 +00:00 |
|
|
sunjun
|
43e78a280e
|
sprint_204_57091
|
2022-06-15 08:09:52 +00:00 |
|
|
zhouxin
|
4fd80b7663
|
* Fix bug #23668.
|
2022-06-15 07:17:55 +00:00 |
|
|
tianshujie
|
a6b47e84a9
|
* Finish task #57098.
|
2022-06-14 09:55:56 +08:00 |
|
|
孙广明
|
5c1f32c3d9
|
Merge branch 'sprint_194' into 'master'
sprint_194 add project in batchcreate view
See merge request easycorp/zentaopms!3876
|
2022-06-13 02:06:00 +00:00 |
|
|
zhouxin
|
68b8268391
|
* Finish task #55258.
|
2022-06-13 01:25:38 +00:00 |
|
|
sunjun
|
a69d10d9db
|
sprint_194 add project in batchcreate view
|
2022-06-10 06:36:12 +00:00 |
|
|
孙广明
|
ecd7f1197f
|
* Fix product order bug.
|
2022-06-09 14:48:56 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
王怡栋
|
e093aac4ca
|
Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477
See merge request easycorp/zentaopms!3541
|
2022-05-20 06:07:46 +00:00 |
|
|
xieqiyu
|
cd1c1e1b63
|
* Finish task#54477.
|
2022-05-20 10:52:30 +08:00 |
|
|
zhouxudong
|
9dab175600
|
* Finish task #54491_1
|
2022-05-18 08:52:46 +00:00 |
|
|
tanghucheng
|
d3dc4ebe43
|
* Fix bug.
|
2022-05-17 06:00:26 +00:00 |
|
|
孙广明
|
a770924dcf
|
Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
# module/project/model.php
|
2022-05-12 05:01:42 +00:00 |
|
|
zhouxin
|
3e2181dea0
|
* Fix bug #22371.
|
2022-05-12 02:44:37 +00:00 |
|
|
zhouxin
|
160c0fbcaa
|
* Fix bug #53656.
|
2022-05-11 08:13:06 +00:00 |
|
|
mayue
|
98dcd7517f
|
* Optimize code.
|
2022-05-11 06:38:46 +00:00 |
|
|
zhouxin
|
b015ea5c77
|
* Finish task #53658.
|
2022-05-11 01:53:10 +00:00 |
|
|
mayue
|
b625c5e1f2
|
* Fix bug #21706.
|
2022-04-22 16:05:13 +08:00 |
|
|
hufangzhou
|
98153aa83b
|
* Rename the variable.
|
2022-04-22 15:37:10 +08:00 |
|