 wangyidong
|
aa0f666d41
|
* adjust for project flow.
|
2022-05-12 15:52:24 +08:00 |
|
|
李玉春
|
70fcf381cf
|
Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365
See merge request easycorp/zentaopms!3352
|
2022-05-12 05:33:28 +00:00 |
|
|
孙华伟
|
6c2b318da4
|
*Optimize the code.
|
2022-05-12 13:21:44 +08:00 |
|
|
孙广明
|
a770924dcf
|
Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
# module/project/model.php
|
2022-05-12 05:01:42 +00:00 |
|
|
孙华伟
|
0695047d20
|
*Finish task #53659.
|
2022-05-11 15:40:59 +08:00 |
|
|
mayue
|
d560f6d2ab
|
* Finish task #53652.
|
2022-05-11 05:38:29 +00:00 |
|
|
孙华伟
|
4464536c1f
|
Update control.php
|
2022-04-19 07:34:10 +00:00 |
|
|
孙华伟
|
bce4e3267b
|
* Fix bug #18898.
|
2022-04-19 15:27:58 +08:00 |
|
|
caoyanyi
|
b27e1f76d7
|
* Modify field name.
|
2022-04-18 10:06:35 +08:00 |
|
|
caoyanyi
|
e98d1ac4ab
|
* Fix bug #21763.
|
2022-04-18 10:03:47 +08:00 |
|
|
王怡栋
|
4f5529867b
|
* code for bug #20933.
|
2022-04-06 13:13:29 +08:00 |
|
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
|
tianshujie
|
7407aabc00
|
* Fix bug #19104.
|
2022-04-01 14:32:00 +08:00 |
|
|
王怡栋
|
6c078665da
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2636
|
2022-03-30 08:00:01 +00:00 |
|
|
tianshujie
|
b452680fb3
|
* Fix bug #14841.
|
2022-03-30 14:48:34 +08:00 |
|
|
zhouxin
|
a8d3ff2801
|
* Fix bug #17322.
|
2022-03-30 05:11:32 +00:00 |
|
|
zhouxin
|
cd5ac50b6f
|
* Fix bug #17322.
|
2022-03-30 03:30:02 +00:00 |
|
|
zhouxin
|
1d21f7f62d
|
* Fix bug #17322.
|
2022-03-30 03:23:48 +00:00 |
|
|
tianshujie
|
317ff297b1
|
* Fix Kanban related issues.
|
2022-03-30 11:02:29 +08:00 |
|
|
tianshujie
|
0e3779ca1b
|
* Fix Kanban related issues.
|
2022-03-30 10:45:01 +08:00 |
|
|
tianshujie
|
a0c4457a95
|
* Fix bug #16101.
|
2022-03-29 13:59:16 +08:00 |
|
|
tianshujie
|
7680057485
|
* Fix bug #18755.
|
2022-03-28 15:32:41 +08:00 |
|
|
tianshujie
|
b125b0fc2c
|
* Fix bug #21186.
|
2022-03-28 11:20:38 +08:00 |
|
|
tianshujie
|
0194c5b3c7
|
* Fix bug #21186.
|
2022-03-28 11:13:23 +08:00 |
|
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +08:00 |
|
|
tianshujie
|
9f3f0bd8c6
|
* Fix bug #20858.
|
2022-03-24 16:01:18 +08:00 |
|
|
tianshujie
|
9178a6e3b3
|
* Modify variable name.
|
2022-03-24 10:27:42 +08:00 |
|
|
tianshujie
|
e9ee8a176d
|
* Fix bug #19072.
|
2022-03-24 09:35:39 +08:00 |
|
|
zhouxudong
|
0800d18c92
|
* Fix bug #16575.
|
2022-03-22 16:17:00 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
zhouxin
|
2ab2af045c
|
Fix bug #13855.
|
2022-03-18 07:17:07 +00:00 |
|
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
|
tanghucheng
|
fb78d74984
|
* Fix bug.
|
2022-03-11 15:48:25 +08:00 |
|
|
tanghucheng
|
15e6262065
|
* Fix bug #20329,20350,20366.
|
2022-03-07 16:42:58 +08:00 |
|
|
tianshujie
|
30600fb7bb
|
* Fix bug #20200.
|
2022-03-01 20:37:20 +08:00 |
|
|
liumengyi
|
9bd39c1e98
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:44:11 +08:00 |
|
|
liumengyi
|
e0814cd74b
|
* Change maxVersion bizVersion proVersion to edition.
|
2022-02-24 16:15:08 +08:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
liyuchun
|
0d16a79b63
|
* Fix bug #19323.
|
2022-02-15 08:22:25 +08:00 |
|
|
liumengyi
|
ecc9e22867
|
* Finish task 18883,add project team.
|
2022-01-24 16:54:30 +08:00 |
|
|
王怡栋
|
f8e0c430cd
|
* adjust for kanban in lite.
|
2022-01-19 13:41:29 +08:00 |
|
|
王怡栋
|
03d2e3cb4a
|
Merge branch 'master' into lite
|
2022-01-19 08:44:43 +08:00 |
|
|
王怡栋
|
0a619a470e
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-17 17:25:44 +08:00 |
|
|
王怡栋
|
d8577f7d28
|
* adjust for project kanban.
|
2022-01-17 17:25:20 +08:00 |
|
|
liumengyi
|
00f85a4ee8
|
* Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462.
|
2022-01-17 16:13:45 +08:00 |
|
|
Wenrui LI
|
eab82f4aaf
|
* filter projects by vision in dropmenus, bug #18498.
|
2022-01-17 14:45:45 +08:00 |
|
|
朱金勇
|
dce7ddc20c
|
Merge branch 'autoTest_xieqiyu' into 'master'
Auto test xieqiyu
See merge request easycorp/zentaopms!1426
|
2022-01-17 02:35:38 +00:00 |
|
|
liumengyi
|
fd20384534
|
* Fix bug #18470.
|
2022-01-17 09:21:11 +08:00 |
|
|
liumengyi
|
fc5ad0f893
|
* FIx bug #18489,#18478,#18466.
|
2022-01-16 17:11:40 +08:00 |
|