Commit Graph
10418 Commits
Author SHA1 Message Date
滔哥 b5b0bb53ce Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 12:06:59 +08:00
滔哥 3571212ee3 * Format code 2017-12-13 12:06:52 +08:00
wangyidong cfce20ea3b * finish task #3375. 2017-12-13 11:35:20 +08:00
wangyidong 3eba5feb13 * code for task #3476. 2017-12-13 11:33:55 +08:00
wangyidong db3b3deafb * code for task #3476. 2017-12-13 11:12:21 +08:00
wangyidong 0205849cc2 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-13 10:57:30 +08:00
wangyidong c404eff816 * finish task #3476. 2017-12-13 10:56:56 +08:00
滔哥 dc817f3e54 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 10:09:32 +08:00
tengfei 8d3a733612 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-13 09:54:23 +08:00
tengfei 7dacfb2f78 action-common 2017-12-13 09:54:06 +08:00
滔哥 a2672a6c44 * Task #3446 2017-12-12 17:42:42 +08:00
滔哥 926340dcd4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-12 17:41:58 +08:00
滔哥 d7cec4597f * Task #3456 add lang 2017-12-12 16:52:20 +08:00
滔哥 f877273082 * Format code 2017-12-12 16:51:57 +08:00
wangyidong 9a904d2501 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-12 16:51:10 +08:00
wangyidong 4049379042 * fix for auto delete. 2017-12-12 16:50:38 +08:00
滔哥 e923b6ab92 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-12 15:30:59 +08:00
滔哥 df84a91b74 * Task#3407 2017-12-12 15:30:52 +08:00
滔哥 c09dbfa88b * Task #3470 2017-12-12 14:46:01 +08:00
tengfei b8f5165d57 report translation change 2017-12-12 14:42:36 +08:00
滔哥 d51a71ec88 * Format code 2017-12-12 13:15:48 +08:00
滔哥 fc235d0381 * Task #3440 2017-12-12 10:52:11 +08:00
滔哥 9efbce145c * Task #3432 2017-12-12 10:30:34 +08:00
滔哥 c31cd78f91 * Fix style 2017-12-12 09:21:45 +08:00
滔哥 bf0e2e4bd5 * Task#3459 2017-12-11 18:44:08 +08:00
滔哥 f48be85a23 * Task #3459 2017-12-11 17:16:42 +08:00
滔哥 100c8906c6 * Fix batchedit ui 2017-12-11 17:07:53 +08:00
滔哥 daa6aedf77 * Child task order 2017-12-11 17:04:15 +08:00
滔哥 27c6eabab9 * Format code 2017-12-11 16:58:31 +08:00
滔哥 4286138053 * Format code 2017-12-11 16:42:24 +08:00
滔哥 a3968b5563 * Fix EN logo 2017-12-11 15:31:47 +08:00
滔哥 942e108139 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-11 15:06:20 +08:00
滔哥 6f6d4e3504 * Fix EN install logo 2017-12-11 15:04:44 +08:00
wangyidong be9ac6b798 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-11 14:42:19 +08:00
wangyidong 54afa9bce1 * fix bug. 2017-12-11 14:37:00 +08:00
滔哥 a411a04aad * Fix bug 2017-12-11 14:10:03 +08:00
滔哥 7e6ac2c34a * Fix bug 2017-12-11 14:03:55 +08:00
滔哥 71e60a0d5e * Task #3477 2017-12-11 11:43:47 +08:00
滔哥 56274294f3 * Fix lang 2017-12-11 09:13:28 +08:00
滔哥 2c47eb12db * add Zsite logo 2017-12-08 18:09:39 +08:00
滔哥 e79145be1f * Task #3545 2017-12-08 18:06:13 +08:00
滔哥 0f70d62399 * Task #3485 2017-12-08 16:18:43 +08:00
滔哥 8bc6e888e8 * Task #3504 2017-12-08 13:50:20 +08:00
tengfei be669c524b Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-07 17:04:46 +08:00
tengfei 81ba2b914a product info 2017-12-07 17:04:31 +08:00
滔哥 c9bc66b4f9 * Task#3494 2017-12-07 16:43:02 +08:00
滔哥 88bd2a9e91 * Task#3437 2017-12-07 16:37:45 +08:00
滔哥 5ee2c261f6 * Task#3436 2017-12-07 16:16:35 +08:00
滔哥 95c957e4bd * Task#3483 2017-12-07 15:27:37 +08:00
滔哥 9953d5437a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-07 14:38:50 +08:00