30857 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tianshujie	bca286c0aa	* Fix bug #17208.	2021-12-08 08:44:41 +08:00
孙广明	834684ca51	Merge branch 'sprint/174_tianshujie_17173' into 'master' ... * Fix bug #17173,17173. See merge request easycorp/zentaopms!812	2021-12-07 09:24:13 +00:00
tianshujie	4fdb7107dc	* Fix bug #17173,17173.	2021-12-07 17:22:14 +08:00
孙广明	29fef7581b	Merge branch 'sprint/master_tanghucheng_17225' into 'master' ... * Fix bug #17225. See merge request easycorp/zentaopms!810	2021-12-07 09:20:26 +00:00
孙广明	ece705aafa	Merge branch 'sprint/xieqiyu_fixbug_17193' into 'master' ... * Fix bug#17193. See merge request easycorp/zentaopms!811	2021-12-07 09:20:10 +00:00
xieqiyu	b41aa8a4ef	* Fix bug#17193.	2021-12-07 17:18:40 +08:00
tanghucheng	6f6dc4741a	* Fix bug #17225.	2021-12-07 17:13:23 +08:00
王怡栋	0d6f17536c	Merge branch 'revert-ff06288d' into 'master' ... Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'" See merge request easycorp/zentaopms!808	2021-12-07 08:52:26 +00:00
李玉春	3f2793e5bd	Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'" ... This reverts merge request !803	2021-12-07 08:50:57 +00:00
王怡栋	ff06288dc8	Merge branch 'sprint/devops16_liyuchun_45491' into 'master' ... * Finish task #45491. See merge request easycorp/zentaopms!803	2021-12-07 08:21:33 +00:00
liyuchun	b11dd3af4e	* Finish task #45491.	2021-12-07 16:15:21 +08:00
李玉春	ee97446441	Merge branch 'sprint/174_hufangzhou_xuanxuan' into 'master' ... * Fix bug #17185. See merge request easycorp/zentaopms!802	2021-12-07 07:33:22 +00:00
李玉春	8fe0d5ddd4	Merge branch 'sprint/174_xieqiyu_17113' into 'master' ... * Fix bug#17113. See merge request easycorp/zentaopms!800	2021-12-07 07:27:49 +00:00
李玉春	69a74c1e4b	Merge branch 'sprint/xieqiyu_fixbug_17188' into 'master' ... * Fix bug#17188. See merge request easycorp/zentaopms!799	2021-12-07 07:26:22 +00:00
hufangzhou	9359d427f5	* Fix bug #17185.	2021-12-07 15:25:31 +08:00
xieqiyu	f22631ac2a	* Fix bug#17113.	2021-12-07 14:56:10 +08:00
xieqiyu	bccefb7751	* Fix bug#17188.	2021-12-07 14:22:56 +08:00
朱金勇	847071497d	Merge branch 'sprint/174_hufangzhou_sql' into 'master' ... * Modify the editedBy field in zt_apistruct table and add the standard sql. See merge request easycorp/zentaopms!798	2021-12-07 05:24:43 +00:00
hufangzhou	b8197551ef	* Modify the apistruct table field.	2021-12-07 13:23:39 +08:00
hufangzhou	68b7073f9e	* Modify the editedBy field in zt_apistruct table and add the standard sql.	2021-12-07 11:15:47 +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