30842 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zhouxin	df8859a3b0	Finish task #45807.	2021-12-07 08:44:22 +00:00
孙广明	0e1679c791	Merge branch 'sprint/177_tianshujie_45815' into 'kanban' ... * Add Kanban first level navigation. See merge request easycorp/zentaopms!801	2021-12-07 08:13:25 +00:00
tianshujie	7176ef2b55	* Remove useless code.	2021-12-07 16:12:45 +08:00
tianshujie	9f2364c021	* Modify zone to space.	2021-12-07 16:07:50 +08:00
tianshujie	b69d36f0d1	* Add Kanban first level navigation.	2021-12-07 14:59:30 +08:00
zhujinyong	e5873a07e0	+ Add demo lib for api.	2021-12-07 11:06:56 +08:00
王怡栋	8cca6a3e33	Merge branch 'sprint/174_hufangzhou_package' into 'master' ... * Add the traditional Chinese language item. See merge request easycorp/zentaopms!796	2021-12-07 01:25:08 +00:00
hufangzhou	d876550d96	* Add the traditional Chinese language item.	2021-12-07 09:22:58 +08:00
李玉春	192cbfd23a	Merge branch 'sprint/175_sgm_fixbug' into 'master' ... * Fix project name check unique logic. See merge request easycorp/zentaopms!793 zentaopms_16.0.beta1_20211207	2021-12-07 00:56:27 +00:00
tanghucheng	1ee592147a	* Fix programplan lang.	2021-12-07 08:41:51 +08:00
孙广明	dfc9fd84db	Merge branch 'sprint/master_tanghucheng_project'	2021-12-07 08:39:25 +08:00
孙广明	379baac86d	Merge branch 'master' into 'sprint/master_tanghucheng_project' ... # Conflicts: # module/programplan/lang/en.php	2021-12-07 00:38:58 +00:00
孙广明	5c84ad89b7	Merge branch 'sprint/174_hufangzhou_package' into 'master' ... * Fallback version of the xuanxuan folder. See merge request easycorp/zentaopms!795	2021-12-07 00:33:48 +00:00
孙广明	dea01a13cf	Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' ... * Update kanban lib and compatible with duplicate columns definition. See merge request easycorp/zentaopms!794	2021-12-07 00:33:27 +00:00
hufangzhou	88eac3a1da	* Fallback version of the xuanxuan folder.	2021-12-06 20:09:06 +08:00
Hao Sun	ccff5c2366	* Update kanban lib and compatible with duplicate columns definition.	2021-12-06 17:19:29 +08:00
tanghucheng	ac12590b03	* Fix bug #17130,17129,17128.	2021-12-06 15:28:53 +08:00
孙广明	0f72dcc6ea	* Fix project name check unique logic.	2021-12-06 15:22:57 +08:00
李玉春	3d1d34e383	Merge branch 'sprint/174_tianshujie_17115' into 'master' ... * Fix bug #17115. See merge request easycorp/zentaopms!785	2021-12-06 07:18:57 +00:00
李玉春	9db701d207	Merge branch 'sptint/174_xieqiyu_17079' into 'master' ... * Fix bug#17113. See merge request easycorp/zentaopms!788	2021-12-06 07:18:39 +00:00
李玉春	fd5cca16b3	Merge branch 'sgm_fixbug' into 'master' ... * Fix code error. See merge request easycorp/zentaopms!790	2021-12-06 07:15:25 +00:00
王怡栋	7091037194	Merge branch 'sprint/175_sgm_upgrade' into 'master' ... Sprint/175 sgm upgrade See merge request easycorp/zentaopms!786	2021-12-06 07:14:51 +00:00
李玉春	a339b6e024	Merge branch 'sprint/175_sgm_fixbug' into 'master' ... * Fix bug. See merge request easycorp/zentaopms!792	2021-12-06 07:14:23 +00:00
tanghucheng	fb84d28b4a	* Fix bug #17128.	2021-12-06 15:04:49 +08:00
孙广明	bd28d11c75	* Fix bug.	2021-12-06 15:04:33 +08:00
tanghucheng	cb23e8ff2b	* adjust for date format for programplan.	2021-12-06 14:49:53 +08:00
tanghucheng	f2a989e851	* adjust for date format for programplan.	2021-12-06 14:21:23 +08:00
孙广明	22ac002432	* Fix code error.	2021-12-06 13:59:36 +08:00
孙广明	f3bd7149f9	Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' ... * Improve kanban UI, bug #17063. See merge request easycorp/zentaopms!787	2021-12-06 05:11:11 +00:00
孙广明	e24ded1429	Merge branch 'sprint/174_hufangzhou_17116' into 'master' ... * Fix bug #17116, bug #17117. See merge request easycorp/zentaopms!789	2021-12-06 05:07:38 +00:00
hufangzhou	05d9182e31	* Fix bug #17116, bug #17117.	2021-12-06 12:09:15 +08:00
王怡栋	2dc3e19e7d	Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms	2021-12-06 11:56:16 +08:00
王怡栋	641929d5fc	* adjust for status name for api.	2021-12-06 11:55:50 +08:00
xieqiyu	0dc84860e9	* Fix bug#17113.	2021-12-06 11:55:46 +08:00
Hao Sun	9b7a85cdd7	* Fix kanban columns width not fit the layout sometimes in flex mode.	2021-12-06 11:44:12 +08:00
tianshujie	bb635e3c48	* Modify the code format of caselib js file.	2021-12-06 11:36:33 +08:00
Hao Sun	18c0ef3210	* Custom dnd rules for project kanban.	2021-12-06 11:30:11 +08:00
tianshujie	78af43d78c	* Fix bug #17115.	2021-12-06 11:26:27 +08:00
孙广明	8debfb8ad8	* Remove version.	2021-12-06 11:25:34 +08:00
李玉春	4a2d21595e	Merge branch 'sptint/174_xieqiyu_17079' into 'master' ... * Fix bug#17079. See merge request easycorp/zentaopms!778	2021-12-06 03:22:48 +00:00
Hao Sun	50ad00b1c4	* Fix dnd not work in project kanban.	2021-12-06 11:19:05 +08:00
Hao Sun	8d08be2f57	* Fix cards count incorrect on some kanbans.	2021-12-06 11:18:49 +08:00
孙广明	b8432110bf	Merge branch 'sprint/174_songchenxuan_17111' into 'master' ... *Fix bug #17111. See merge request easycorp/zentaopms!784	2021-12-06 03:18:06 +00:00
孙广明	7ebdc11ad1	Merge branch 'sprint/174_songchenxuan_17109' into 'master' ... Sprint/174 songchenxuan 17109 See merge request easycorp/zentaopms!780	2021-12-06 03:16:28 +00:00
songchenxuan	bb6dba1a78	*Fix bug #17111.	2021-12-06 11:12:21 +08:00
孙广明	69304124b5	* Change for upgrade.	2021-12-06 10:58:52 +08:00
李玉春	7cd00e0d84	Merge branch 'revert-aacf4ec4' into 'master' ... Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'" See merge request easycorp/zentaopms!783	2021-12-06 02:41:55 +00:00
孙广明	679d8aeb5e	Merge branch 'sprint/174_sunhao/improve_kanban' into 'master' ... * Bug #17056, fix duplicated modal in execution kanban page. See merge request easycorp/zentaopms!782	2021-12-06 02:39:26 +00:00
孙广明	11d9ad6044	Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'" ... This reverts merge request !781	2021-12-06 02:37:20 +00:00
孙广明	ad1cc7c04f	Merge branch 'sprint/174_hufangzhou_17077' into 'master' ... * Fix bug #17077. See merge request easycorp/zentaopms!774	2021-12-06 02:33:35 +00:00