 李玉春
|
68653946e5
|
Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
Sprint/171 sgm sortwiki
See merge request easycorp/zentaopms!435
|
2021-11-12 05:24:19 +00:00 |
|
|
孙广明
|
70c1981893
|
* Fix bug #16059.
|
2021-11-12 11:23:35 +08:00 |
|
|
songchenxuan
|
2dbfab7e5a
|
* Fix bug #16043.
|
2021-11-12 10:29:30 +08:00 |
|
|
tianshujie
|
e349618c4c
|
* Fix bug #16205.
|
2021-11-12 08:48:52 +08:00 |
|
|
tianshujie
|
382e3103d0
|
* Fix bug #16205.
|
2021-11-12 08:46:19 +08:00 |
|
|
liyuchun
|
4604c3d496
|
* Finish task #44217,#44218,#44219,#44220.
|
2021-11-11 12:32:20 +08:00 |
|
|
zhujinyong
|
37b486ad1c
|
* Replace htmlspecialchars to htmlSpecialString for compatibility.
|
2021-11-10 14:57:48 +08:00 |
|
|
tianshujie
|
c29ea5077a
|
* Finish task #43901.
|
2021-11-10 13:10:11 +08:00 |
|
|
李玉春
|
fe315477ea
|
Update manageproducts.html.php
|
2021-11-10 02:53:53 +00:00 |
|
|
tianshujie
|
0ac42fe56b
|
* Modify variable value.
|
2021-11-10 10:49:53 +08:00 |
|
|
tianshujie
|
fb7f493036
|
* Modify the error code.
|
2021-11-10 09:58:49 +08:00 |
|
|
tianshujie
|
fe99d1fafb
|
* Finish task #43901.
|
2021-11-09 19:56:48 +08:00 |
|
|
孙广明
|
b4e9ab871d
|
Merge branch 'sprint/168' into 'sprint/168_liyuchun_43982'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2021-11-09 08:57:01 +00:00 |
|
|
liyuchun
|
cec2fd2c42
|
* Finish task #43960.
|
2021-11-09 16:42:22 +08:00 |
|
|
李玉春
|
60766cee16
|
Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Finish task #43955.
See merge request easycorp/zentaopms!359
|
2021-11-09 06:36:52 +00:00 |
|
|
孙广明
|
954221334b
|
* Finish task #43955.
|
2021-11-09 10:38:09 +08:00 |
|
|
liyuchun
|
f634d5f20d
|
* Finish task #43933.
|
2021-11-09 08:59:56 +08:00 |
|
|
孙广明
|
1f49e46582
|
* Finish task #43948.
|
2021-11-08 14:29:10 +08:00 |
|
|
root
|
24c8e0948d
|
* Finish task 43917
|
2021-11-04 17:24:52 +08:00 |
|
|
tianshujie
|
d297c809b3
|
* Finish task #43907.
|
2021-11-03 15:51:04 +08:00 |
|
|
李玉春
|
f011907e1f
|
Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168'
* Change var name.
See merge request easycorp/zentaopms!281
|
2021-11-02 06:13:46 +00:00 |
|
|
孙广明
|
90b6253107
|
* Fix var name.
|
2021-11-02 14:12:18 +08:00 |
|
|
李玉春
|
86c7464aca
|
Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168'
* Assign btn check priv.
See merge request easycorp/zentaopms!282
|
2021-11-02 06:09:04 +00:00 |
|
|
孙广明
|
cc321393f6
|
* Change var name.
|
2021-11-02 14:05:53 +08:00 |
|
|
孙广明
|
3a61d3e8a6
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15852.
See merge request easycorp/zentaopms!275
|
2021-11-02 06:04:03 +00:00 |
|
|
孙广明
|
c7f0e74517
|
* Assign btn check priv.
|
2021-11-02 13:59:41 +08:00 |
|
|
liyuchun
|
03d1e570fc
|
* Fix bug #15844.
|
2021-11-02 09:58:20 +08:00 |
|
|
孙广明
|
f7ce0adcd0
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15901.
See merge request easycorp/zentaopms!270
|
2021-11-02 01:05:03 +00:00 |
|
|
李玉春
|
cb3e573d30
|
Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168'
* Fix bug #15902.
See merge request easycorp/zentaopms!269
|
2021-11-02 00:34:38 +00:00 |
|
|
liyuchun
|
a925bd1d90
|
* Fix bug #15901.
|
2021-11-01 17:40:36 +08:00 |
|
|
tianshujie
|
5444d35cde
|
* Fix bug #15902.
|
2021-11-01 17:34:25 +08:00 |
|
|
孙广明
|
1c98dbd28b
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15887,#15877,#15874.
See merge request easycorp/zentaopms!266
|
2021-11-01 09:18:16 +00:00 |
|
|
liyuchun
|
1631791368
|
* Fix bug #15887,#15877.
|
2021-11-01 16:54:02 +08:00 |
|
|
孙广明
|
065b0d04c9
|
Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15867.
See merge request easycorp/zentaopms!260
|
2021-11-01 08:30:11 +00:00 |
|
|
liyuchun
|
d8c96a6430
|
* Fix bug #15867.
|
2021-11-01 16:13:13 +08:00 |
|
|
李玉春
|
16b6f5786e
|
Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423'
# Conflicts:
# module/execution/js/kanban.js
# module/kanban/model.php
|
2021-11-01 08:12:58 +00:00 |
|
|
孙广明
|
2b2ec6f202
|
Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15861.
See merge request easycorp/zentaopms!252
|
2021-11-01 08:02:42 +00:00 |
|
|
hufangzhou
|
f0349dac2c
|
* Adjust the variable name.
|
2021-11-01 14:11:21 +08:00 |
|
|
孙广明
|
4099ac4a20
|
Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
Sprint/168 xieqiyu kanban
See merge request easycorp/zentaopms!253
|
2021-11-01 05:53:00 +00:00 |
|
|
hufangzhou
|
702c40addd
|
* Finish task #43423.
|
2021-11-01 13:50:53 +08:00 |
|
|
liyuchun
|
7d31524581
|
* Fix bug #15861.
|
2021-11-01 13:45:43 +08:00 |
|
|
dingna
|
c28e4c1b61
|
* Fix code for task#43401,#43403,#43404,#43405,#43398,#43399.
|
2021-11-01 13:26:57 +08:00 |
|
|
xieqiyu
|
c08c981ab0
|
* Display the sub Lane view kanban.
|
2021-11-01 13:13:56 +08:00 |
|
|
liyuchun
|
970763b0c5
|
* Adjust create object in kanban.
|
2021-11-01 11:32:21 +08:00 |
|
|
xieqiyu
|
d5914e8ffc
|
* Conflict resolution.
|
2021-10-29 14:12:07 +08:00 |
|
|
李玉春
|
8ce1a694fc
|
Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401'
# Conflicts:
# module/execution/control.php
# module/execution/view/kanban.html.php
# module/kanban/lang/zh-cn.php
# module/kanban/model.php
|
2021-10-29 05:50:12 +00:00 |
|
|
dingna
|
6369e0f7a3
|
* Fix an error.
|
2021-10-29 13:37:03 +08:00 |
|
|
liyuchun
|
4f56cc8c0f
|
* Finish task #43407,#43406.
|
2021-10-29 12:37:59 +08:00 |
|
|
dingna
|
0fac3aa189
|
* Adjust Code for task#43401,#43403,#43404,#43405,#43398,#43399.
|
2021-10-29 11:33:47 +08:00 |
|
|
夏文龙
|
a0a4af4daa
|
Update kanban.html.php
|
2021-10-29 02:33:45 +00:00 |
|