Commit Graph
2185 Commits
Author SHA1 Message Date
wangyidong 0655c5f22d Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-09 11:09:26 +08:00
wangyidong b884536307 * finish task #5990. 2019-07-09 11:08:21 +08:00
reneeteng 61beb0fa31 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-09 09:43:38 +08:00
reneeteng 7efd22a0ab * Lang file update. 2019-07-09 09:42:01 +08:00
wangyidong 6e1774bdc2 * finish task #5996. 2019-07-08 16:22:56 +08:00
wangyidong 4aad227e76 * finish task #5997. 2019-07-08 16:20:03 +08:00
reneeteng af1093c597 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-08 14:27:26 +08:00
reneeteng 45cfad82d6 * Lang files update. 2019-07-08 14:25:48 +08:00
wangyidong e5a0a6c859 * finish task #6013. 2019-07-08 14:21:12 +08:00
reneeteng 3122bab037 * Lang file updated. 2019-07-08 11:30:43 +08:00
reneeteng a3e86de815 * Lang file update. 2019-07-08 10:48:13 +08:00
wangyidong 19eb87e0be Merge branch 'master' of github.com:easysoft/zentaopms 2019-07-05 16:43:50 +08:00
reneeteng af8ff0b270 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-07-05 16:30:16 +08:00
reneeteng c1f342e0bb * Lang file update for proj. 2019-07-05 16:28:38 +08:00
wangyidong 268a4fa2c2 * finish task #6024. 2019-07-05 16:02:10 +08:00
wangyidong dc87304782 * finish task #6025. 2019-07-05 15:35:13 +08:00
wangyidong c3fb6b69fd * finish task #6048. 2019-07-04 17:37:24 +08:00
Yagami 0047c15f19 * Finish task #5852. 2019-06-28 10:22:34 +08:00
Yagami 1d3e3d11e7 * Finish task #5856. 2019-06-28 09:19:45 +08:00
Yagami 25380e6ff8 * Finish task #5859. 2019-06-27 15:59:17 +08:00
Yagami d75b6a435c * Finish task #5819. 2019-06-20 16:19:56 +08:00
Catouse 4d646e12bd Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-20 16:12:51 +08:00
Catouse 6dfbe25641 * improve style of exported burn image. 2019-06-20 16:12:22 +08:00
wangyidong f43dc5c082 * adjust for bug. 2019-06-17 09:46:27 +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
reneeteng 307a19cb0a * Lang file update. 2019-06-10 17:34:41 +08:00
reneeteng 31f6ccb02c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-10 16:14:32 +08:00
reneeteng ca5cf5f905 * Lang file update. 2019-06-10 16:14:13 +08:00
wangyidong 4ecd2b4373 * code for task #5717. 2019-06-10 13:21:26 +08:00
wangyidong 16d810d460 * code for task #5713. 2019-06-10 11:17:19 +08:00
wangyidong 141cd4dce3 * finish task #5801. 2019-06-10 09:09:28 +08:00
reneeteng 164cb065af * Lang file update. 2019-06-04 17:20:35 +08:00
reneeteng cc233d2517 * Lang file update. 2019-06-04 14:16:36 +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
wangyidong b561598c63 * finish task #5668. 2019-06-04 09:44:24 +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
Yagami fbcd6db31c * Finish task #5769. 2019-06-03 16:09:10 +08:00
wangyidong ecea70cf3c Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-03 15:38:52 +08:00
wangyidong 4cb966c553 * finish task #5634. 2019-06-03 15:38:26 +08:00
Yagami edd857f5c2 * Finish task #5726. 2019-06-03 13:47:18 +08:00
Yagami e9c4a84f9c * Finish task #5725. 2019-06-03 13:06:22 +08:00
Yagami 4084a54ef5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-03 11:25:26 +08:00