28965 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
朱金勇	2adb14ae19	Merge branch 'sprint/170_sunhao/improve_pie_chart' into 'sprint/170' ... * Fix CanvasRenderingContext2D error when init progress-pie plugin. See merge request easycorp/zentaopms!439	2021-11-14 09:46:04 +00:00
李玉春	8851c7878b	Merge branch 'sprint/170_tianshujie_merge' into 'sprint/170' ... * Merge conflict. See merge request easycorp/zentaopms!443	2021-11-12 07:37:34 +00:00
tianshujie	bc2560fd95	* Remove spaces.	2021-11-12 15:36:29 +08:00
tianshujie	a3da8bf0e0	* Merge conflict.	2021-11-12 15:33:35 +08:00
liyuchun	77b697c991	Merge branch 'sprint/170_tianshujie_16194' into sprint/170	2021-11-12 15:31:52 +08:00
李玉春	9686f7e13e	Merge branch 'sprint/170' into 'sprint/170_tianshujie_16194' ... # Conflicts: # module/project/control.php	2021-11-12 07:31:40 +00:00
孙广明	c55cc7844c	Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170' ... * Deal with the branch is empty. See merge request easycorp/zentaopms!442	2021-11-12 07:30:52 +00:00
hufangzhou	8352d145f5	* Deal with the branch is empty.	2021-11-12 15:22:47 +08:00
孙广明	9230c6a413	Merge branch 'sprint/170_liyuchun_bug' into 'sprint/170' ... * Fix error of manage product. See merge request easycorp/zentaopms!441	2021-11-12 07:22:10 +00:00
tianshujie	48d7682b0f	* Modify the code issue.	2021-11-12 15:18:26 +08:00
liyuchun	0c7bcaf928	* Fix error of manage product.	2021-11-12 15:07:42 +08:00
tianshujie	50b4590655	* Fix bug #16194.	2021-11-12 14:53:51 +08:00
李玉春	73a9a43999	Merge branch 'sprint/170_songchenxuan_16186' into 'sprint/170' ... * Fix bug #16186. See merge request easycorp/zentaopms!438	2021-11-12 06:52:14 +00:00
Hao Sun	37071ded1f	* fix CanvasRenderingContext2D error when init progress-pie plugin.	2021-11-12 14:35:59 +08:00
songchenxuan	225d83b304	* Fix bug #16186.	2021-11-12 14:29:25 +08:00
李玉春	fe15f97b82	Merge branch 'sprint/170_mayue_16221' into 'sprint/170' ... * Fix bug #16221. See merge request easycorp/zentaopms!436	2021-11-12 06:00:30 +00:00
mayue	67687a738a	* Fix bug #16221.	2021-11-12 13:58:02 +08:00
李玉春	89396523ad	Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170' ... * Fix bug #16190. See merge request easycorp/zentaopms!434	2021-11-12 05:25:50 +00:00
tianshujie	54d69e1969	* Fix bug #16190.	2021-11-12 13:19:18 +08:00
孙广明	e237e5267c	Merge branch 'sprint/170_wangyidong' into 'sprint/170' ... * fix bug for get tree menu in project view. See merge request easycorp/zentaopms!428	2021-11-12 05:17:02 +00:00
tianshujie	44bfbb7cdc	* Fix bug #16190.	2021-11-12 13:10:52 +08:00
李玉春	b71f540905	Merge branch 'sprint/170_songchenxuan_16043' into 'sprint/170' ... * Fix bug #16043. See merge request easycorp/zentaopms!427	2021-11-12 02:46:18 +00:00
王怡栋	1dd4bbc079	* fix bug for get tree menu in project view.	2021-11-12 10:35:13 +08:00
songchenxuan	2dbfab7e5a	* Fix bug #16043.	2021-11-12 10:29:30 +08:00
孙广明	98caaec0ea	Merge branch 'sprint/170_hufangzhou_bug' into 'sprint/170' ... * Modify the cookie of storyModule. See merge request easycorp/zentaopms!424	2021-11-12 02:11:00 +00:00
孙广明	bac8da4180	Merge branch 'sprint/170_hufangzhou_16219' into 'sprint/170' ... * Fix bug #16219. See merge request easycorp/zentaopms!425	2021-11-12 02:10:37 +00:00
hufangzhou	d160b6b0f5	* Fix bug #16219.	2021-11-12 10:07:28 +08:00
hufangzhou	bf08427c9a	* Modify the cookie of storyModule.	2021-11-12 09:45:43 +08:00
孙广明	e75aee2b1e	Merge branch 'sprint/170_leiyong' into 'sprint/170' ... * Do not query deleted webhook configurations. See merge request easycorp/zentaopms!418	2021-11-12 01:04:17 +00:00
李玉春	89802252fc	Merge branch 'sprint/170_tianshujie_16205' into 'sprint/170' ... * Fix bug #16205. See merge request easycorp/zentaopms!423	2021-11-12 00:57:26 +00:00
tianshujie	e349618c4c	* Fix bug #16205.	2021-11-12 08:48:52 +08:00
tianshujie	382e3103d0	* Fix bug #16205.	2021-11-12 08:46:19 +08:00
李玉春	27a4b1e560	Merge branch 'sprint_xieqiyu_fixbug' into 'sprint/170' ... * Fix bug#16197. See merge request easycorp/zentaopms!420	2021-11-12 00:12:48 +00:00
李玉春	f4317f05ec	Merge branch 'sprint/170_tianshujie_16195' into 'sprint/170' ... * Fix bug #16195. See merge request easycorp/zentaopms!419	2021-11-12 00:11:40 +00:00
tianshujie	34ad92ab78	* Modify the judgment logic.	2021-11-11 17:50:47 +08:00
xieqiyu	17bee6e900	* Fix bug#16197.	2021-11-11 17:46:10 +08:00
tianshujie	b218a43b63	* Fix bug #16195.	2021-11-11 17:38:27 +08:00
leiyong	ca5e8e6090	* Do not query deleted webhook configurations.	2021-11-11 09:27:36 +00:00
zhujinyong	1515e07c04	* Fix bugs: Compatibility for old version.	2021-11-11 17:19:55 +08:00
朱金勇	4082d78ff0	Merge branch 'sprint/170_sunhao/task44164' into 'sprint/170' ... * Task #44164, update task list after close modal. See merge request easycorp/zentaopms!404	2021-11-11 08:50:53 +00:00
孙广明	39902ea40e	Merge branch 'sprint/170_wangyidong' into 'sprint/170' ... * revert ajaxSetUnfoldID. See merge request easycorp/zentaopms!416	2021-11-11 08:41:57 +00:00
李玉春	00abaf7745	Merge branch 'sprint/170_tianshujie_16192' into 'sprint/170' ... * Fix bug #16192. See merge request easycorp/zentaopms!415	2021-11-11 08:33:28 +00:00
tianshujie	93c8bb6ba8	* Modify the judgment logic.	2021-11-11 16:32:29 +08:00
李玉春	2ff4571f77	Merge branch 'sprint/170_hufangzhou_16169' into 'sprint/170' ... * Fix bug #16169, bug#16179. See merge request easycorp/zentaopms!412	2021-11-11 08:32:14 +00:00
hufangzhou	a8f6836d46	* Remove the unused code.	2021-11-11 16:30:41 +08:00
王怡栋	1f8bb88e8c	* revert ajaxSetUnfoldID.	2021-11-11 16:19:56 +08:00
李玉春	c8b1eaef62	Merge branch 'sprint/170_mayue_16191' into 'sprint/170' ... * Fix bug #16191. See merge request easycorp/zentaopms!414	2021-11-11 08:19:38 +00:00
tianshujie	78aee66c47	* Fix bug #16192.	2021-11-11 16:18:54 +08:00
李玉春	2c296a129b	Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170' ... * Fix bug #16190. See merge request easycorp/zentaopms!411	2021-11-11 08:09:59 +00:00
mayue	f8eebdf678	* Fix bug #16191.	2021-11-11 16:08:03 +08:00