 孙广明
|
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 |
|
|
hufangzhou
|
0c57308663
|
* Fix bug #18167.
|
2022-04-22 15:29:27 +08:00 |
|
|
renying
|
d02cb94ab6
|
Fixbug#21457
|
2022-04-21 10:41:24 +08:00 |
|
|
renying
|
b32081bab7
|
Fixbug#21457
|
2022-04-21 09:27:36 +08:00 |
|
|
zhouxin
|
28a842da55
|
* Fix bug #21434.
|
2022-04-11 05:58:43 +00:00 |
|
|
孙华伟
|
5aea0c9ac7
|
*Optimize the code.
|
2022-03-28 17:17:13 +08:00 |
|
|
mayue
|
0a562d579a
|
* Optimize code.
|
2022-03-28 10:58:58 +08:00 |
|
|
mayue
|
1dc8f123df
|
* Optimize code.
|
2022-03-28 10:56:14 +08:00 |
|
|
mayue
|
f184873bca
|
* Fix bug #17402.
|
2022-03-25 13:45:28 +08:00 |
|
|
孙广明
|
41eee3ddd4
|
Merge branch 'master' into 'liyuchun_bug_17235'
# Conflicts:
# module/common/model.php
|
2022-03-22 07:43:58 +00:00 |
|
|
liyuchun
|
166cda1186
|
* Fix bug #17235.
|
2022-03-22 14:12:44 +08:00 |
|
|
xieqiyu
|
e2fbaa6828
|
* Fix bug#20396.
|
2022-03-22 11:10:44 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
xieqiyu
|
0d21516997
|
* Modify create bug.
|
2022-03-22 08:40:43 +08:00 |
|
|
孙华伟
|
0627138877
|
*Fix bug 20355
|
2022-03-21 11:18:06 +08:00 |
|
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
|
tianshujie
|
03390a6900
|
* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.
|
2022-03-08 13:01:53 +08:00 |
|
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
|
xieqiyu
|
2b83d5d647
|
* Fix bug#20385.
|
2022-03-07 10:45:30 +08:00 |
|
|
tianshujie
|
85f96e6489
|
* Fix bug #20260.
|
2022-03-04 13:49:58 +08:00 |
|
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
tianshujie
|
b7c3e92e95
|
* Modify version judgment logic.
|
2022-02-24 16:17:26 +08:00 |
|
|
xieqiyu
|
9fa66c3d0f
|
* Code for task#49304.
|
2022-02-24 14:40:14 +08:00 |
|
|
zhujinyong
|
5a334ccb86
|
* Fix bug: return error.
|
2022-02-22 09:26:31 +08:00 |
|
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|
|
tianshujie
|
f9f726270e
|
* Finish task #46667.
|
2021-12-29 14:35:09 +08:00 |
|
|
hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
|
liyuchun
|
dc46e684fe
|
* Fix bug #18023.
|
2021-12-28 14:10:59 +08:00 |
|
|
mayue
|
697b2fd318
|
* Modify code.
|
2021-12-27 13:20:57 +08:00 |
|
|
songchenxuan
|
5e8b17d6df
|
*Fix bug #17399.
|
2021-12-23 17:11:35 +08:00 |
|
|
liyuchun
|
178a45b6b5
|
Merge branch 'devops17'
|
2021-12-23 15:15:21 +08:00 |
|