 李玉春
|
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 |
|
|
孙广明
|
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 |
|
|
caoyanyi
|
55f6cdb651
|
* Finish task #56548.
|
2022-06-08 15:53:37 +08:00 |
|
|
liumengyi
|
a7fcd0f372
|
* Fix bug #23416.
|
2022-06-08 15:33:49 +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 |
|
|
孙广明
|
0c0af6336a
|
Merge branch 'sprint/master_zhouxudong_23026' into 'sprint_200'
Sprint/master zhouxudong 23026
See merge request easycorp/zentaopms!3777
|
2022-06-08 06:37:32 +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
|
bf33186b82
|
* Add annotation.
|
2022-06-08 13:45:14 +08:00 |
|
|
liumengyi
|
0fe197894b
|
* Fix bug of task #56454.
|
2022-06-08 13:44:27 +08:00 |
|
|
liumengyi
|
2a9f945c77
|
* Fix bug #23407.
|
2022-06-08 13:25:06 +08:00 |
|
|
liumengyi
|
cbdefb47fd
|
* Fix bug of task #56454.
|
2022-06-08 13:18:21 +08:00 |
|
|
liumengyi
|
d1e74eb74a
|
* Fix bug of task #56454.
|
2022-06-08 13:10:13 +08:00 |
|
|
王怡栋
|
12b52e4687
|
Merge branch 'sprint_200_xieqiyu_56390' into 'sprint_200'
* Code for task#56393,#56390,#56389.
See merge request easycorp/zentaopms!3780
|
2022-06-08 02:44:45 +00:00 |
|
|
liumengyi
|
5e74d3bd9f
|
* Finish task #56454.
|
2022-06-08 10:32:01 +08:00 |
|
|
xieqiyu
|
86561ba4ca
|
* Code for task#56393,#56390,#56389.
|
2022-06-08 10:15: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
|
687f29b7bc
|
* Finish task #56363.
|
2022-06-07 06:44:49 +00:00 |
|
|
zhouxudong
|
607a871ddf
|
* Finish task #56396.
|
2022-06-07 06:09:44 +00:00 |
|
|
zhouxudong
|
1a952376fe
|
* Finish task #56396.
|
2022-06-07 05:44:06 +00:00 |
|
|
zhouxudong
|
0f645a096e
|
* Finish task #56396.
|
2022-06-07 05:39:44 +00:00 |
|
|
李玉春
|
0da04fca77
|
Merge branch 'sprint/scx_executionbug' into 'master'
* Fix bug #23291.
See merge request easycorp/zentaopms!3748
|
2022-06-07 01:12:52 +00:00 |
|
|
李玉春
|
61142f9f67
|
Update managemembers.js
|
2022-06-07 01:01:59 +00:00 |
|
|
tianshujie
|
020528cdbb
|
* Fix bug #23335.
|
2022-06-07 08:59:51 +08:00 |
|
|
tianshujie
|
d2242277e7
|
* Fix bug #23335.
|
2022-06-07 08:57:24 +08:00 |
|
|
李玉春
|
fd356fbb99
|
Merge branch 'sprint/sunhao/fix_kanban_col_height' into 'master'
* fix kanban lane height with auto height option.
See merge request easycorp/zentaopms!3747
|
2022-06-06 07:11:13 +00:00 |
|
|
tianshujie
|
814f1a597f
|
* Fix bug #23255.
|
2022-06-06 15:07:57 +08:00 |
|
|
宋辰轩
|
9ff12274e2
|
* Fix bug #23291.
|
2022-06-06 15:00:09 +08:00 |
|
|
Hao Sun
|
29ae8cb398
|
* fix kanban lane height with auto height option.
|
2022-06-06 06:58:38 +00:00 |
|
|
zenggang
|
c69ffb8d7d
|
* Fix bug#23246
|
2022-06-06 04:30:37 +00:00 |
|
|
孙广明
|
1dd0b6c022
|
Merge branch 'sprint/197_tianshujie_bug23213' into 'master'
* Fix bug #23213.
See merge request easycorp/zentaopms!3725
|
2022-06-02 08:04:56 +00:00 |
|