 王怡栋
|
ee4ce60394
|
Merge branch 'sprint/204_liumengyi_23648' into 'master'
* Fix bug #23648.
See merge request easycorp/zentaopms!3912
|
2022-06-14 07:26:14 +00:00 |
|
|
liumengyi
|
5ad98df2ca
|
* Fix bug #23648.
|
2022-06-14 15:17:57 +08: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 |
|
|
liumengyi
|
6aaf4f6308
|
* Fix bug for task #57090.
|
2022-06-14 14:39:55 +08: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 |
|
|
王怡栋
|
a8e7dcf2a3
|
Merge branch 'sprint/204_liumengyi_57090' into 'master'
* Fix bug #23648, #23650, and finish task #57090.
See merge request easycorp/zentaopms!3904
|
2022-06-14 06:29:34 +00:00 |
|
|
xieqiyu
|
8814f0f6dd
|
* Finish task#56931.
|
2022-06-14 14:12:57 +08:00 |
|
|
liumengyi
|
d1a44ab424
|
* Finish task #57090.
|
2022-06-14 13:58:18 +08:00 |
|
|
liumengyi
|
2d4f3be98a
|
* Finish task #57090.
|
2022-06-14 13:56:38 +08:00 |
|
|
liumengyi
|
347fcb16c7
|
* Fix bug #23648, #23650.
|
2022-06-14 13:47:33 +08:00 |
|
|
zhouxudong
|
c16b1fd1c3
|
* Finish task #56910.
|
2022-06-14 02:44:20 +00:00 |
|
|
zhouxudong
|
3fcccf17f1
|
* Finish task #56910.
|
2022-06-14 01:47:39 +00:00 |
|
|
王怡栋
|
24e35041ae
|
Merge branch 'master_xieqiyu_56909' into 'master'
* Finish task#56909.
See merge request easycorp/zentaopms!3885
|
2022-06-14 01:25:05 +00:00 |
|
|
王怡栋
|
6a2e3d116f
|
Merge branch 'sprint/master_zhouxudong_56908' into 'master'
Sprint/master zhouxudong 56908
See merge request easycorp/zentaopms!3890
|
2022-06-14 01:17:18 +00:00 |
|
|
zenggang
|
8bfc6dec02
|
* Finish task#56558
|
2022-06-13 09:46:02 +00:00 |
|
|
liumengyi
|
39dabf6ff3
|
* Finish task #57099.
|
2022-06-13 16:02:23 +08:00 |
|
|
zhouxudong
|
d376e41579
|
* Finish task #56908 #56914 #56921.
|
2022-06-13 07:35:54 +00:00 |
|
|
xieqiyu
|
caf596097a
|
* Finish task#56909.
|
2022-06-13 14:45:36 +08:00 |
|
|
liumengyi
|
76b3f952a0
|
* Fix issue #673.
|
2022-06-13 10:02:33 +08:00 |
|
|
zhouxudong
|
51f5d5bd3a
|
* Finish task #56648.
|
2022-06-10 02:29:54 +00:00 |
|
|
tianshujie
|
3f1dc22664
|
* Finish task #56469.
|
2022-06-10 09:22:50 +08: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 |
|
|
liumengyi
|
a5d2a87fdf
|
* Finish task #56469.
|
2022-06-09 17:33:46 +08:00 |
|
|
王怡栋
|
7d3ea4b91e
|
Merge branch 'sprint200_fix_bug_23486' into 'master'
* Fix bug#23494,bug#23486.
See merge request easycorp/zentaopms!3839
|
2022-06-09 09:17:19 +00:00 |
|
|
李玉春
|
3cd9b94ecb
|
Merge branch 'cyy_56548' into 'master'
* Modify task import.
See merge request easycorp/zentaopms!3834
|
2022-06-09 09:13:47 +00:00 |
|
|
leiyong
|
4d5ccc180e
|
* Fix bug#23494,bug#23486.
|
2022-06-09 08:58:05 +00:00 |
|
|
liumengyi
|
f3ce4377a8
|
* Fix bug #23506, #23439.
|
2022-06-09 16:22:58 +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 |
|
|
王怡栋
|
ce38afd825
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3817
|
2022-06-09 06:35:07 +00: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 |
|
|
孙广明
|
f3f8e20c9b
|
Merge branch 'sprint/201_zhouxin_my_work' into 'master'
* Finish task #56461,56462,56458,56465.
See merge request easycorp/zentaopms!3819
|
2022-06-09 05:23:01 +00:00 |
|
|
zhouxin
|
c056b7e567
|
* Finish task #56461,56462,56458,56465.
|
2022-06-09 05:18:27 +00:00 |
|
|
zhouxudong
|
89d4ecfd35
|
* Finish task #56362.
|
2022-06-09 03:43:20 +00:00 |
|
|
leiyong
|
38a7d7334a
|
* Fix bug#23481,bug#23466.
|
2022-06-09 03:42:53 +00:00 |
|
|
zhouxudong
|
acf028e0a9
|
* Fix bug.
|
2022-06-09 03:24:15 +00: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
|
35a857fd38
|
* Adjust code.
|
2022-06-09 10:33:39 +08:00 |
|
|
王怡栋
|
1407272999
|
Merge branch 'sprint/201_liumengyi_56454' into 'master'
* Fix bug #23439.
See merge request easycorp/zentaopms!3812
|
2022-06-09 01:58:01 +00:00 |
|
|
liumengyi
|
2279c5d602
|
* Fix bug #23439.
|
2022-06-09 09:45:06 +08:00 |
|
|
caoyanyi
|
326323a0c1
|
* Modify url param.
|
2022-06-09 09:11:54 +08:00 |
|
|
liumengyi
|
56b622e91a
|
* Fix bug #23439.
|
2022-06-08 17:09:03 +08:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|