 liumengyi
|
987edcc3cf
|
* Finish task #53663.
|
2022-05-10 16:29:56 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
xieqiyu
|
be11d0b786
|
* Fix bug#20381.
|
2022-03-17 09:55:37 +08:00 |
|
|
zhujinyong
|
819fad539e
|
* Finish story#31282, story#31284.
|
2022-03-10 16:21:27 +08:00 |
|
|
孙广明
|
4c218d7a69
|
Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888
See merge request easycorp/zentaopms!2155
|
2022-03-09 06:41:53 +00:00 |
|
|
xieqiyu
|
139ea1e04a
|
* Modify review code.
|
2022-03-09 11:17:36 +08:00 |
|
|
zhouxudong
|
027fbc1472
|
* Fix bug #19120.
|
2022-03-08 17:12:52 +08:00 |
|
|
zhangzilong
|
12f4dd389c
|
* Code for task #49888.
|
2022-03-08 13:12:44 +08:00 |
|
|
Zongjun Lan
|
7add528024
|
* fix bug 19496
|
2022-03-07 15:37:27 +08:00 |
|
|
zhouxin
|
a9995c6fe0
|
Finish task #49692.
|
2022-02-22 09:00:47 +00:00 |
|
|
songchenxuan
|
91f3e14e68
|
*Delete lang.
|
2022-02-14 16:44:23 +08:00 |
|
|
孙广明
|
2993776ce2
|
Merge branch 'master' into 'Fixbug'
# Conflicts:
# module/kanban/js/view.js
|
2022-01-27 03:02:56 +00:00 |
|
|
zhengrunyu
|
5b1a0f4b87
|
*change finished card and add status default
|
2022-01-27 10:35:33 +08:00 |
|
|
孙广明
|
12859c9e8d
|
* Fix en lang for set column width.
|
2022-01-26 13:11:47 +08:00 |
|
|
孙广明
|
24a5707ce3
|
Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
* Adjust classic mode.
See merge request easycorp/zentaopms!1629
|
2022-01-26 01:51:47 +00:00 |
|
|
xieqiyu
|
11a69d6206
|
* Adjust classic mode.
|
2022-01-26 09:47:01 +08:00 |
|
|
hufangzhou
|
cf313182f4
|
* Change the import object language items.
|
2022-01-25 18:25:05 +08:00 |
|
|
孙广明
|
560730db3e
|
Merge branch 'sprint/183_hufangzhou_importObject' into 'master'
* Change the import object to plural.
See merge request easycorp/zentaopms!1619
|
2022-01-25 09:47:07 +00:00 |
|
|
hufangzhou
|
0d44addd30
|
* Change the import object to plural.
|
2022-01-25 17:17:16 +08:00 |
|
|
孙广明
|
e797653a34
|
* Finish task #47983.
|
2022-01-25 16:35:42 +08:00 |
|
|
孙广明
|
b2d1125ff9
|
* Fix delete kanban column bug.
|
2022-01-25 08:47:57 +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
|
f86c3f5b8c
|
* Modify the code.
|
2022-01-24 14:28:24 +08:00 |
|
|
hufangzhou
|
7cd0246265
|
* Code for task #47991.
|
2022-01-24 13:52:49 +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 |
|
|
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 |
|
|
李玉春
|
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
|
9fd9fcceb1
|
*Fix bug
|
2022-01-24 09:38:26 +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 |
|
|
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
|
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 |
|
|
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 |
|
|
孙广明
|
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 |
|
|
mayue
|
6ba1e7212d
|
* Optimize code.
|
2022-01-21 13:50:56 +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 |
|
|
xieqiyu
|
fdaf47943e
|
* Code for task#47995.
|
2022-01-21 13:17:56 +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 |
|