 tianshujie
|
b3e240eda5
|
* Finish task #57095.
|
2022-06-16 10:29:31 +08:00 |
|
|
leiyong
|
fcd6f4c333
|
* Finish task#56932.
|
2022-06-15 10:57:05 +00:00 |
|
|
王怡栋
|
95df7b5e3c
|
Merge branch 'master_xieqiyu_23662' into 'master'
* Fix bug#23662.
See merge request easycorp/zentaopms!3949
|
2022-06-15 09:32:05 +00:00 |
|
|
xieqiyu
|
f460aa58fd
|
* Fix bug#23662.
|
2022-06-15 17:07:18 +08:00 |
|
|
孙广明
|
1f13b14799
|
Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
# module/execution/css/all.css
|
2022-06-15 09:03:47 +00:00 |
|
|
王怡栋
|
a6b264d1a7
|
Merge branch 'sprint202_leiyong_task_56926' into 'master'
Sprint202 leiyong task 56926
See merge request easycorp/zentaopms!3942
|
2022-06-15 08:20:11 +00:00 |
|
|
tianshujie
|
520ab92338
|
* Finish task #57095.
|
2022-06-15 16:17:16 +08:00 |
|
|
leiyong
|
32b846cdf5
|
* Finish task#56926.
|
2022-06-15 07:57:50 +00:00 |
|
|
tianshujie
|
2c176439d3
|
* Finish task #57095.
|
2022-06-15 15:09:34 +08:00 |
|
|
孙广明
|
9df2853a61
|
Merge branch 'sprint_204_57094' into 'master'
Sprint 204 57094
See merge request easycorp/zentaopms!3928
|
2022-06-15 03:09:37 +00:00 |
|
|
sunjun
|
1ff7d29c99
|
sprint_204_57094
|
2022-06-15 03:07:20 +00:00 |
|
|
sunjun
|
b4c2ecbb2f
|
sprint_204_57094
|
2022-06-15 03:02:18 +00:00 |
|
|
王怡栋
|
043aed24ec
|
Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Finish task #57089, #57099.
See merge request easycorp/zentaopms!3927
|
2022-06-15 02:21:35 +00:00 |
|
|
sunjun
|
a99aed925f
|
sprint_204_57094
|
2022-06-15 01:42:06 +00:00 |
|
|
孙广明
|
423bd7b9b9
|
Merge branch 'sprint/203_mayue_bug#23586' into 'master'
* Fix bug #23586.
See merge request easycorp/zentaopms!3924
|
2022-06-15 01:08:50 +00:00 |
|
|
mayue
|
8099c563c3
|
* Fix bug #23586.
|
2022-06-15 08:50:16 +08:00 |
|
|
李玉春
|
481b40a16b
|
Merge branch 'cyy_23586' into 'master'
* Fix bug #23586.
See merge request easycorp/zentaopms!3879
|
2022-06-15 00:45:00 +00:00 |
|
|
caoyanyi
|
c1876a6dbc
|
* Modify page locate.
|
2022-06-15 08:44:13 +08:00 |
|
|
caoyanyi
|
8c5d59f15d
|
* Fix bug #23633.
|
2022-06-15 08:41:06 +08:00 |
|
|
xieqiyu
|
cb06e1cd4d
|
* Conflict resolution.
|
2022-06-14 17:55:19 +08:00 |
|
|
zhujinyong
|
87f50aa3be
|
Merge branch 'sprint/sunhao/task56391'
|
2022-06-14 17:12:21 +08:00 |
|
|
孙广明
|
271d1b1a3b
|
Merge branch 'sprint_204_57097' into 'master'
sprint_204_57097
See merge request easycorp/zentaopms!3920
|
2022-06-14 09:09:41 +00:00 |
|
|
sunjun
|
1b2cd0651b
|
sprint_204_57094
|
2022-06-14 09:05:28 +00:00 |
|
|
sunjun
|
d84c0bf80b
|
sprint_204_57094
|
2022-06-14 09:00:35 +00:00 |
|
|
liumengyi
|
ee49b70482
|
* Finish task #57089.
|
2022-06-14 16:42:12 +08:00 |
|
|
sunjun
|
431a832cda
|
sprint_204_57094
|
2022-06-14 08:13:25 +00:00 |
|
|
Hao Sun
|
44f7de103a
|
* update zui files.
|
2022-06-14 08:11:13 +00:00 |
|
|
孙广明
|
dbb1ccc413
|
Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558
See merge request easycorp/zentaopms!3892
|
2022-06-14 06:58:39 +00:00 |
|
|
王怡栋
|
d682c68483
|
Merge branch 'master_xieqiyu_56931' into 'master'
* Finish task#56931.
See merge request easycorp/zentaopms!3906
|
2022-06-14 06:30:53 +00:00 |
|
|
xieqiyu
|
8814f0f6dd
|
* Finish task#56931.
|
2022-06-14 14:12:57 +08:00 |
|
|
sunjun
|
3ab3059ed3
|
sprint_204_57097
|
2022-06-14 04:07:06 +00:00 |
|
|
zhouxudong
|
3fcccf17f1
|
* Finish task #56910.
|
2022-06-14 01:47:39 +00:00 |
|
|
zenggang
|
8bfc6dec02
|
* Finish task#56558
|
2022-06-13 09:46:02 +00:00 |
|
|
xieqiyu
|
caf596097a
|
* Finish task#56909.
|
2022-06-13 14:45:36 +08:00 |
|
|
caoyanyi
|
3d701d6c4d
|
* Fix bug #23586.
|
2022-06-13 12:04:59 +08:00 |
|
|
zhouxudong
|
51f5d5bd3a
|
* Finish task #56648.
|
2022-06-10 02:29:54 +00:00 |
|
|
王怡栋
|
a9981b0a33
|
Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
# module/execution/control.php
# module/execution/js/kanban.js
# module/kanban/control.php
# module/kanban/model.php
|
2022-06-10 01:05:39 +00:00 |
|
|
tianshujie
|
b8792fcb90
|
* Finish task #56469.
|
2022-06-10 08:35:22 +08:00 |
|
|
caoyanyi
|
861a695535
|
* Modify task import.
|
2022-06-09 15:54:16 +08:00 |
|
|
caoyanyi
|
6a93732c19
|
* Modify access check.
|
2022-06-09 15:47:28 +08:00 |
|
|
李玉春
|
f8581fd2c4
|
Merge branch 'zentaopms_199' into 'master'
Zentaopms 199
See merge request easycorp/zentaopms!3832
|
2022-06-09 07:38:52 +00:00 |
|
|
王怡栋
|
ad0ebf0aa1
|
Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-06-09 07:24:23 +00:00 |
|
|
liumengyi
|
63717f4fd0
|
* Fix bug of task #56454.
|
2022-06-09 15:18:56 +08:00 |
|
|
王怡栋
|
084f66dd51
|
Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
# module/kanban/model.php
|
2022-06-09 06:32:06 +00:00 |
|
|
zhouxudong
|
1da6718278
|
* Finish task #56362.
|
2022-06-09 05:30:57 +00:00 |
|
|
tianshujie
|
74f80b8d71
|
* Finish task #56469.
|
2022-06-09 13:24:58 +08:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
zhouxudong
|
ea746e862f
|
* Finish task #56362.
|
2022-06-09 03:04:12 +00:00 |
|
|
caoyanyi
|
326323a0c1
|
* Modify url param.
|
2022-06-09 09:11:54 +08:00 |
|
|
caoyanyi
|
55f6cdb651
|
* Finish task #56548.
|
2022-06-08 15:53:37 +08:00 |
|