15995 Commits

Include renames

Author	SHA1	Message	Date
Yagami	a2dded7193	* Add lang.	2020-10-20 09:07:20 +08:00
leiyong	848c61cd96	* Adjustment language files.	2020-10-19 23:15:57 +08:00
leiyong	add3f60813	* Fix error warnings.	2020-10-19 17:24:52 +08:00
leiyong	df4a2acb64	* The programplan module calls the updateUserView method.	2020-10-19 16:56:15 +08:00
leiyong	259618a484	Merge branch 'master' of github.com:easysoft/zentaopms	2020-10-19 16:55:10 +08:00
holan20180123	d0f2c2992f	* Determine if id is a number.	2020-10-19 16:50:04 +08:00
Yagami	b5ffeda25c	* Fix bug.	2020-10-19 16:27:58 +08:00
leiyong	00631c63f8	* Adjusting the left menu style.	2020-10-19 16:05:11 +08:00
leiyong	2554993ae0	* Adjusting the left menu style.	2020-10-19 15:49:46 +08:00
leiyong	d5501b419c	* Adjust the program module code.	2020-10-19 15:04:22 +08:00
Yagami	2fe5ec9993	* Program/project edit page change acl.	2020-10-19 13:56:46 +08:00
leiyong	62c8bb5b03	* Adjusting the code of the personnel module.	2020-10-19 13:30:44 +08:00
tianshujie98	8484f0437c	* Finish task #12770.	2020-10-19 09:01:53 +08:00
sgm0422	dc706ed54a	* Fix compute user view method.	2020-10-16 22:43:54 +08:00
Yagami	316c8dbbfe	* Add comment and fix sql.	2020-10-16 17:30:28 +08:00
Yagami	f21ea4477f	* Finish task #8122,#8117,#8115,#8114,#8113.	2020-10-16 16:45:55 +08:00
leiyong	55e1126f0b	* Adjusting programplan and project and panel module code.	2020-10-16 14:28:52 +08:00
Yagami	0cbfddb802	* Code for update user view.	2020-10-15 17:34:30 +08:00
Yagami	72008ca246	* Change program and project acl list.	2020-10-15 09:48:18 +08:00
Yagami	7d7305bab8	* Code for #8119.	2020-10-15 09:07:32 +08:00
tianshujie98	ff7e706d4d	* Delete blank lines.	2020-10-14 13:38:44 +08:00
tianshujie98	f996382d2b	* Adjust code style.	2020-10-14 13:37:41 +08:00
tianshujie98	42469b896d	* Fix bug #3559.	2020-10-14 13:34:48 +08:00
leiyong	984e782595	* Finish task#8117.	2020-10-14 10:37:41 +08:00
Yagami	7eecf4b27f	* Finish task #8116.	2020-10-14 10:01:28 +08:00
tianshujie98	6ac38da8c2	* Fix bug #3556.	2020-10-13 17:14:23 +08:00
Yagami	c9ea9c7d2e	* Meger code.	2020-10-13 16:56:13 +08:00
leiyong	71d9073644	* Finish task#8124.	2020-10-13 16:55:24 +08:00
holan20180123	540fd9bd91	Merge branch 'master' of https://github.com/easysoft/zentaopms	2020-10-13 15:11:57 +08:00
qiyu-xie	e6e3c67811	* Fix bug#3555.	2020-10-13 14:50:32 +08:00
holan20180123	64d260bbf6	* Fix bug #3553.	2020-10-13 14:34:42 +08:00
tianshujie98	4c512289bb	* Edit comment.	2020-10-13 14:23:03 +08:00
hufangzhou	4bfe3e639b	* Adjust the interval between the buttons and the images.	2020-10-13 14:13:23 +08:00
qiyu-xie	5d854af931	* Fix bug#3545.	2020-10-13 11:21:55 +08:00
Yagami	35699d9779	* Finish task #8123.	2020-10-13 09:20:02 +08:00
tianshujie98	1db4a6fd91	* Finish task #8154.	2020-10-13 09:08:17 +08:00
Catouse	eb01165a2e	* storage template html as templateHtml property of keditor instance.	2020-10-12 20:10:01 +08:00
hufangzhou	8dbf4ff9f5	* Finish task#8156: Optimize the structure of the code.	2020-10-12 16:35:31 +08:00
holan20180123	1d59f85b0f	* Finish task #8159.	2020-10-12 16:27:53 +08:00
holan20180123	fb27b60d64	* Finish task #8185.	2020-10-12 16:25:37 +08:00
holan20180123	2f20925a47	Merge branch 'master' of https://github.com/easysoft/zentaopms	2020-10-12 15:50:22 +08:00
holan20180123	7f49f1f614	* Finish task #8085.	2020-10-12 15:49:46 +08:00
Yagami	c7301bdf7a	* Fix common en lang.	2020-10-12 14:55:15 +08:00
Yagami	f950266577	* Merge code.	2020-10-12 14:54:02 +08:00
Yagami	a8b95e3fa7	* Finish task #8110.	2020-10-12 14:52:59 +08:00
Yagami	5813c42a71	* Finish task #8107,8108,8109.	2020-10-12 14:52:59 +08:00
tianshujie98	36a1d27c32	* Edit comment.	2020-10-12 11:43:06 +08:00
hufangzhou	d80b08e4e3	* Finish task#8079.	2020-10-12 11:34:36 +08:00
hufangzhou	74fb8fffa3	* Finish task#8055: Modify the name of the param.	2020-10-12 11:28:49 +08:00
hufangzhou	8c2997f839	* Finish task#8065: Add a button for download images.	2020-10-12 11:24:38 +08:00