Commit Graph
15442 Commits
Author SHA1 Message Date
reneeteng ea44cee1f7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-05 17:23:25 +08:00
reneeteng de2725da3b * Lang file update. 2019-06-05 17:22:34 +08:00
wangyidong a3de0b750a * finish task #5639. 2019-06-05 17:01:00 +08:00
wangyidong 1026dda461 * adjust main-actions for en lang. 2019-06-05 16:52:42 +08:00
wangyidong bbb65f79af * finish task #5723. 2019-06-05 16:52:16 +08:00
wangyidong c01b68c0a6 * finish task #5706. 2019-06-05 16:24:25 +08:00
wangyidong 1fbf720cae * adjust for task #5783 2019-06-05 16:16:21 +08:00
reneeteng 4feb3090e3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-05 16:06:23 +08:00
reneeteng e3a96d34d8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-05 16:05:13 +08:00
wangyidong a93b17a0d0 * finish task #5657. 2019-06-05 15:48:49 +08:00
reneeteng c27f1e3758 * Lang file update. 2019-06-05 15:19:49 +08:00
wangyidong 10e0c46c71 * finish task #5784. 2019-06-05 15:11:31 +08:00
wangyidong 5e0e6a7b58 * code for task #5766. 2019-06-05 14:16:40 +08:00
wangyidong 6540832d10 * finish task #5766. 2019-06-05 14:14:22 +08:00
wangyidong abe2f20201 * finish task #5741. 2019-06-05 14:01:42 +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 5b75894610 * finish task #5690. 2019-06-05 11:25:42 +08:00
wangyidong 228333562a * finish task #5689. 2019-06-05 11:15:36 +08:00
wangyidong 8faa10f22b * finish task #5684. 2019-06-05 11:00:11 +08:00
wangyidong 36f249a02b * adjust for task #5781. 2019-06-05 10:36:27 +08:00
wangyidong 7fcd65e9a7 * code for task #5780. 2019-06-05 10:30:03 +08:00
wangyidong 483d481e39 * finish task #5749. 2019-06-05 09:58:55 +08:00
wangyidong 8468aca152 * finish task #5730. 2019-06-05 09:43:28 +08:00
wangyidong a35a371969 Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-05 09:43:15 +08:00
wangyidong 48949c3bfa * finish task #5685. 2019-06-05 09:42:42 +08:00
reneeteng 164cb065af * Lang file update. 2019-06-04 17:20:35 +08:00
wangyidong 46502d5fba * code for task #5681. 2019-06-04 14:31:16 +08:00
wangyidong 61e29f8a28 * code for task #5664. 2019-06-04 14:24:36 +08:00
wangyidong 053652cc92 * 2019-06-04 14:23:56 +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 608a56b71e Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-04 14:16:56 +08:00
reneeteng cc233d2517 * Lang file update. 2019-06-04 14:16:36 +08:00
wangyidong db5c3c6998 Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-04 13:46:42 +08:00
wangyidong 570ba2faaa * code for task #5656. 2019-06-04 13:46:15 +08:00
reneeteng 3217808ff5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-04 11:26:40 +08:00
reneeteng ecb028a4c3 * Lang file update. 2019-06-04 11:26:20 +08:00
Yagami 3a6ae1c09f * Fix tree task style. 2019-06-04 11:22:07 +08:00
Yagami de2771f15a * Finish task #5769. 2019-06-04 11:13:13 +08:00
Yagami 0c94747959 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-04 10:41:20 +08:00
Yagami b1ea561cd5 * Fix bug create table style. 2019-06-04 10:40:56 +08:00
wangyidong fe9c2c277b Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-04 09:44:48 +08:00
wangyidong b561598c63 * finish task #5668. 2019-06-04 09:44:24 +08:00
reneeteng 32e5c9bea5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-04 09:35:37 +08:00
reneeteng 23eb8f03cb * Lang file update. 2019-06-04 09:35:12 +08:00
Yagami fb50db20f5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-04 08:52:02 +08:00
Yagami 963da6ba24 * Finish task #5752. 2019-06-04 08:51:42 +08:00
wangyidong e8fb0c8fdf * finish task #5656. 2019-06-04 08:31:42 +08:00