Commit Graph
783 Commits
Author SHA1 Message Date
jinianlan 13ae00955c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 16:33:31 +08:00
jinianlan 23d5f2bd3e * finish task #6021,#6009,#6007,#6006 2019-07-08 15:05:26 +08:00
reneeteng 45cfad82d6 * Lang files update. 2019-07-08 14:25:48 +08:00
reneeteng a3e86de815 * Lang file update. 2019-07-08 10:48:13 +08:00
wangyidong d9b43a8c5e * finish task #6033. 2019-07-05 11:09:08 +08:00
wangyidong 9910fa461c * finish task #6034. 2019-07-05 10:52:30 +08:00
Yagami e481cba1e7 * Fix css file. 2019-07-01 15:35:19 +08:00
wangyidong dcac58b007 * revert dynamicAction lang. 2019-06-13 14:11:56 +08:00
wangyidong f937f4cb65 * adjust for page style. 2019-06-12 13:14:38 +08:00
reneeteng d4b7a9ac4c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-11 11:16:22 +08:00
reneeteng 520d121bdf * Lang file optimized. 2019-06-11 09:53:11 +08:00
wangyidong 3b54364860 * code for task #5673. 2019-06-11 08:20:49 +08:00
wangyidong 0e7bd0522e * finish task #5641. 2019-06-06 16:03:26 +08:00
wangyidong e1e7b3f2d0 Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-05 17:33:39 +08:00
wangyidong 835b85ba89 * finish task #5641. 2019-06-05 17:32:40 +08:00
reneeteng de2725da3b * Lang file update. 2019-06-05 17:22:34 +08:00
wangyidong 1fbf720cae * adjust for task #5783 2019-06-05 16:16:21 +08:00
wangyidong 72e7dcd80b * finish task #5702. 2019-06-05 13:38:14 +08:00
wangyidong 5248ba0efb * finish task #5703. 2019-06-05 13:04:32 +08:00
wangyidong a8063e8b19 * adjust for side width. 2019-06-05 11:51:58 +08:00
wangyidong d490cfbaef Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-04 14:21:22 +08:00
wangyidong e9dc74bfda * code for task #5626. 2019-06-04 14:20:33 +08:00
reneeteng cc233d2517 * Lang file update. 2019-06-04 14:16:36 +08:00
reneeteng 23eb8f03cb * Lang file update. 2019-06-04 09:35:12 +08:00
reneeteng 74d4fbd87a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-03 16:15:23 +08:00
reneeteng fa047a15c4 * Lang file update. 2019-06-03 16:14:42 +08:00
wangyidong 67f21ea76e * finish task #5626. 2019-06-03 11:52:54 +08:00
wangyidong f122d6977d * change ueditor to kindeditor. 2019-05-31 15:59:03 +08:00
reneeteng 747a6a638f * No changing lines. Lang file update. 2019-05-31 15:00:02 +08:00
Yagami cf6c4f9359 * Fix story and doc span style. 2019-05-31 10:14:18 +08:00
Yagami cb78bc7afe * Finish task #5459. 2019-05-31 09:13:03 +08:00
wangyidong a3b6cfc687 * finish task #5446. 2019-05-30 11:50:21 +08:00
reneeteng eaa6cc00d4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-29 17:08:34 +08:00
reneeteng 16a92b51cb * Lang file update. 2019-05-29 17:07:58 +08:00
Yagami 05b941d2fd * Fix doc style. 2019-05-29 16:58:09 +08:00
Yagami e50a8af4f5 * Add edit doc view style. 2019-05-29 16:55:31 +08:00
Yagami 74c85776b9 * Finish task #5520. 2019-05-29 15:50:43 +08:00
Yagami aa6ead3389 * Finish task #5516. 2019-05-29 15:19:17 +08:00
Yagami 1253acb39e * Finish task #5502. 2019-05-29 13:38:29 +08:00
reneeteng d0b6386ca7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-29 11:23:19 +08:00
reneeteng bd025b6bf3 * Lang file update. 2019-05-29 11:22:29 +08:00
Yagami e60e1e3d92 * Finish task #5541. 2019-05-29 10:03:47 +08:00
reneeteng 774df4494f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-28 17:09:53 +08:00
reneeteng 9aee87117c * Lang file. 2019-05-28 17:09:27 +08:00
Yagami 02290075dd * Finish task #5479. 2019-05-28 16:33:59 +08:00
Yagami 1f9ed3ae90 * Finish task #5476. 2019-05-28 16:25:08 +08:00
Yagami cdaec1a613 * Finish task #5475. 2019-05-28 16:21:50 +08:00
Yagami 289eae8521 * Finish task #5460. 2019-05-28 15:40:33 +08:00
reneeteng 819778ee27 * Calendar lang file update. 2019-05-23 09:37:22 +08:00
reneeteng 594501f676 * Lang update. 2019-05-21 10:37:04 +08:00