 xieqiyu
|
41d4d5a132
|
* Modify the duplicate name function.
|
2022-01-24 14:38:52 +08:00 |
|
|
hufangzhou
|
0530d95aac
|
* Rename the importObject to object.
|
2022-01-24 14:11:52 +08: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 |
|
|
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 |
|
|
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
|
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 |
|
|
zhengrunyu
|
cff61e144d
|
*Fix bug
|
2022-01-24 09:32:24 +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 |
|
|
xieqiyu
|
c582ffed5b
|
* Code for task#47989.
|
2022-01-24 09:20:26 +08:00 |
|
|
zhengrunyu
|
f06c5c5e30
|
*Finish task 47997 48003.
|
2022-01-24 08:36:25 +08:00 |
|
|
xieqiyu
|
6e5e5f96f6
|
* Code for task#47993.
|
2022-01-23 20:34:31 +08:00 |
|
|
xieqiyu
|
71b287e1fa
|
* Code for task#47987.
|
2022-01-23 19:37:44 +08:00 |
|
|
xieqiyu
|
1f79e9e7dd
|
* Code for task#47995.
|
2022-01-22 22:24:49 +08:00 |
|
|
孙广明
|
a514a2bb07
|
* Finish one version.
|
2022-01-21 15:05:00 +08:00 |
|
|
xieqiyu
|
0ffb6f3f8d
|
* Code for task#47995.
|
2022-01-21 14:24:54 +08:00 |
|
|
孙广明
|
cfb595e987
|
Merge branch 'sprint/183_mayue_47998' into 'master'
* Finish task #47998.
See merge request easycorp/zentaopms!1529
|
2022-01-21 06:00:56 +00:00 |
|
|
孙广明
|
c40034f942
|
Merge branch 'master' into 'sprint/183_liumengyi_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-01-21 05:57:10 +00:00 |
|
|
mayue
|
6ba1e7212d
|
* Optimize code.
|
2022-01-21 13:50:56 +08:00 |
|
|
liumengyi
|
80da12fc7d
|
* Finish task#48008 and fix bug for 48011.
|
2022-01-21 13:49:47 +08:00 |
|
|
孙广明
|
1a136248ba
|
Merge branch 'master' into 'sprint/183_zhouxin_47982'
# Conflicts:
# module/group/lang/resource.php
# module/kanban/js/view.js
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2022-01-21 05:47:16 +00:00 |
|
|
mayue
|
aaaefa509c
|
* Optimize code.
|
2022-01-21 13:32:58 +08:00 |
|
|
xieqiyu
|
fdaf47943e
|
* Code for task#47995.
|
2022-01-21 13:17:56 +08:00 |
|
|
liumengyi
|
d0739e40e3
|
* Fix bug for task #47976.
|
2022-01-21 12:16:16 +08:00 |
|
|
zhengrunyu
|
9b500daa08
|
*Finish task 47997 48003.
|
2022-01-21 11:21:52 +08:00 |
|
|
zhouxin
|
ac00d73a20
|
Finish task #47982.
|
2022-01-21 01:23:30 +00:00 |
|
|
刘梦艺
|
d980d5132d
|
Update control.php
|
2022-01-21 00:46:28 +00:00 |
|
|
liumengyi
|
04f89dd9ba
|
* Fix bug for edit kanban.
|
2022-01-21 08:44:11 +08:00 |
|
|
liumengyi
|
ec1f0876aa
|
* Fix bug for create kanban.
|
2022-01-21 08:38:38 +08:00 |
|
|
mayue
|
7b0694844c
|
* Finish task #47998.
|
2022-01-21 08:32:21 +08:00 |
|
|
xieqiyu
|
dde34eb36f
|
* Code for task#47995.
|
2022-01-20 18:03:28 +08:00 |
|
|
王怡栋
|
a8457f1665
|
Merge branch 'master' into 'sprint/183_hufangzhou_47986'
# Conflicts:
# db/update16.2.sql
# module/group/lang/resource.php
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2022-01-20 08:04:32 +00:00 |
|
|
hufangzhou
|
9aee0590c5
|
* Finish task #47986.
|
2022-01-20 15:52:18 +08:00 |
|
|
liumengyi
|
e2e794c27f
|
* Finish task #48011.
|
2022-01-20 14:49:16 +08:00 |
|
|
王怡栋
|
abf1d172a6
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #48006, #48007.
See merge request easycorp/zentaopms!1512
|
2022-01-20 03:22:28 +00:00 |
|
|
liumengyi
|
083e006c38
|
* Remove empty line.
|
2022-01-20 11:11:08 +08:00 |
|
|
liumengyi
|
b371c22842
|
* Finish task #48006, #48007.
|
2022-01-20 11:05:35 +08:00 |
|
|
孙广明
|
6d2212e7e0
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #47977.
See merge request easycorp/zentaopms!1503
|
2022-01-19 09:32:12 +00:00 |
|
|
mayue
|
7cb8fa1912
|
* Optimize code.
|
2022-01-19 17:23:27 +08:00 |
|
|
mayue
|
29bedc7b1f
|
* Optimize code.
|
2022-01-19 17:10:09 +08:00 |
|
|
liumengyi
|
e02ec415c4
|
* Remove useless code.
|
2022-01-19 17:04:54 +08:00 |
|
|
liumengyi
|
c8b5ceed87
|
* Finish task #47977.
|
2022-01-19 16:58:34 +08:00 |
|
|
mayue
|
39b7da7355
|
* Finish task #47996.
|
2022-01-19 16:50:40 +08:00 |
|
|
tianshujie
|
1c60beb471
|
* Finish task #48005.
|
2022-01-19 16:02:34 +08:00 |
|
|
tianshujie
|
0adde5be67
|
* Remove useless code.
|
2022-01-19 13:56:50 +08:00 |
|
|
tianshujie
|
caf4e77f84
|
* Finish task #47981.
|
2022-01-19 13:32:39 +08:00 |
|