 孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
|
zhujinyong
|
ff9ceaccad
|
* Check auth.
|
2022-01-05 09:05:32 +08:00 |
|
|
mayue
|
15d588491f
|
* Revert code.
|
2022-01-04 17:19:45 +08:00 |
|
|
朱金勇
|
24ad4bc48c
|
Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520
See merge request easycorp/zentaopms!1228
|
2021-12-31 07:53:33 +00:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
Hao Sun
|
1bdc313562
|
* Task #46524, refactor some pages with user-picker.
|
2021-12-30 17:35:41 +08:00 |
|
|
Hao Sun
|
dff300cf88
|
* Task #46524, refactor user selector for page "project/managemembers".
|
2021-12-30 17:02:32 +08:00 |
|
|
zhouxin
|
05a75e7039
|
Finish task #46674.
|
2021-12-30 05:50:50 +00:00 |
|
|
hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
|
zhouxin
|
18383e225b
|
Fix bug #17665.
|
2021-12-22 07:44:26 +00:00 |
|
|
zhujinyong
|
42fc345e2a
|
Merge branch 'sprint/176_xieqiyu_mergeBranch'
|
2021-12-21 16:12:48 +08:00 |
|
|
hufangzhou
|
872a8b2bbd
|
* Finish task #46096.
|
2021-12-21 14:30:38 +08:00 |
|
|
朱金勇
|
f1e97497a3
|
Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536
See merge request easycorp/zentaopms!903
|
2021-12-13 00:46:27 +00:00 |
|
|
xieqiyu
|
5472859d6e
|
* Code for task#45536.
|
2021-12-11 14:28:45 +08:00 |
|
|
朱金勇
|
161233a64f
|
Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536
See merge request easycorp/zentaopms!884
|
2021-12-10 06:15:15 +00:00 |
|
|
xieqiyu
|
c33000b578
|
* Code for task#45536.
|
2021-12-10 13:11:37 +08:00 |
|
|
xieqiyu
|
ad8ed52f22
|
* Code for task#45536.
|
2021-12-10 10:57:56 +08:00 |
|
|
tianshujie
|
a2355212ad
|
* Fix bug #17272.
|
2021-12-08 17:08:10 +08:00 |
|
|
tianshujie
|
545652e0e4
|
* Fix bug #17259.
|
2021-12-08 16:50:48 +08:00 |
|
|
hufangzhou
|
145fc2a461
|
* Fix bug #17074.
|
2021-12-06 10:27:51 +08:00 |
|
|
tianshujie
|
86ccece2ca
|
* Modify the problem of function demonstration.
|
2021-12-01 16:32:10 +08:00 |
|
|
李玉春
|
4b37f6b83b
|
Merge branch 'sprint/174_songchenxuan_45040' into 'master'
* Finish task #45040.
See merge request easycorp/zentaopms!684
|
2021-12-01 05:24:23 +00:00 |
|
|
songchenxuan
|
631a62e2dd
|
* Finish task #45040.
|
2021-12-01 13:16:42 +08:00 |
|
|
songchenxuan
|
85cf0ab20c
|
* Finish task #45040.
|
2021-12-01 11:15:19 +08:00 |
|
|
songchenxuan
|
cb00625795
|
* Finish task #45040.
|
2021-12-01 08:45:25 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
|
hufangzhou
|
883f87a19c
|
* Remove the unused code.
|
2021-11-29 15:24:46 +08:00 |
|
|
hufangzhou
|
bf1ca5893e
|
* Modify the url when refresh the tree browse in project module.
|
2021-11-29 15:20:48 +08:00 |
|
|
tianshujie
|
96a46aa2ca
|
* Modify the code.
|
2021-11-29 14:16:10 +08:00 |
|
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
|
tianshujie
|
f4d1a727a7
|
* Finish task #45084,44994,44993.
|
2021-11-27 17:41:42 +08:00 |
|
|
liyuchun
|
1b63752f83
|
* Finish task #45152.
|
2021-11-26 14:00:54 +08:00 |
|
|
王怡栋
|
9a80f35962
|
Merge branch 'sprint/app10'
|
2021-11-25 10:25:05 +08:00 |
|
|
xieqiyu
|
578d51ce01
|
* Fix bug#16548.
|
2021-11-22 16:49:06 +08:00 |
|
|
mayue
|
90418ee41d
|
* Fix bug #16405.
|
2021-11-22 11:30:00 +08:00 |
|
|
王怡栋
|
b475712690
|
* code for task #44322.
|
2021-11-19 09:41:18 +08:00 |
|
|
mayue
|
039784e212
|
* Fix code error.
|
2021-11-18 15:24:15 +08:00 |
|
|
李玉春
|
bf47fb620b
|
Merge branch 'sprint/170' into 'sprint/170_mayue_16364'
# Conflicts:
# module/project/control.php
|
2021-11-18 07:09:28 +00:00 |
|
|
mayue
|
c26fb97685
|
* Fix bug #16364.
|
2021-11-18 15:07:42 +08:00 |
|
|
mayue
|
49b3b22630
|
* Fix bug #16364.
|
2021-11-18 14:48:05 +08:00 |
|
|
李玉春
|
3870f6f9e4
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.
See merge request easycorp/zentaopms!495
|
2021-11-18 06:30:03 +00:00 |
|
|
mayue
|
03620d8454
|
* Fix bug #16364.
|
2021-11-18 14:24:29 +08:00 |
|
|
李玉春
|
e41ccac2b7
|
Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
# module/build/view/create.html.php
# module/project/model.php
|
2021-11-18 05:15:10 +00:00 |
|
|
xieqiyu
|
292b09bb28
|
* Delete unused code.
|
2021-11-17 23:23:00 +08:00 |
|
|
xieqiyu
|
47cdcd78c0
|
* Code for task#44497.
|
2021-11-17 19:30:13 +08:00 |
|
|
zhouxin
|
b7e3fe9003
|
Finis task #44486,44487,44488.
|
2021-11-17 15:49:24 +08:00 |
|
|
songchenxuan
|
1578acc86d
|
* Fix bug 15828
|
2021-11-16 17:37:30 +08:00 |
|
|
songchenxuan
|
fe5c7a762e
|
* Fix bug 15828
|
2021-11-16 17:30:56 +08:00 |
|
|
songchenxuan
|
626ff953ca
|
* Fix bug 15828
|
2021-11-16 16:47:00 +08:00 |
|