Commit Graph
15358 Commits
Author SHA1 Message Date
Yagami 6f5e5b2c13 * Finish task #5729. 2019-06-03 13:56:12 +08:00
Yagami 57f527b2c4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-03 13:47:53 +08:00
Yagami edd857f5c2 * Finish task #5726. 2019-06-03 13:47:18 +08:00
wangyidong c307349f43 Merge branch 'master' of github.com:easysoft/zentaopms 2019-06-03 13:10:24 +08:00
wangyidong 38fe643f7e * finish task #5632. 2019-06-03 13:10:02 +08:00
Yagami e9c4a84f9c * Finish task #5725. 2019-06-03 13:06:22 +08:00
wangyidong 67f21ea76e * finish task #5626. 2019-06-03 11:52:54 +08:00
Yagami 4084a54ef5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-03 11:25:26 +08:00
Yagami 5e9c564075 * Finish task #5724. 2019-06-03 11:25:12 +08:00
reneeteng e42d06670a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-03 11:10:56 +08:00
reneeteng 19a9ae9925 * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. * Lang file update. 2019-06-03 11:09:52 +08:00
Yagami bf2e40e67d * Finish task #5716. 2019-06-03 10:00:14 +08:00
Yagami 608cf1bab8 * Finish task #5715. 2019-06-03 09:50:31 +08:00
Yagami 9db0b6f1dd Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-06-03 08:59:17 +08:00
Yagami 20f309eb1f * Finish task #5705. 2019-06-03 08:58:56 +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
Catouse a86a212e76 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 16:13:54 +08:00
Catouse 65467ed5d9 * fix table checkbox not work. 2019-05-31 16:13:47 +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 7e4ce0bde4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 15:19:08 +08:00
reneeteng 9c47092329 * Color column lang file update. 2019-05-31 15:18:42 +08:00
Catouse 82f70b85f1 * update chosen css file. 2019-05-31 15:09:37 +08:00
Catouse 0c9df8fdfc Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 15:08:09 +08:00
Catouse ec7839d30c * update chosen files. 2019-05-31 15:08:02 +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 00a0e5cc0f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 14:35:39 +08:00
reneeteng 629b0a651f * Created date lang file change. 2019-05-31 14:35:05 +08:00
Catouse 9fe7a5ef55 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 14:27:55 +08:00
Catouse e462f7fbe9 * change default value of chosen option 'max_drop_width' by update zui js file. 2019-05-31 14:27:49 +08:00
Yagami 7953743124 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 14:20:12 +08:00
Yagami 0c17194bab * Fix pager align. 2019-05-31 14:20:00 +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
wangyidong c16de529c1 * adjust for merge xuanxuan. 2019-05-31 11:03:33 +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
Catouse e24659b6af Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-31 10:42:42 +08:00
Catouse 84bbe0da93 * update zui kindeditor files. 2019-05-31 10:42:34 +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