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 |
|
王怡栋
|
df6d8bcb0e
|
Merge branch 'sprint/201' into 'master'
Sprint/201
See merge request easycorp/zentaopms!3793
|
2022-06-08 06:45:01 +00:00 |
|
zhouxudong
|
edd66c028d
|
* Fix bug #23026.
|
2022-06-08 06:25:06 +00:00 |
|
liumengyi
|
d0e34c1f19
|
* Code optimize.
|
2022-06-08 13:50:15 +08:00 |
|
liumengyi
|
5e74d3bd9f
|
* Finish task #56454.
|
2022-06-08 10:32:01 +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 |
|
tianshujie
|
ff8e718b37
|
* Fix bug #23349.
|
2022-06-07 16:00:28 +08:00 |
|
zhouxudong
|
607a871ddf
|
* Finish task #56396.
|
2022-06-07 06:09:44 +00:00 |
|
zhouxudong
|
0f645a096e
|
* Finish task #56396.
|
2022-06-07 05:39:44 +00:00 |
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
liumengyi
|
4e71cb29a8
|
* Fix bug #23031.
|
2022-06-02 14:12:00 +08:00 |
|
tianshujie
|
6837b79449
|
* Fixed editing RD Kanban error.
|
2022-06-02 10:51:32 +08:00 |
|
孙广明
|
2d572a9d14
|
Merge branch '197'
|
2022-06-02 08:32:45 +08:00 |
|
孙广明
|
c671cc3186
|
Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674
See merge request easycorp/zentaopms!3691
|
2022-06-01 08:57:31 +00:00 |
|
zhouxin
|
cda4d7e809
|
* Adjust code.
|
2022-06-01 08:56:49 +00:00 |
|
zhouxin
|
2fcd623c62
|
* Adjust code.
|
2022-06-01 07:48:32 +00:00 |
|
zhouxin
|
bc803e56c8
|
* Finish task #55676.
|
2022-06-01 07:34:04 +00:00 |
|
zhouxudong
|
5c3ac663e6
|
* Fix bug #23129 #23126 #23108.
|
2022-06-01 06:30:45 +00:00 |
|
tianshujie
|
5d62ed5900
|
* Finish task #55675.
|
2022-06-01 13:06:26 +08:00 |
|
mayue
|
38bdcc9ea4
|
* Optimize code.
|
2022-06-01 11:29:41 +08:00 |
|
mayue
|
3c259a09d1
|
* Fix bug #23086.
|
2022-06-01 11:20:16 +08:00 |
|
王怡栋
|
f64b61a487
|
Merge branch 'sprint/196' into 'master'
Sprint/196
See merge request easycorp/zentaopms!3677
|
2022-06-01 02:28:26 +00:00 |
|
tanghucheng
|
c9daed297e
|
* Fix bug #23105.
|
2022-06-01 08:41:04 +08:00 |
|
tanghucheng
|
648362bfdb
|
* Fix bug #23095.
|
2022-05-31 17:22:15 +08:00 |
|
tianshujie
|
0665817eb8
|
* Finish task #55675.
|
2022-05-31 17:20:22 +08:00 |
|
王怡栋
|
e0adec2091
|
Merge branch 'master_xieqiyu_55620' into 'sprint/196'
* Finish task#55620,#55627.
See merge request easycorp/zentaopms!3666
|
2022-05-31 08:15:51 +00:00 |
|
zhouxudong
|
93e753b39e
|
* Finish task #55619 #55626.
|
2022-05-31 06:03:37 +00:00 |
|
xieqiyu
|
037a010a6f
|
* Code for task#55626.
|
2022-05-31 00:11:29 +08:00 |
|
zhouxudong
|
afa9003035
|
* Finisha task #55626 #55619.
|
2022-05-31 05:09:49 +00:00 |
|
xieqiyu
|
4d043935be
|
* Finish task#55620,#55627.
|
2022-05-30 23:29:15 +08:00 |
|
mayue
|
106bd7b3e7
|
* Fix issue #654.
|
2022-05-27 15:58:57 +08:00 |
|
王怡栋
|
a0af734e79
|
Merge branch 'sprint/master_zhouxudong_54991' into 'master'
Sprint/master zhouxudong 54991
See merge request easycorp/zentaopms!3626
|
2022-05-26 09:28:41 +00:00 |
|
zhouxudong
|
715527fd59
|
* Finish task #54991.
|
2022-05-26 09:19:50 +00:00 |
|
zhouxudong
|
e70628fef0
|
* Finish task #54991.
|
2022-05-26 07:40:28 +00:00 |
|
zhouxudong
|
4b956437fd
|
* Finisha task #54991.
|
2022-05-26 06:30:06 +00:00 |
|