 hufangzhou
|
7cd0246265
|
* Code for task #47991.
|
2022-01-24 13:52:49 +08: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 |
|
|
zhouxin
|
363605fd15
|
Change code format.
|
2022-01-24 05:22:58 +00: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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
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 |
|
|
zhengrunyu
|
38f3b30b4e
|
*Finish task 47997 48003.
|
2022-01-24 08:53:14 +08:00 |
|
|
zhengrunyu
|
23c9ebab65
|
*Finish task 47997 48003.
|
2022-01-24 08:47:23 +08:00 |
|
|
zhengrunyu
|
f06c5c5e30
|
*Finish task 47997 48003.
|
2022-01-24 08:36:25 +08:00 |
|
|
孙广明
|
b2342fd7fb
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for task#47976.
See merge request easycorp/zentaopms!1545
|
2022-01-21 09:28:59 +00:00 |
|
|
liumengyi
|
e34ea32b16
|
* Fix bug for task#47976.
|
2022-01-21 17:27:40 +08:00 |
|
|
孙广明
|
50592ea096
|
Merge branch 'sprint/182_tianshujie_18806' into 'master'
Sprint/182 tianshujie 18806
See merge request easycorp/zentaopms!1543
|
2022-01-21 09:24:33 +00:00 |
|
|
tianshujie
|
78dc1af6bd
|
* Modify the format.
|
2022-01-21 15:40:56 +08:00 |
|
|
孙广明
|
a514a2bb07
|
* Finish one version.
|
2022-01-21 15:05:00 +08:00 |
|
|
tianshujie
|
3f15a1e016
|
* Fix bug #18806.
|
2022-01-21 15:04:25 +08:00 |
|
|
tianshujie
|
2e030b874c
|
* Fix bug #18806.
|
2022-01-21 14:59:21 +08:00 |
|
|
王怡栋
|
9e50180887
|
Merge branch 'sgm_fixbug' into 'master'
* Delete unused lang.
See merge request easycorp/zentaopms!1541
|
2022-01-21 06:36:02 +00:00 |
|
|
孙广明
|
7e250dfaee
|
Merge branch 'xieqiyu_fixbug_18792' into 'master'
* Fix bug#18792.
See merge request easycorp/zentaopms!1520
|
2022-01-21 06:35:15 +00:00 |
|
|
孙广明
|
a2477a59bf
|
* Delete unused lang.
|
2022-01-21 14:33:58 +08:00 |
|
|
zhengrunyu
|
446f6e59d3
|
*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.
|
2022-01-21 14:31:00 +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 |
|
|
孙广明
|
ea05b6185c
|
Merge branch 'sprint/183_liumengyi_fixbug'
|
2022-01-21 13:57:34 +08: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
|
ecef85b7f7
|
* Add a file.
|
2022-01-21 13:54:33 +08: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 |
|
|
孙广明
|
a82d786dde
|
Merge branch 'sprint/183_zhouxin_47982'
|
2022-01-21 13:47:35 +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 |
|
|
zhouxin
|
6041f71d99
|
Adjust code.
|
2022-01-21 05:44:18 +00:00 |
|
|
zhouxin
|
2d6115537f
|
Fix bug.
|
2022-01-21 05:35:35 +00:00 |
|
|
mayue
|
aaaefa509c
|
* Optimize code.
|
2022-01-21 13:32:58 +08:00 |
|
|
孙广明
|
262c93b714
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for task #47976.
See merge request easycorp/zentaopms!1536
|
2022-01-21 05:28:30 +00:00 |
|
|
孙广明
|
47b2a35290
|
Merge branch 'sprint/183_tianshujie_js' into 'master'
* Finish task #48012.
See merge request easycorp/zentaopms!1537
|
2022-01-21 05:21:17 +00:00 |
|
|
tianshujie
|
dfddd4e48b
|
* Modify the code.
|
2022-01-21 13:19:02 +08:00 |
|