13503 Commits

Include renames

Author	SHA1	Message	Date
Catouse	033e031ede	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-14 17:01:34 +08:00
Catouse	6282d8c6dd	* format code.	2019-10-14 17:01:18 +08:00
wangyidong	4574c12dc3	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-14 16:24:27 +08:00
wangyidong	4ce472b509	* finish task #6414.	2019-10-14 16:22:35 +08:00
Yagami	d383adbb8b	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-14 15:57:01 +08:00
Yagami	697a1122ba	* Code for task #6410.	2019-10-14 15:55:30 +08:00
wangyidong	33f5465b54	* finish task #6416.	2019-10-14 15:43:58 +08:00
Yagami	e408817726	* Finish task #6420.	2019-10-14 15:07:41 +08:00
Yagami	86c5222d36	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-14 14:40:20 +08:00
Yagami	31af090d1e	* Finish task #6410.	2019-10-14 14:39:56 +08:00
wangyidong	2be845e3ba	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-14 14:27:09 +08:00
wangyidong	caec432f48	* finish task #6419.	2019-10-14 14:26:37 +08:00
Yagami	8286a06841	* Finish task #6440.	2019-10-14 14:04:42 +08:00
Yagami	96983e4a00	* Finish task #6436.	2019-10-14 13:45:41 +08:00
Yagami	2f23d0ab13	* Finish task #6417.	2019-10-14 11:16:39 +08:00
Yagami	1fa9e738f3	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-14 10:58:12 +08:00
Yagami	b54f876279	* Finish task #6429.	2019-10-14 10:57:45 +08:00
wangyidong	5785118311	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-14 10:47:46 +08:00
wangyidong	e44a602127	* finish task #6433.	2019-10-14 10:47:20 +08:00
Yagami	888a34bcae	* Finish task #6463.	2019-10-14 10:07:24 +08:00
Yagami	188079c9c3	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-14 09:48:55 +08:00
Yagami	71262e445b	* Finish task #6462.	2019-10-14 09:48:40 +08:00
wangyidong	e5dad96cd2	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-14 09:36:34 +08:00
wangyidong	8897e5ab4e	* finish task #6434.	2019-10-14 09:36:01 +08:00
Yagami	06738da7b7	* Fix activate parent task logic.	2019-10-14 09:27:21 +08:00
Yagami	1038f2a069	* Fix delete template bug.	2019-10-14 09:04:52 +08:00
Yagami	e1d405f16b	* Fix bug.	2019-10-12 17:04:23 +08:00
wangyidong	89e99f4745	* code for task #6466.	2019-10-12 16:19:12 +08:00
wangyidong	4ba3b39498	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-12 16:02:54 +08:00
wangyidong	5f5ab186af	* finish task #6439.	2019-10-12 16:02:33 +08:00
Yagami	650ff48474	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-12 15:40:57 +08:00
Yagami	a11601eaff	* Finish task #6459.	2019-10-12 15:40:25 +08:00
wangyidong	71e90595da	* finish task #6441.	2019-10-12 15:08:29 +08:00
wangyidong	4cbd15766f	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-12 14:52:14 +08:00
wangyidong	2f62ecb51e	* finish task #6444.	2019-10-12 14:50:00 +08:00
Yagami	f4375dc9f0	* Finish task #6457.	2019-10-12 13:56:51 +08:00
Yagami	6f0586038b	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-12 11:09:55 +08:00
Yagami	908d70ef34	* Finish task #6452.	2019-10-12 11:08:39 +08:00
wangyidong	b4ac34cfe4	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-12 10:29:08 +08:00
wangyidong	da2a9751dc	* finish task #6447.	2019-10-12 10:28:02 +08:00
Yagami	26bd0e996f	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-10-12 10:25:45 +08:00
Yagami	727c6f4fce	* Finish task #6451.	2019-10-12 10:09:27 +08:00
wangyidong	b58151d72d	Merge branch 'master' of github.com:easysoft/zentaopms	2019-10-12 10:01:41 +08:00
wangyidong	fc97ecc2da	* finish task #6466.	2019-10-12 10:01:16 +08:00
Yagami	c0497a7935	* Finish task #6448.	2019-10-12 09:41:40 +08:00
Yagami	19e5590541	* Finish task #6408.	2019-10-11 16:26:46 +08:00
Yagami	98ac711d6d	* Finish task #6406.	2019-10-11 15:02:51 +08:00
Yagami	e0a667b5f8	* Finish task #6405.	2019-10-11 14:20:22 +08:00
Yagami	7116b062ea	* Finish task #6403.	2019-10-11 13:29:19 +08:00
Yagami	55139fc899	* Finish task #6396.	2019-10-11 10:10:46 +08:00