 孙广明
|
d61db00a54
|
Merge branch 'sprint/183_xieqiyu_47995new'
|
2022-01-24 15:29:27 +08:00 |
|
|
孙广明
|
72de0a1b9c
|
Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
# db/update16.2.sql
# module/group/lang/resource.php
# module/kanban/js/view.js
# module/kanban/model.php
|
2022-01-24 07:28:48 +00:00 |
|
|
tianshujie
|
dfa075beb7
|
* Edit view link.
|
2022-01-24 15:16:29 +08:00 |
|
|
xieqiyu
|
78427e12c6
|
* Modify date.
|
2022-01-24 14:41:36 +08:00 |
|
|
xieqiyu
|
41d4d5a132
|
* Modify the duplicate name function.
|
2022-01-24 14:38:52 +08:00 |
|
|
xieqiyu
|
7570801b1d
|
* Modify the review code.
|
2022-01-24 14:34:37 +08:00 |
|
|
tianshujie
|
f86c3f5b8c
|
* Modify the code.
|
2022-01-24 14:28:24 +08:00 |
|
|
孙广明
|
e60e590ba8
|
Merge branch 'Fixbug' into 'master'
Fix bug 18885.
See merge request easycorp/zentaopms!1564
|
2022-01-24 06:27:05 +00:00 |
|
|
zhengrunyu
|
cc299e0b45
|
Fix bug 18885.
|
2022-01-24 14:24:19 +08:00 |
|
|
孙广明
|
881367f7bd
|
Merge branch 'sprint/183_hufangzhou_columnCreateMenu' into 'master'
* Code for task #47991.
See merge request easycorp/zentaopms!1561
|
2022-01-24 06:13:16 +00:00 |
|
|
hufangzhou
|
0530d95aac
|
* Rename the importObject to object.
|
2022-01-24 14:11:52 +08:00 |
|
|
hufangzhou
|
b9ab4c5326
|
* Delete the unused code.
|
2022-01-24 14:03:02 +08:00 |
|
|
孙广明
|
081f5a969e
|
Merge branch 'sprint/183_liumengyi_47973' into 'master'
* When sorting columns, the card is hidden.
See merge request easycorp/zentaopms!1558
|
2022-01-24 06:00:39 +00:00 |
|
|
孙广明
|
3550c592ad
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug#18841, #18865, #18876, #18877, #18879 and #18891.
See merge request easycorp/zentaopms!1556
|
2022-01-24 06:00:27 +00:00 |
|
|
hufangzhou
|
7cd0246265
|
* Code for task #47991.
|
2022-01-24 13:52:49 +08:00 |
|
|
liumengyi
|
565be797cd
|
* When sorting columns, the card is hidden.
|
2022-01-24 13:47:02 +08:00 |
|
|
孙广明
|
babfd88f2d
|
Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Fix bug #18840.
See merge request easycorp/zentaopms!1555
|
2022-01-24 05:32:14 +00:00 |
|
|
tianshujie
|
b72893bd91
|
Merge branch 'sprint/183_xieqiyu_47995new' of https://gitlab.zcorp.cc/easycorp/zentaopms into xieqiyu
|
2022-01-24 13:31:31 +08:00 |
|
|
liumengyi
|
7633710cfa
|
* Fix bug#18841, #18865, #18876, #18877, #18879 and #18891.
|
2022-01-24 13:31:12 +08:00 |
|
|
tianshujie
|
51a69f3af9
|
* Fix drag style issue.
|
2022-01-24 13:30:09 +08:00 |
|
|
zhouxin
|
8e4b8477c4
|
Fix bug #18840.
|
2022-01-24 05:27:30 +00:00 |
|
|
李玉春
|
bdf0e65bcd
|
Merge branch 'sgm_48001' into 'master'
* Finish task #48001.
See merge request easycorp/zentaopms!1554
|
2022-01-24 05:26:39 +00:00 |
|
|
孙广明
|
9dc7763593
|
Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Fix bug #18847#18846 and add ditto for batchcreatecard.html.php.
See merge request easycorp/zentaopms!1553
|
2022-01-24 05:25:42 +00:00 |
|
|
xieqiyu
|
780d82971f
|
* Add sql.
|
2022-01-24 13:24:17 +08:00 |
|
|
zhouxin
|
363605fd15
|
Change code format.
|
2022-01-24 05:22:58 +00:00 |
|
|
tianshujie
|
2fe1b4b744
|
* Encapsulate the method for obtaining card data.
|
2022-01-24 13:22:25 +08:00 |
|
|
孙广明
|
c502091bf5
|
* Finish task #48001.
|
2022-01-24 13:19:13 +08:00 |
|
|
zhouxin
|
b519ac8607
|
Fix bug #18847#18846 and add ditto for batchcreatecard.html.php.
|
2022-01-24 05:12:33 +00:00 |
|
|
xieqiyu
|
f8062df4dc
|
* Adjust the code structure.
|
2022-01-24 13:08:45 +08:00 |
|
|
tianshujie
|
32b459570b
|
Merge branch 'sprint/183_xieqiyu_47995new' of https://gitlab.zcorp.cc/easycorp/zentaopms into xieqiyu
|
2022-01-24 12:31:04 +08:00 |
|
|
tianshujie
|
0b8535a885
|
* Finish task #47994.
|
2022-01-24 12:30:30 +08:00 |
|
|
xieqiyu
|
8959feba2a
|
* Optimize the code.
|
2022-01-24 12:07:16 +08:00 |
|
|
孙广明
|
e3da935f16
|
Merge branch 'sprint/183_liumengyi_47973' into 'master'
* Finish task #47973.
See merge request easycorp/zentaopms!1551
|
2022-01-24 02:48:50 +00:00 |
|
|
liumengyi
|
d550b6ac58
|
* Modify code format.
|
2022-01-24 10:47:47 +08:00 |
|
|
liumengyi
|
bc9f51c63d
|
* Finish task #47973.
|
2022-01-24 10:36:33 +08:00 |
|
|
李玉春
|
782df170ea
|
Merge branch 'sgm_48004' into 'master'
Sgm 48004
See merge request easycorp/zentaopms!1550
|
2022-01-24 02:20:38 +00:00 |
|
|
xieqiyu
|
895d345775
|
* Code for task#47991.
|
2022-01-24 09:59:49 +08:00 |
|
|
孙广明
|
b4d294c395
|
* Finish task #48004.
|
2022-01-24 09:53:33 +08:00 |
|
|
孙广明
|
3730b5b80a
|
Merge branch 'Fixbug' into 'master'
*Fix bug
See merge request easycorp/zentaopms!1548
|
2022-01-24 01:39:28 +00:00 |
|
|
zhengrunyu
|
9fd9fcceb1
|
*Fix bug
|
2022-01-24 09:38:26 +08:00 |
|
|
zhengrunyu
|
cff61e144d
|
*Fix bug
|
2022-01-24 09:32:24 +08:00 |
|
|
孙广明
|
e9776236d4
|
Merge branch 'sprint/183_zhengrunyu_48003'
|
2022-01-24 09:27:10 +08:00 |
|
|
孙广明
|
3b100b47d2
|
Merge branch 'master' into 'sprint/183_zhengrunyu_48003'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
# module/kanban/model.php
|
2022-01-24 01:26:45 +00:00 |
|
|
zhengrunyu
|
18b70fac64
|
*Finish task 47997 48003.
|
2022-01-24 09:22:56 +08:00 |
|
|
xieqiyu
|
c582ffed5b
|
* Code for task#47989.
|
2022-01-24 09:20:26 +08:00 |
|
|
zhengrunyu
|
ea3c1dd61b
|
*Finish task 47997 48003.
|
2022-01-24 09:12:19 +08:00 |
|
|
zhengrunyu
|
87463359ec
|
*Finish task 47997 48003.
|
2022-01-24 09:02:29 +08:00 |
|
|
zhengrunyu
|
b323508a0b
|
*Finish task 47997 48003.
|
2022-01-24 08:56:29 +08:00 |
|
|
孙广明
|
6d13f60223
|
Merge branch 'sprint/183_tianshujie_privilege' into 'master'
* Add import permission.
See merge request easycorp/zentaopms!1547
|
2022-01-24 00:56:05 +00:00 |
|
|
tianshujie
|
3c7f9cf529
|
* Add import permission.
|
2022-01-24 08:54:03 +08:00 |
|