Commit Graph
12598 Commits
Author SHA1 Message Date
wangyidong 38fe643f7e * finish task #5632. 2019-06-03 13:10:02 +08:00
wangyidong 67f21ea76e * finish task #5626. 2019-06-03 11:52:54 +08:00
wangyidong 6c721bb4cf Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-31 16:54:42 +08:00
wangyidong a62b8fffcb * fix bug for get product and project. 2019-05-31 16:54:18 +08:00
reneeteng 4b8b0a5f27 * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. * Add h to story summary. Lang file. 2019-05-31 16:23:56 +08:00
reneeteng 766b5a32fa Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 16:16:36 +08:00
reneeteng 6070d75858 * Lang file total update. 2019-05-31 16:15:55 +08:00
wangyidong f122d6977d * change ueditor to kindeditor. 2019-05-31 15:59:03 +08:00
wangyidong 92c223589f * adjust for task #5563. 2019-05-31 15:51:39 +08:00
reneeteng 453e282c90 * Add space to story type. 2019-05-31 15:38:26 +08:00
reneeteng 9c47092329 * Color column lang file update. 2019-05-31 15:18:42 +08:00
reneeteng 747a6a638f * No changing lines. Lang file update. 2019-05-31 15:00:02 +08:00
reneeteng bb5b2774a1 * LastRun remove space. Lang file update. 2019-05-31 14:43:01 +08:00
reneeteng 629b0a651f * Created date lang file change. 2019-05-31 14:35:05 +08:00
reneeteng bdef4303b5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 14:15:21 +08:00
reneeteng 61e480a12f * Lang file update. 2019-05-31 14:14:43 +08:00
wangyidong d117625361 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-31 11:03:53 +08:00
reneeteng 6302b957ba Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 10:57:42 +08:00
reneeteng c4e897ac15 * Lang file update. 2019-05-31 10:57:24 +08:00
Catouse 3dd89c46d0 * change kindeditor usage. 2019-05-31 10:56:43 +08:00
wangyidong 6143a0ae5b * adjust for user contact. 2019-05-31 10:31:00 +08:00
Yagami 7aa9cb1be3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 10:14:50 +08:00
Yagami cf6c4f9359 * Fix story and doc span style. 2019-05-31 10:14:18 +08:00
Catouse 76b8e28e83 * update zentao logo in login view for english version. 2019-05-31 10:11:22 +08:00
Catouse c397d5d545 * update zentao logo for english version. 2019-05-31 10:10:54 +08:00
wangyidong f98cad1eaf Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-31 09:20:06 +08:00
wangyidong 9c1416edea * finish task #5565. 2019-05-31 09:19:45 +08:00
Yagami a6dde2652b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 09:13:21 +08:00
Yagami cb78bc7afe * Finish task #5459. 2019-05-31 09:13:03 +08:00
wangyidong 01286bd284 adjust for fixFeatureBar. 2019-05-30 17:44:03 +08:00
wangyidong 0d2d17e9ad Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-30 17:42:00 +08:00
wangyidong aca82aeded * finish task #5578. 2019-05-30 17:41:44 +08:00
wangyidong 2939be79aa * adjust for profile page. 2019-05-30 17:40:48 +08:00
reneeteng 9ab09b0a2b * To lang update. 2019-05-30 16:42:44 +08:00
reneeteng 78c230adea Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 15:45:37 +08:00
reneeteng 02245a104d * Lang file update. 2019-05-30 15:45:17 +08:00
Yagami fe465ed8d6 * Finish task #5610. 2019-05-30 15:01:38 +08:00
Yagami 66e4e3baf1 * Finish task #5457. 2019-05-30 14:50:08 +08:00
Yagami 09bddc2b30 * Finish task #5457. 2019-05-30 14:22:32 +08:00
Yagami 6df4c62727 * Finish task #5457. 2019-05-30 14:10:04 +08:00
Yagami c42f48895b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 14:00:34 +08:00
Yagami 495d38d0c3 * Finish task #5533. 2019-05-30 13:59:02 +08:00
reneeteng c461480ec3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 13:53:57 +08:00
reneeteng c2eba72a2c * Privilege lang file. 2019-05-30 13:53:16 +08:00
Yagami 59b2ea802d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 13:41:49 +08:00
Yagami 5e9c7c10ea * Finish task #5533. 2019-05-30 13:41:33 +08:00
wangyidong 048556cc39 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-30 11:50:42 +08:00
wangyidong a3b6cfc687 * finish task #5446. 2019-05-30 11:50:21 +08:00
reneeteng eaba2135ad * Finish for proj 100 lang files. 2019-05-30 11:22:13 +08:00
reneeteng 52e0bea0c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-30 10:51:22 +08:00