17198 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
wangyidong	fe0ecf13ec	* finish task #6932.	2020-03-03 09:00:25 +08:00
wangyidong	cec55d0345	* finish task #6929.	2020-03-03 08:55:01 +08:00
wangyidong	68896b27b9	* finish task #6924.	2020-03-03 08:27:39 +08:00
wangyidong	bbb8510d25	* finish task #6923.	2020-03-02 17:01:46 +08:00
wangyidong	9d2d1a0b9d	* finish task #6922.	2020-03-02 16:59:11 +08:00
wangyidong	7c77155ced	* finish task #6921.	2020-03-02 16:53:12 +08:00
wangyidong	05a34ff5f1	* finish task #6920.	2020-03-02 15:50:53 +08:00
wangyidong	b1f757728d	* finish task #6933.	2020-03-02 14:19:08 +08:00
wangyidong	653c4d5cf6	* finish task #6954.	2020-03-02 10:04:38 +08:00
wangyidong	154efa0b59	* finish task #6957.	2020-03-02 09:05:30 +08:00
wangyidong	579b17dec1	* finish task #6960.	2020-03-02 09:03:17 +08:00
wangyidong	420a60ea8b	* finish task #6935.	2020-02-28 16:25:59 +08:00
wangyidong	b8043c2fc3	* finish task #6931.	2020-02-28 16:16:54 +08:00
wangyidong	d0b2b96283	* finish task #6919.	2020-02-28 16:15:01 +08:00
wangyidong	fb8d617515	* finish task #6918.	2020-02-28 16:07:37 +08:00
wangyidong	aa70c177cc	* finish task #6915,6917.	2020-02-28 15:26:39 +08:00
wangyidong	0ab2f01fd7	* finish task #6925.	2020-02-28 15:14:54 +08:00
wangyidong	172a9724e2	* code for task #6912,6913,6914,6916.	2020-02-28 15:05:56 +08:00
Yagami	f41ce9cdaa	* Fix bug #2980.	2020-02-27 15:25:14 +08:00
leiyong	143d47c4ad	fix bug #2965.	2020-02-27 07:59:23 +08:00
wangyidong	ae877bbd30	* change update sql for ci.	2020-02-26 18:55:32 +08:00
wangyidong	371d543456	Merge branch 'zentaopms_12.0.1'	2020-02-26 18:28:07 +08:00
wangyidong	e2c02c246b	Merge branch 'master' into zentaopms_12.0.1	2020-02-26 18:27:08 +08:00
wangyidong	b1058886fe	Merge branch 'zentaopms_12.0.1' of github.com:easysoft/zentaopms into zentaopms_12.0.1	2020-02-26 18:09:13 +08:00
wangyidong	aa3dd14ee5	* finish task #6898.	2020-02-26 18:01:56 +08:00
wangyidong	b018d1e785	* add notes for scm.	2020-02-26 17:24:59 +08:00
leiyong	3a55002f45	completing task #6911.	2020-02-26 17:02:10 +08:00
wangyidong	39b127849a	* finish task #6909.	2020-02-26 15:52:57 +08:00
wangyidong	f9867d5da6	* adjust for merge.	2020-02-26 15:05:24 +08:00
leiyong	35b9adf61f	Working with scrollbars.	2020-02-26 15:00:55 +08:00
leiyong	758accbf09	Working with scrollbars.	2020-02-26 13:44:17 +08:00
wangyidong	990ef6699a	* code for task #6858.	2020-02-26 13:42:26 +08:00
wangyidong	c00a40a60a	* adjust for task #6893.	2020-02-26 10:45:55 +08:00
leiyong	c8721e8313	Complete tasks #6904,#6899.	2020-02-26 10:04:26 +08:00
wangyidong	152faf2620	Merge branch 'master' of github.com:easysoft/zentaopms	2020-02-26 08:50:57 +08:00
wangyidong	2cdf9b3c78	* finish task #6858,6895.	2020-02-26 08:49:23 +08:00
Catouse	b1c55c5b6b	* fix file-input size.	2020-02-25 17:47:03 +08:00
wangyidong	e94de08b07	* code for task #6863.	2020-02-25 08:40:28 +08:00
wangyidong	d9f45acdb5	* code for task #6893.	2020-02-24 17:32:11 +08:00
leiyong	998c17937d	Add the method of removing space.	2020-02-24 17:30:06 +08:00
wangyidong	17107567a5	* code for task #6893.	2020-02-24 17:24:29 +08:00
wangyidong	73c47578bf	Merge branch 'master' of github.com:easysoft/zentaopms	2020-02-24 17:11:12 +08:00
wangyidong	c4dc4b6545	* finish task #6893.	2020-02-24 17:10:35 +08:00
leiyong	07a96f311b	Fix enterprise wechat message notification.	2020-02-24 16:32:40 +08:00
leiyong	1d02b02fff	Fix enterprise wechat message notification	2020-02-24 16:16:14 +08:00
Yagami	6e046a1671	Merge branch 'master' of https://github.com/easysoft/zentaopms	2020-02-24 14:12:45 +08:00
leiyong	8ba462ff46	Adjust enterprise wechat work message notice	2020-02-24 14:11:33 +08:00
Yagami	7b2949916b	* Fix for sql injection attack.	2020-02-24 14:09:11 +08:00
leiyong	1edfbb8bc4	Adjust enterprise wechat work message notice	2020-02-24 14:03:08 +08:00
leiyong	325dbe1a5a	Modify enterprise wechat work message notice	2020-02-24 10:48:46 +08:00