 songchenxuan
|
70612e93aa
|
*Fix bug #17563.
|
2021-12-20 13:55:22 +08:00 |
|
|
孙广明
|
84fae4bc7d
|
Merge branch 'kanban'
|
2021-12-20 10:59:07 +08:00 |
|
|
孙广明
|
177c9b158f
|
Merge branch 'sprint/179_tianshujie_46151' into 'kanban'
Sprint/179 tianshujie 46151
See merge request easycorp/zentaopms!991
|
2021-12-20 02:41:05 +00:00 |
|
|
tanghucheng
|
ae9ddf75fe
|
* Finish task #46181.
|
2021-12-20 10:30:30 +08:00 |
|
|
孙广明
|
ab43352a90
|
Merge branch 'sprint/179_zhengrunyu_46159' into 'kanban'
Sprint/179 zhengrunyu 46159
See merge request easycorp/zentaopms!987
|
2021-12-20 01:35:14 +00:00 |
|
|
zhengrunyu
|
08b8e71727
|
*Finish
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
bc3644053f
|
* Fix js error.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
1e13398592
|
* Fix kanban js.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
cc7c03b834
|
* Fix code details.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
7fb096c451
|
* Finish task #46164.
|
2021-12-20 09:32:34 +08:00 |
|
|
zhouxin
|
39ac40e170
|
Fix bug.
|
2021-12-20 09:32:34 +08:00 |
|
|
zhouxin
|
88b80e2716
|
Finish task #46230,46228,46227.
|
2021-12-20 09:32:34 +08:00 |
|
|
zhujinyong
|
40e6051daa
|
- Remove die() of admin module.
|
2021-12-20 09:15:34 +08:00 |
|
|
zhujinyong
|
90d2447cae
|
- Remove die() of admin module.
|
2021-12-20 09:13:32 +08:00 |
|
|
zhengrunyu
|
a31325053d
|
*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task*Finish task
|
2021-12-20 09:10:14 +08:00 |
|
|
zhujinyong
|
72b41be5b0
|
- Remove die() of action module.
|
2021-12-20 09:05:16 +08:00 |
|
|
孙广明
|
1c61b2a759
|
Merge branch 'kanban' into 'sprint/179_liumengyi_46158'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 00:53:10 +00:00 |
|
|
liumengyi
|
fc7b18ca37
|
* Remove unwanted space.
|
2021-12-20 08:47:25 +08:00 |
|
|
朱金勇
|
8ba0385b58
|
Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization
See merge request easycorp/zentaopms!924
|
2021-12-20 00:47:21 +00:00 |
|
|
tianshujie
|
ecd2d541ac
|
* Restore code.
|
2021-12-20 08:45:35 +08:00 |
|
|
liumengyi
|
23bec4a9ed
|
* Modify code format.
|
2021-12-20 08:43:34 +08:00 |
|
|
liumengyi
|
79c523399b
|
* Modify kanban judgment in recycle bin.
|
2021-12-20 08:28:18 +08:00 |
|
|
zhengrunyu
|
22156e1836
|
*Finish task.
|
2021-12-20 08:19:01 +08:00 |
|
|
zhengrunyu
|
7d78b9c4fb
|
*Fix bug
|
2021-12-17 17:33:24 +08:00 |
|
|
李玉春
|
dd6106c22a
|
Merge branch 'sgm_movecard' into 'kanban'
* Fix kanban js.
See merge request easycorp/zentaopms!994
|
2021-12-17 07:56:13 +00:00 |
|
|
孙广明
|
eaf86c493d
|
* Fix js error.
|
2021-12-17 15:55:34 +08:00 |
|
|
tianshujie
|
54cf020b63
|
* Modify the code.
|
2021-12-17 15:54:13 +08:00 |
|
|
孙广明
|
302a576ed1
|
* Fix kanban js.
|
2021-12-17 15:54:00 +08:00 |
|
|
李玉春
|
f2fae37b7f
|
Merge branch 'sgm_movecard' into 'kanban'
*Finish task #46164
See merge request easycorp/zentaopms!992
|
2021-12-17 07:52:10 +00:00 |
|
|
朱金勇
|
c0fd222c18
|
Merge branch 'sprint/178_xieqiyu_46102' into 'master'
* Code for task#46102.
See merge request easycorp/zentaopms!990
|
2021-12-17 07:45:23 +00:00 |
|
|
朱金勇
|
4cddc5effd
|
Merge branch 'sprint/176_xieqiyu_46097' into 'master'
* Finish task#46097.
See merge request easycorp/zentaopms!989
|
2021-12-17 07:44:07 +00:00 |
|
|
孙广明
|
87c12c800a
|
* Fix code details.
|
2021-12-17 15:43:19 +08:00 |
|
|
朱金勇
|
493b42452c
|
Merge branch 'sprint/178_songchenxuan_46136' into 'master'
*Finish task #46136.
See merge request easycorp/zentaopms!976
|
2021-12-17 07:40:40 +00:00 |
|
|
朱金勇
|
67ecc5f8c8
|
Merge branch 'sprint/178_songchenxuan_46099' into 'master'
*Finish task #46099.
See merge request easycorp/zentaopms!974
|
2021-12-17 07:40:10 +00:00 |
|
|
liumengyi
|
7d3ad08bc6
|
* Finish task #46158, and fix bug #17657,#17655.
|
2021-12-17 15:39:41 +08:00 |
|
|
朱金勇
|
d8852453dc
|
Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Optimize style for cards in client.
See merge request easycorp/zentaopms!985
|
2021-12-17 07:39:30 +00:00 |
|
|
孙广明
|
9f7eecf9c6
|
* Finish task #46164.
|
2021-12-17 15:25:59 +08:00 |
|
|
tianshujie
|
13fe70296a
|
* Ajust code of kanban.
|
2021-12-17 15:20:10 +08:00 |
|
|
tianshujie
|
2628b1c33f
|
* Finish task #46151.
|
2021-12-17 15:11:26 +08:00 |
|
|
孙广明
|
6a88107d35
|
Merge branch 'sprint/31_zhouxin_fixbug' into 'kanban'
Sprint/31 zhouxin fixbug
See merge request easycorp/zentaopms!988
|
2021-12-17 06:48:20 +00:00 |
|
|
zhengrunyu
|
48107a5644
|
*Fix bug
|
2021-12-17 14:39:44 +08:00 |
|
|
zhengrunyu
|
481ba45806
|
*Fix bug
|
2021-12-17 14:37:01 +08:00 |
|
|
zhouxin
|
f61213d23b
|
Fix bug.
|
2021-12-17 06:35:24 +00:00 |
|
|
songchenxuan
|
d10d8be62a
|
*Finish task #46136.
|
2021-12-17 14:20:05 +08:00 |
|
|
songchenxuan
|
03399bbb8c
|
*Finish task #46136.
|
2021-12-17 14:17:12 +08:00 |
|
|
Hao Sun
|
fd3a645a30
|
* Optimize style for cards in client.
|
2021-12-17 14:11:50 +08:00 |
|
|
朱金勇
|
3381dd3ab0
|
Merge branch 'sprint/xuan_sunhao/adjust_card_style' into 'master'
* Adjust url card style in client.
See merge request easycorp/zentaopms!981
|
2021-12-17 06:10:26 +00:00 |
|
|
songchenxuan
|
59bbd18c55
|
*Finish task #46099.
|
2021-12-17 13:58:31 +08:00 |
|
|
songchenxuan
|
63479860a5
|
*Finish task #46099.
|
2021-12-17 13:56:24 +08:00 |
|
|
zhouxin
|
647c81e608
|
Finish task #46230,46228,46227.
|
2021-12-17 05:42:52 +00:00 |
|