 tanghucheng
|
2c6bc8ac7e
|
* Fix bug #17316.
|
2021-12-14 10:29:01 +08:00 |
|
|
tanghucheng
|
781314142c
|
* Fix bug #17316.
|
2021-12-14 10:20:34 +08:00 |
|
|
孙广明
|
900ee6ac24
|
Merge branch 'sprint/max_tanghucheng_45806' into 'kanban'
* Finish task #45806.
See merge request easycorp/zentaopms!900
|
2021-12-14 00:53:41 +00:00 |
|
|
朱金勇
|
b01b11dd7b
|
Merge branch 'sprint/30_zhouxin_45800' into 'kanban'
Finish task #45800.
See merge request easycorp/zentaopms!917
|
2021-12-13 09:01:02 +00:00 |
|
|
zhouxin
|
4f5367dae7
|
made small changes.
|
2021-12-13 08:56:39 +00:00 |
|
|
zhouxin
|
40f27795e1
|
change if...else to switch...case,change now to today.
|
2021-12-13 08:45:37 +00:00 |
|
|
孙广明
|
10d77713d1
|
Merge branch 'sprint/master_zhouxin_45795' into 'kanban'
Sprint/master zhouxin 45795
See merge request easycorp/zentaopms!863
|
2021-12-13 08:45:10 +00:00 |
|
|
孙广明
|
875451d898
|
Merge branch 'sprint/177_tianshujie_card' into kanban
|
2021-12-13 16:11:16 +08:00 |
|
|
孙广明
|
d75774cafc
|
Merge branch 'kanban' into 'sprint/177_tianshujie_card'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2021-12-13 08:11:03 +00:00 |
|
|
tianshujie
|
8add043e90
|
* Modify the code.
|
2021-12-13 16:06:15 +08:00 |
|
|
zhouxin
|
9567620ff4
|
Finish task #45800.
|
2021-12-13 07:53:23 +00:00 |
|
|
tianshujie
|
6a894bc7fb
|
* Finish task #45829.
|
2021-12-13 15:37:33 +08:00 |
|
|
李玉春
|
e622e958cf
|
Merge branch 'sgm_addcard' into 'kanban'
* Code for task #45819.
See merge request easycorp/zentaopms!914
|
2021-12-13 07:11:47 +00:00 |
|
|
孙广明
|
91b700ec42
|
* Fix code details.
|
2021-12-13 14:59:43 +08:00 |
|
|
孙广明
|
b6fa975c45
|
* Add en lang.
|
2021-12-13 14:47:46 +08:00 |
|
|
孙广明
|
557afc06ef
|
* Code for task #45819.
|
2021-12-13 14:42:56 +08:00 |
|
|
孙广明
|
a14bfc93e7
|
Merge branch 'sprint/177_tianshujie_card' into 'kanban'
* Add the ability to create cards.
See merge request easycorp/zentaopms!912
|
2021-12-13 06:07:06 +00:00 |
|
|
tianshujie
|
ce6fef1dce
|
* Add the ability to create cards.
|
2021-12-13 14:02:55 +08:00 |
|
|
孙广明
|
6404b57858
|
Merge branch 'sprint/177_tianshujie_card' into 'kanban'
* Modify Kanban description language item.
See merge request easycorp/zentaopms!910
|
2021-12-13 05:07:54 +00:00 |
|
|
朱金勇
|
54910fd3ad
|
Merge branch 'sprint/177_zhengrunyu_45817' into 'kanban'
fix bug
See merge request easycorp/zentaopms!906
|
2021-12-13 03:32:01 +00:00 |
|
|
zhengrunyu
|
76826e7c21
|
fix bug
|
2021-12-13 10:53:41 +08:00 |
|
|
朱金勇
|
c9e940be61
|
Merge branch 'sprint/177_zhengrunyu_45819' into 'kanban'
*Finish task 45822.
See merge request easycorp/zentaopms!904
|
2021-12-13 01:53:31 +00:00 |
|
|
zhengrunyu
|
3dde658da2
|
*Finish task #45822.
|
2021-12-13 09:50:32 +08:00 |
|
|
tanghucheng
|
b64b4cfc6f
|
* Code for task #45806.
|
2021-12-13 09:37:38 +08:00 |
|
|
tianshujie
|
97cda66f87
|
* Modify Kanban description language item.
|
2021-12-13 09:31:23 +08:00 |
|
|
zhengrunyu
|
9c56619418
|
*Finish task 45822.
|
2021-12-13 09:06:55 +08:00 |
|
|
孙广明
|
8b2543d065
|
Merge branch 'sprint/177_tianshujie_lang' into 'kanban'
* Modify Kanban Authority Language Item.
See merge request easycorp/zentaopms!901
|
2021-12-10 08:16:16 +00:00 |
|
|
孙广明
|
dd017eabe1
|
Merge branch 'sprint/max_tanghucheng_45802' into 'kanban'
* Finish task #45802.
See merge request easycorp/zentaopms!883
|
2021-12-10 08:14:24 +00:00 |
|
|
tianshujie
|
f77e54af6d
|
* Modify Kanban Authority Language Item.
|
2021-12-10 16:14:03 +08:00 |
|
|
tanghucheng
|
d556f52381
|
* Finish task #45806.
|
2021-12-10 16:11:06 +08:00 |
|
|
孙广明
|
866bfd39f6
|
Merge branch 'sprint/177_tianshujie_45821' into 'kanban'
* Modify the button display style.
See merge request easycorp/zentaopms!898
|
2021-12-10 07:39:54 +00:00 |
|
|
tianshujie
|
0ba9646782
|
* Modify the button display style.
|
2021-12-10 15:38:02 +08:00 |
|
|
liyuchun
|
b914bf1807
|
Merge branch 'sgm_kanbanaction' into kanban
|
2021-12-10 15:18:54 +08:00 |
|
|
李玉春
|
c8879884c0
|
Merge branch 'kanban' into 'sgm_kanbanaction'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-10 07:18:22 +00:00 |
|
|
孙广明
|
20ba15afd3
|
Merge branch 'sprint/177_tianshujie_45824' into 'kanban'
* Remove redundant drop-down menu.
See merge request easycorp/zentaopms!895
|
2021-12-10 06:50:03 +00:00 |
|
|
孙广明
|
0cde8fa96b
|
Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban'
* Modify chinese language file.
See merge request easycorp/zentaopms!896
|
2021-12-10 06:49:47 +00:00 |
|
|
孙广明
|
9e332d17fb
|
* Fix column bug.
|
2021-12-10 14:46:08 +08:00 |
|
|
liumengyi
|
bd15849fe5
|
* Modify chinese language file.
|
2021-12-10 14:45:13 +08:00 |
|
|
tianshujie
|
7dfe24dd11
|
* Remove redundant drop-down menu.
|
2021-12-10 14:44:13 +08:00 |
|
|
孙广明
|
b08bf7cac6
|
* Code for details.
|
2021-12-10 14:37:14 +08:00 |
|
|
孙广明
|
8a272c3761
|
Merge branch 'sprint/177_tianshujie_45821' into 'kanban'
* Add dynamic link.
See merge request easycorp/zentaopms!893
|
2021-12-10 06:30:18 +00:00 |
|
|
孙广明
|
2da16295d0
|
Merge branch 'sprint/177_liumengyi_45830' into kanban
|
2021-12-10 14:29:38 +08:00 |
|
|
孙广明
|
a054b88c31
|
Merge branch 'kanban' into 'sprint/177_liumengyi_45830'
# Conflicts:
# module/kanban/js/view.js
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
|
2021-12-10 06:29:20 +00:00 |
|
|
tianshujie
|
5d7a3c9215
|
* Add dynamic link.
|
2021-12-10 14:24:16 +08:00 |
|
|
liumengyi
|
6f8133482d
|
* Finish task #45830.
|
2021-12-10 14:21:13 +08:00 |
|
|
liumengyi
|
34d84b678c
|
* Finish task #45830.
|
2021-12-10 14:20:50 +08:00 |
|
|
zhouxin
|
a4fd0775ad
|
Finish task #45795.
|
2021-12-10 06:07:26 +00:00 |
|
|
孙广明
|
b9707ddb68
|
* Finish task #45827.
|
2021-12-10 14:00:22 +08:00 |
|
|
liumengyi
|
3a7ad7dad9
|
* Finish task #45830.
|
2021-12-10 13:43:23 +08:00 |
|
|
孙广明
|
1a2b990b6a
|
Merge branch 'sprint/177_tianshujie_45824' into kanban
|
2021-12-10 13:42:18 +08:00 |
|