33506 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
孙广明	0ec3700200	Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' ... * Fix bug: activatecard and finishcard add to openmethods. See merge request easycorp/zentaopms!1689	2022-01-27 08:42:21 +00:00
孙广明	afc4c18584	Merge branch 'sprint/183_hufangzhou_PROtoBIZ' into 'master' ... * Change the PRO to BIZ. See merge request easycorp/zentaopms!1687	2022-01-27 08:41:55 +00:00
xieqiyu	8efd4a500b	* Fix bug: activatecard and finishcard add to openmethods.	2022-01-27 16:39:34 +08:00
孙广明	9b35f1080a	Merge branch 'tianshujie_19070' into 'master' ... * Fix bug #19070. See merge request easycorp/zentaopms!1688	2022-01-27 08:20:07 +00:00
tianshujie	0ef9b12a2c	* Fix bug #19070.	2022-01-27 16:13:13 +08:00
孙广明	96af22c4a2	Merge branch 'Fixbug_zhengrunyu_' into 'master' ... *add padding for finish label. See merge request easycorp/zentaopms!1686	2022-01-27 07:47:48 +00:00
hufangzhou	5e7c254161	* Change the PRO to BIZ.	2022-01-27 15:47:22 +08:00
zhengrunyu	c6e92fb035	*add padding for finish label.	2022-01-27 15:45:49 +08:00
李玉春	e2e6d45dbc	Merge branch 'devops20_zenggang' into 'master' ... 优化合并请求列表api请求数 See merge request easycorp/zentaopms!1680	2022-01-27 07:45:46 +00:00
李玉春	f0c7c87228	Merge branch 'sgm_fixbug' into 'master' ... * Fix bug. See merge request easycorp/zentaopms!1683	2022-01-27 07:44:03 +00:00
zenggang	81849859ca	* Adjust code	2022-01-27 07:43:46 +00:00
孙广明	d7f34c2187	Merge branch 'sprint/183_hufangzhou_19105' into 'master' ... * Fix bug #19105. See merge request easycorp/zentaopms!1684	2022-01-27 07:43:39 +00:00
李玉春	0b53e7efb2	Merge branch 'devops_cyy_case' into 'master' ... * Modify param and check value. See merge request easycorp/zentaopms!1672	2022-01-27 07:43:32 +00:00
hufangzhou	fe653f6438	* Fix bug #19105.	2022-01-27 15:42:53 +08:00
孙广明	827308efe2	* Fix bug.	2022-01-27 15:39:14 +08:00
孙广明	a0baeb33c5	Merge branch 'devops20_liyuchun_unitcase' into 'master' ... Add unit cases. See merge request easycorp/zentaopms!1681	2022-01-27 07:37:02 +00:00
孙广明	ab273f5720	Merge branch 'sprint/183_xieqiyu_fixbug' into 'master' ... Sprint/183 xieqiyu fixbug See merge request easycorp/zentaopms!1677	2022-01-27 07:36:25 +00:00
孙广明	c120d1c85f	Merge branch 'sprint/183_tianshujie_19065' into 'master' ... * Fix bug #19065. See merge request easycorp/zentaopms!1682	2022-01-27 07:36:01 +00:00
tianshujie	45cbb3d9d6	* Fix bug #19065.	2022-01-27 15:34:49 +08:00
liyuchun	57c6204cab	* Adjsut code style.	2022-01-27 15:32:28 +08:00
liyuchun	63121f6810	* Add unit cases.	2022-01-27 15:29:50 +08:00
zenggang	f4729ec429	* Adjust code	2022-01-27 07:23:52 +00:00
孙广明	5625fd1152	Merge branch 'Fixbug_zhengrunyu_' into 'master' ... *Fix bug for card. See merge request easycorp/zentaopms!1678	2022-01-27 07:09:30 +00:00
孙广明	0ada39cc38	Merge branch 'sprint/183_mayue_47996' into 'master' ... * Optimize code. See merge request easycorp/zentaopms!1679	2022-01-27 07:09:11 +00:00
mayue	60f1fd01d5	* Optimize code.	2022-01-27 14:59:10 +08:00
zhengrunyu	3f9410f28c	*Fix bug for card.	2022-01-27 14:58:08 +08:00
xieqiyu	cbaffa5ea9	* Fix bug#19096.	2022-01-27 14:28:06 +08:00
孙广明	bfc0888e77	Merge branch 'sprint/183_hufangzhou_18707' into 'master' ... * Fix bug #18707, #18706. See merge request easycorp/zentaopms!1676	2022-01-27 06:21:10 +00:00
孙广明	0491f40fcd	Merge branch 'sprint/183_zhouxin_fixbugs' into 'master' ... Adjust code. See merge request easycorp/zentaopms!1674	2022-01-27 06:19:34 +00:00
hufangzhou	269907c13a	* Fix bug #18707, #18706.	2022-01-27 14:17:59 +08:00
xieqiyu	475fc0cf65	* Fix bug#19089.	2022-01-27 14:16:56 +08:00
孙广明	2cb945ddea	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Fix bug #19090. See merge request easycorp/zentaopms!1675	2022-01-27 06:08:46 +00:00
liumengyi	28a481e82d	* Fix bug #19090.	2022-01-27 14:05:23 +08:00
孙广明	5ec7f42fb0	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Modify batch create card assignedto users. See merge request easycorp/zentaopms!1673	2022-01-27 05:55:48 +00:00
liumengyi	4e54d16ccf	* Modify batch create card assignedto users.	2022-01-27 13:53:44 +08:00
zhouxin	9d9b2b1c2b	Adjust code.	2022-01-27 05:31:35 +00:00
caoyanyi	aa36dc65fc	* Modify param and check value.	2022-01-27 05:28:52 +00:00
孙广明	307184ea77	Merge branch 'devops20_liyuchun' into 'master' ... * Adjsut unit cases. See merge request easycorp/zentaopms!1669	2022-01-27 05:04:51 +00:00
孙广明	d1cc0d0161	Merge branch 'sprint/183_liumengyi_fixbug' into 'master' ... * Kanban whitelist can only be selected from space whitelist. See merge request easycorp/zentaopms!1671	2022-01-27 05:01:27 +00:00
liumengyi	221909550d	* Kanban whitelist can only be selected from space whitelist.	2022-01-27 12:58:12 +08:00
李玉春	906f6eadd2	Merge branch 'devops_cyy_test' into 'master' ... * Modify test case. See merge request easycorp/zentaopms!1670	2022-01-27 03:28:06 +00:00
caoyanyi	2c8cf29161	* Modify test case.	2022-01-27 03:26:34 +00:00
李玉春	f75a7f592d	Merge branch 'devops_cyy_test' into 'master' ... * Add testcase. See merge request easycorp/zentaopms!1668	2022-01-27 03:21:33 +00:00
caoyanyi	894237885c	* Adjust code.	2022-01-27 03:20:43 +00:00
李玉春	49bf993b35	Merge branch 'sprint/183_zhouxin_19057' into 'master' ... Fix s bug. See merge request easycorp/zentaopms!1667	2022-01-27 03:20:33 +00:00
liyuchun	4b9ee0cc3c	* Adjsut unit cases.	2022-01-27 11:16:10 +08:00
caoyanyi	8e2db7b2cb	* Add testcase.	2022-01-27 03:15:48 +00:00
zhouxin	e48be0c1db	Fix s bug.	2022-01-27 03:11:36 +00:00
sgm0422	141a2c3aa8	Merge branch 'Fixbug'	2022-01-27 11:03:17 +08:00
孙广明	2993776ce2	Merge branch 'master' into 'Fixbug' ... # Conflicts: # module/kanban/js/view.js	2022-01-27 03:02:56 +00:00