Commit Graph
13815 Commits
Author SHA1 Message Date
滔哥 98ec5b63e7 * Finished task#7021. 2018-10-18 09:22:29 +08:00
滔哥 fc318f817f * Finished task#7022. 2018-10-18 07:01:02 +08:00
chenfeiCF 321d069c96 * Adjust code for book of doc module. 2018-10-17 17:01:10 +08:00
wangyidong fd75297793 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-17 15:16:04 +08:00
wangyidong 84f178f3aa * finish task #5031. 2018-10-17 15:14:31 +08:00
Yagami 34570184ce * Fix empty line. 2018-10-17 14:46:45 +08:00
Yagami 3296b6e6a0 * Finish task #7032. 2018-10-17 14:43:47 +08:00
Yagami 727e58fe33 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-17 14:18:10 +08:00
Yagami d9222b25f9 * Fix doc button. 2018-10-17 14:17:39 +08:00
Catouse d04664227c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-17 14:08:10 +08:00
Catouse 524fa40fc5 * add .icon-book. 2018-10-17 14:07:59 +08:00
chenfeiCF 24a5fb6f35 * Adjust for type of doc library. 2018-10-17 11:20:49 +08:00
wangyidong d0981de17d * fix bug for user priv. 2018-10-17 09:34:27 +08:00
wangyidong cb7e95e654 * code for task #5030. 2018-10-17 09:00:35 +08:00
wangyidong f236b416a2 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-16 16:42:21 +08:00
wangyidong f74a4b1e36 * finish task #5030,5029. 2018-10-16 16:41:40 +08:00
滔哥 76e1065c0a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-16 14:11:40 +08:00
滔哥 b07711fd6e * Add change sql for parent value. 2018-10-16 14:11:26 +08:00
chenfeiCF 6d90d291cf * Add type field for doc lib. 2018-10-16 13:25:21 +08:00
Yagami 32866fcaf2 * Fix sql. 2018-10-16 10:48:22 +08:00
Yagami e2e9b6cab8 * Finish task #5028. 2018-10-16 10:27:12 +08:00
Yagami a8b94bb6c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 16:58:11 +08:00
Catouse bee5804559 * improve UI of dynamic block. 2018-10-15 16:50:53 +08:00
Yagami fe66a0f7d9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 16:49:51 +08:00
Yagami 7e6dedaf87 * Finish task #5035. 2018-10-15 16:49:34 +08:00
Catouse 8e8444421e * improve UI of project/kanban. 2018-10-15 16:28:50 +08:00
Catouse aa505cceb7 * finish task #4997. 2018-10-15 16:11:49 +08:00
Catouse cb039d46e2 * improve UI of testtask/linkcase view. 2018-10-15 15:54:40 +08:00
Catouse 27df9f9e0b * fix helpContent style. 2018-10-15 15:45:32 +08:00
Catouse e3da989eb2 * improve UI of doc views, code for task #5032. 2018-10-15 15:43:13 +08:00
Catouse aa81eda77e * improve UI of doc views, code for task #5032. 2018-10-15 15:41:26 +08:00
Catouse 7717c422d7 * improve UI of doc views, code for task #5032. 2018-10-15 15:36:01 +08:00
Catouse 75b189c2c3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 15:35:31 +08:00
Catouse 819f035bd9 * improve UI of doc views, code for task #5032. 2018-10-15 15:35:25 +08:00
Yagami 44124129dc * Finish task #5034. 2018-10-15 15:24:11 +08:00
Catouse e05656dadf Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 15:06:49 +08:00
Catouse 676f67aa73 * update themes. 2018-10-15 15:06:43 +08:00
yfl fad1de14df Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 15:03:15 +08:00
Yagami 6230618909 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 14:55:32 +08:00
Yagami efaf41683c * Fix doc side height. 2018-10-15 14:55:15 +08:00
yfl f6882a40b5 * add list title attribute #5005 2018-10-15 14:53:27 +08:00
Catouse 31b39b1750 * fix module select not use chosen. 2018-10-15 14:32:30 +08:00
Catouse e5f10d8100 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 14:27:14 +08:00
Catouse 94547ee4c7 * update kindeditor, finish task #5014 and fix bug #2082. 2018-10-15 14:27:08 +08:00
Yagami d65f144060 * Doc back button add background-color. 2018-10-15 14:05:16 +08:00
Catouse de4083d6ec * set css 'overflow: auto' to .article-content. 2018-10-15 13:33:43 +08:00
Catouse fdf4f5a77e * finish task #5019 and fix bug #2039. 2018-10-15 13:16:40 +08:00
Catouse f4591138c1 * improve UI of custom/ajaxmenu view. 2018-10-15 13:15:58 +08:00
Catouse e493534ca3 * improve chosen UI. 2018-10-15 11:30:21 +08:00
Catouse 8ffb30d6d0 * set default value of search_compact for chosen by update zui files. 2018-10-15 11:26:43 +08:00