ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
956 Commits 1 Branch 0 Tags 163 MiB
Commit Graph

956 Commits

Author SHA1 Message Date
sunxin b8c7cf13d4 标签类型修改 2019-01-30 14:17:15 +08:00
sunxin c88406f320 添加自定义标签权限数据 2019-01-30 14:04:09 +08:00
ms-dev 7453abb3d1 测试配置 2019-01-30 12:03:31 +08:00
ms-dev eb5bc78b73 测试配置更新 2019-01-30 11:58:15 +08:00
ms-dev 01ab9551c4 测试更新 2019-01-30 11:54:35 +08:00
ms-dev cbbd11a751 配置文件命名规范 2019-01-30 11:49:10 +08:00
yinxr 4d731c6c6e Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-30 11:37:51 +08:00
yinxr 7846fc291a Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/index.ftl
 2019-01-30 11:37:39 +08:00
ms group dev cf4bb3beff 前端注释 2019-01-30 11:35:49 +08:00
ms group dev a09d6e8604 前端注释 2019-01-30 11:35:05 +08:00
yinxr fe65622ebf Signed-off-by: yinxr <2273460044@qq.com> 2019-01-30 11:32:03 +08:00
ms group dev a6006152e5 前端变量优化 2019-01-30 11:30:30 +08:00
ms group dev 6a397303b1 注释范例、代码缩进 2019-01-30 11:27:59 +08:00
yinxr b0d1a2284e issue：处理菜单侧边收缩不了的问题 2019-01-30 11:17:44 +08:00
yinxr 180fdb2f98 Signed-off-by: 修改注释，恢复图标 2019-01-30 11:11:39 +08:00
yinxr 2c6d2db173 Signed-off-by: 找回index.less文件，并修复logo样式问题 2019-01-30 11:00:24 +08:00
yinxr 27867d4e8b Signed-off-by: 找回logo、version.log图片 2019-01-30 10:33:48 +08:00
yinxr 4b70e2e988 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 19:36:19 +08:00
yinxr a4affb0f7d Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 18:29:53 +08:00
yinxr 92f04b41f6 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 18:27:38 +08:00
yinxr 06d94a95da Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/include/head-file.ftl
 2019-01-29 17:36:27 +08:00
yinxr 6e454be2c0 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 17:03:31 +08:00
yinxr 2533ec6fa2 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 16:57:18 +08:00
ms-dev f5aa9b5d11 配置 2019-01-29 16:50:00 +08:00
ms-dev e7f69e0f04 配置 2019-01-29 16:38:44 +08:00
ms-dev 33f8f27acf 静态资源修改 2019-01-29 16:32:32 +08:00
ms-dev 0dec546d8d 静态资源 2019-01-29 16:27:55 +08:00
ms-dev 7cf2858ec4 配置 2019-01-29 16:22:40 +08:00
ms-dev 2851cb52bc 配置 2019-01-29 16:02:27 +08:00
ms-dev 091fe12552 配置 2019-01-29 16:00:50 +08:00
ms-dev 803328dd73 配置 2019-01-29 15:55:10 +08:00
ms-dev 174458ebcd 配置更新 2019-01-29 15:52:17 +08:00
ms-dev 63bfc772b1 配置 2019-01-29 15:32:55 +08:00
ms-dev c05d78719f 配置更新 2019-01-29 15:30:55 +08:00
ms-dev 14b4eefd10 Merge branch '4.7.0' of https://gitee.com/tianbinjie/MCMS into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
 2019-01-29 14:47:19 +08:00
yinxr 42fb675a05 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 14:07:39 +08:00
yinxr 8c9a3c3759 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 09:14:01 +08:00
yinxr c6abaf88a0 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/menu.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/picture/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
#	src/main/webapp/static/ms-admin/4.7.0/css/login.css
#	src/main/webapp/static/ms-admin/4.7.0/less/app.less
#	src/main/webapp/static/ms-admin/4.7.0/less/login.less
#	src/main/webapp/static/mweixin/article.less
#	src/main/webapp/static/mweixin/css/article.css
#	src/main/webapp/static/mweixin/css/custom-menu.css
#	src/main/webapp/static/mweixin/css/keyword-list.css
#	src/main/webapp/static/mweixin/css/keyword-reply.css
#	src/main/webapp/static/mweixin/css/material-bank-form.css
#	src/main/webapp/static/mweixin/css/material-list.css
#	src/main/webapp/static/mweixin/css/menu.css
#	src/main/webapp/static/mweixin/css/message-reply.css
#	src/main/webapp/static/mweixin/css/new-pic-form.css
#	src/main/webapp/static/mweixin/css/picture-list.css
#	src/main/webapp/static/mweixin/custom-menu.less
#	src/main/webapp/static/mweixin/keyword-list.less
#	src/main/webapp/static/mweixin/keyword-reply.less
#	src/main/webapp/static/mweixin/material-bank-form.less
#	src/main/webapp/static/mweixin/material-list.less
#	src/main/webapp/static/mweixin/menu.less
#	src/main/webapp/static/mweixin/message-reply.less
#	src/main/webapp/static/mweixin/new-pic-form.less
#	src/main/webapp/static/mweixin/picture-list.less

Signed-off-by: yinxr <2273460044@qq.com>
 2019-01-29 08:52:59 +08:00
yinxr c9bf4f7e66 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 08:49:10 +08:00
a123456 352235a1cf Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 19:13:23 +08:00
Administrator fa9020e2ab 后台登录 2019-01-28 16:21:44 +08:00
yinxr a16292b8ab Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 14:01:31 +08:00
yinxr b77a2802bf Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 14:01:04 +08:00
a123456 777ef491b5 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:59:37 +08:00
a123456 2b31eea136 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 13:59:20 +08:00
yinxr 2b6ce731e0 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:20:59 +08:00
yinxr b974e76854 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 13:20:47 +08:00
a123456 1dca637151 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:08:05 +08:00
a123456 3797ae5dc7 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 13:07:27 +08:00
yinxr 314f6c50d1 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 11:11:09 +08:00