18460 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
hufangzhou	9111d82d0e	* Finish task#8383.	2020-11-17 14:21:21 +08:00
hufangzhou	cc65aa18ce	Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x	2020-11-17 14:19:52 +08:00
hufangzhou	0552e787f0	* Finish task#8381.	2020-11-17 14:19:44 +08:00
tianshujie98	581d8b349d	* Finish task #8409.	2020-11-17 14:15:32 +08:00
holan20180123	bb34dfe79b	* Finish task #8378.	2020-11-17 14:04:50 +08:00
hufangzhou	3def724cd5	Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x	2020-11-17 13:47:30 +08:00
hufangzhou	526d2c1e75	* Finish task#8416.	2020-11-17 13:47:16 +08:00
qiyu-xie	b100ddeb0d	* Finish task#8398.	2020-11-17 13:46:07 +08:00
qiyu-xie	9d237be691	* Finish task#8380.	2020-11-17 13:46:07 +08:00
hufangzhou	5244924ece	Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x	2020-11-17 13:38:04 +08:00
hufangzhou	983927b6b9	* Finish task#8395.	2020-11-17 13:37:25 +08:00
tianshujie98	ff1e2ac04b	* Finsh task #8411.	2020-11-17 13:33:20 +08:00
tianshujie98	d974dbf169	* Finish task #8413.	2020-11-17 13:33:20 +08:00
tianshujie98	877dc32f88	* Finish task #8393.	2020-11-17 13:33:20 +08:00
holan20180123	7e6e5c40ae	Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x	2020-11-17 13:19:24 +08:00
holan20180123	97770dd00f	* Finish task #8379.	2020-11-17 13:17:15 +08:00
hufangzhou	ff69596dcd	* Finish task#8418.	2020-11-17 13:17:14 +08:00
tianshujie98	34b41b1daf	* Finish task #8385.	2020-11-17 13:06:00 +08:00
tianshujie98	2e9d5d204f	* Modify variable name.	2020-11-17 09:00:50 +08:00
tianshujie98	9607713ad3	* Modify variable name.	2020-11-17 08:54:06 +08:00
tianshujie98	48f7bf3bf3	* Adjust code style.	2020-11-17 08:41:39 +08:00
tianshujie98	3d73b74751	* Modify language items.	2020-11-17 08:19:08 +08:00
holan20180123	fd6502b596	* Alignment format.	2020-11-16 11:31:29 +08:00
tianshujie98	03a2a479cf	* Adjust code style.	2020-11-16 11:03:29 +08:00
holan20180123	e9750cfe26	* Finish task #8194.	2020-11-16 11:00:05 +08:00
tianshujie98	c0e6591afe	* Adjust code style.	2020-11-16 10:56:02 +08:00
qiyu-xie	0c1c00c160	* View todo start-end times display in one line.	2020-11-16 10:12:38 +08:00
qiyu-xie	07030443cc	* Fix bug.	2020-11-16 09:42:59 +08:00
tianshujie98	fdc986d12f	* Edit comment.	2020-11-16 09:19:22 +08:00
holan20180123	5ca98d0eee	* Finish task #8194.	2020-11-16 09:13:06 +08:00
tianshujie98	97e2891c4a	* Fix bug.	2020-11-16 09:01:24 +08:00
z	79918a7dd0	Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x	2020-11-16 09:00:56 +08:00
z	8eb9b0afb8	* adjust code.	2020-11-16 08:58:44 +08:00
holan20180123	cef356a33b	Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x	2020-11-15 22:39:48 +08:00
holan20180123	95c2adcdb0	*Finish task #8194.	2020-11-15 22:39:26 +08:00
qiyu-xie	1f741b8d01	* Finish task#8198. Add comments.	2020-11-15 14:34:23 +08:00
qiyu-xie	f7b2e5378d	* Finish task#8193.	2020-11-14 22:54:34 +08:00
tianshujie98	9b811e95cb	* Adjust code style and add language item.	2020-11-13 16:44:43 +08:00
tianshujie98	b13a57d82b	* Adjust code style.	2020-11-13 16:44:43 +08:00
Catouse	42878a4b4f	* update zui.js.	2020-11-13 14:21:13 +08:00
tianshujie98	ec58e2b528	* Adjust code style.	2020-11-13 14:16:33 +08:00
tianshujie98	a5eecec8aa	* Adjust code style.	2020-11-13 13:20:42 +08:00
tianshujie98	7d18efad03	* Adjust code style.	2020-11-13 13:11:39 +08:00
holan20180123	fb9c44d0a1	* Finish task #8194.	2020-11-13 11:28:25 +08:00
holan20180123	ea9c93ba1c	* Finish task #8194.	2020-11-13 09:18:26 +08:00
holan20180123	673693fbcd	Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x	2020-11-13 09:08:25 +08:00
holan20180123	583790a08e	* Finish task #8194.	2020-11-13 09:08:04 +08:00
tianshujie98	8a20821f92	* Adjust code style.	2020-11-13 08:09:21 +08:00
qiyu-xie	9c0b8b1d22	* Finish task#8198. Fix bug.	2020-11-12 21:39:55 +08:00
z	3e28b36de7	Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x	2020-11-12 17:21:38 +08:00