wujj
|
0cdb315aca
|
5.0sql
|
2020-01-09 16:53:46 +08:00 |
走散在时光里
|
42c9e189c8
|
修复文章管理编辑页面无法保存空值
|
2020-01-09 15:37:42 +08:00 |
|
走散在时光里
|
b170311e29
|
1、后台首页动态获取铭飞官网的消息、展示和点击跳转
2、修复栏目管理编辑页面的栏目关键字、栏目描述、自定义链接无法保存空值
|
2020-01-09 15:10:56 +08:00 |
|
走散在时光里
|
b392260a2c
|
1、栏目管理的添加与修改中添加内容模板和列表模板选项必填
2、删除对栏目管理中栏目属性的长度验证
3、resources.properties内容与resources_zh_CN.properties内容同步
|
2020-01-09 11:44:52 +08:00 |
铭飞
|
2dff4d4b02
|
!206 修复文章类型无法保存空值。 修复无法进入文章编辑页面问题
Merge pull request !206 from 熊志伟123123/5.0.0
|
2020-01-09 08:43:22 +08:00 |
|
走散在时光里
|
dde8f9b255
|
栏目管理字典的绑定，清除。
|
2020-01-08 14:18:02 +08:00 |
|
走散在时光里
|
0902f02ae3
|
单个调转链接错误
|
2020-01-08 09:44:21 +08:00 |
|
走散在时光里
|
600de16f27
|
数据库提交
|
2020-01-07 18:39:58 +08:00 |
|
走散在时光里
|
52a22ab6cb
|
后台管理页主页的完善
|
2020-01-07 17:48:57 +08:00 |
|
走散在时光里
|
d5bb791c50
|
后台管理页主页的完善
|
2020-01-07 17:28:39 +08:00 |
|
铭飞
|
18aab037f7
|
!207 升级5.0
Merge pull request !207 from 灰色DT/5.0.0
|
2020-01-07 14:46:35 +08:00 |
|
ms group dev
|
12f296f600
|
依赖更新
|
2020-01-07 14:43:38 +08:00 |
sgjj
|
d35f5c6501
|
升级5.0
|
2020-01-07 14:12:11 +08:00 |
|
走散在时光里
|
69c22679c3
|
修复文章类型无法保存空值。
修复无法进入文章编辑页面问题。
|
2020-01-07 10:47:17 +08:00 |
|
铭飞
|
ca13da45e7
|
!205 修复问题
Merge pull request !205 from 灰色DT/5.0.0
|
2020-01-04 15:14:19 +08:00 |
|
sgjj
|
ff9987b91f
|
Merge branch '5.0.0' of https://gitee.com/mingSoft/MCMS into 5.0.0
Conflicts:
src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
src/main/resources/application.yml
|
2020-01-04 15:11:16 +08:00 |
|
sgjj
|
3daa94b1ee
|
添加mysql
|
2020-01-04 15:04:13 +08:00 |
|
sgjj
|
530598f0c6
|
文章分类为空无法渲染的问题
|
2020-01-04 11:05:16 +08:00 |
|
sgjj
|
30ef12ada0
|
添加日志 文档开关
|
2020-01-03 18:21:00 +08:00 |
|
sgjj
|
834cb473f5
|
自定义搜索
|
2020-01-03 16:49:51 +08:00 |
|
sgjj
|
1969450550
|
配置更新
|
2020-01-03 11:57:37 +08:00 |
|
sgjj
|
44f8dede77
|
配置更新
|
2020-01-03 11:42:40 +08:00 |
|
sgjj
|
080fa96020
|
修复远程搜索
|
2019-12-31 14:17:15 +08:00 |
|
铭飞
|
18c092cd08
|
!204 登陆/下载文件
Merge pull request !204 from 田彬杰/5.0.0
|
2019-12-31 13:51:22 +08:00 |
tianbj
|
889a25c0fe
|
清理文件
|
2019-12-31 13:41:02 +08:00 |
|
tianbj
|
2e6c20e40e
|
首页
|
2019-12-31 13:38:34 +08:00 |
|
铭飞
|
175c8d55cd
|
!203 问号标签提示
Merge pull request !203 from 小伍/5.0.0
|
2019-12-30 23:28:05 +08:00 |
|
wujj
|
f8a59a5e43
|
问号提示
|
2019-12-30 23:26:11 +08:00 |
|
wujj
|
3842cc5f55
|
数据库资源
|
2019-12-30 22:51:28 +08:00 |
|
铭飞
|
95e0ee0173
|
!202 清理
Merge pull request !202 from 小伍/5.0.0
|
2019-12-30 22:22:47 +08:00 |
|
wujj
|
653c403181
|
圆角
|
2019-12-30 22:04:24 +08:00 |
|
wujj
|
bf18409b64
|
清理
|
2019-12-30 21:55:47 +08:00 |
|
铭飞
|
2218292423
|
!201 资源文件
Merge pull request !201 from 小伍/5.0.0
|
2019-12-30 20:25:13 +08:00 |
|
wujj
|
70d83994c6
|
静态资源
|
2019-12-30 18:49:24 +08:00 |
|
铭飞
|
554eefdbd2
|
!200 pom文件更新
Merge pull request !200 from 小伍/5.0.0
|
2019-12-30 18:09:32 +08:00 |
|
wujj
|
7ac1d387ae
|
模板
|
2019-12-30 17:17:05 +08:00 |
|
铭飞
|
dda8a9ae23
|
!198 5.0样式
Merge pull request !198 from 田彬杰/5.0.0
|
2019-12-30 13:35:36 +08:00 |
|
tianbj
|
c8d047dc88
|
样式
|
2019-12-30 12:03:51 +08:00 |
|
tianbj
|
09ff039068
|
Merge remote-tracking branch 'origin/5.0.0' into 5.0.0
# Conflicts:
# README.md
# doc/历史/4.6.5-to-4.7.0-mysql.sql
# doc/历史/4.6.5-to-4.7.0-sqlserver.sql
# doc/历史/db-mcms-mysql-4.7.0.sql
# doc/历史/db-mcms-sqlserver-4.7.0.sql
# pom.xml
# src/main/java/net/mingsoft/cms/action/ArticleAction.java
# src/main/java/net/mingsoft/cms/action/ColumnAction.java
# src/main/java/net/mingsoft/cms/action/GeneraterAction.java
# src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
# src/main/java/net/mingsoft/cms/biz/IArticleBiz.java
# src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java
# src/main/java/net/mingsoft/cms/dao/IArticleDao.java
# src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
# src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
# src/main/java/net/mingsoft/config/WebConfig.java
# src/main/resources/application.yml
# src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl
# src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl
# src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl
# src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl
# src/main/webapp/html/1/index.html
# src/main/webapp/html/1/m/index.html
# src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
# src/main/webapp/static/plugins/tree-select/tree.js
# src/main/webapp/static/plugins/vue-ueditor-wrap/vue-ueditor-wrap.min.js
# src/main/webapp/templets/1/default/about.htm
# src/main/webapp/templets/1/default/advice.htm
# src/main/webapp/templets/1/default/case-list.htm
# src/main/webapp/templets/1/default/index.htm
# src/main/webapp/templets/1/default/m/about.htm
# src/main/webapp/templets/1/default/m/advice.htm
# src/main/webapp/templets/1/default/m/case-list.htm
# src/main/webapp/templets/1/default/m/contact.htm
# src/main/webapp/templets/1/default/m/news-list.htm
# src/main/webapp/templets/1/default/m/news-show.htm
# src/main/webapp/templets/1/default/news-show.htm
# src/main/webapp/templets/1/default/search.htm
|
2019-12-30 11:41:18 +08:00 |
|
ms group dev
|
96693c070d
|
说明更新
|
2019-12-29 21:30:54 +08:00 |
|
ms group dev
|
644a653141
|
修改连接
|
2019-12-29 21:25:16 +08:00 |
zhongyh
|
35b35f4f9f
|
Merge remote-tracking branch 'origin/master'
|
2019-12-28 18:21:09 +08:00 |
|
zhongyh
|
72f7732a4f
|
显示优化
|
2019-12-28 18:20:42 +08:00 |
|
tianbj
|
abba992346
|
sql
|
2019-12-28 17:54:32 +08:00 |
|
tianbj
|
c5638d64b1
|
Merge remote-tracking branch 'origin/master'
|
2019-12-28 15:15:32 +08:00 |
|
tianbj
|
a48c743d6b
|
栏目
|
2019-12-28 15:15:16 +08:00 |
|
zhongyh
|
4e007b48d2
|
修复bug
|
2019-12-28 15:08:45 +08:00 |
|
tianbj
|
fdd1c49b62
|
栏目生成
|
2019-12-28 11:18:31 +08:00 |
|
tianbj
|
9c9556ea47
|
配置
|
2019-12-28 10:18:34 +08:00 |
|
tianbj
|
9e23111324
|
生成栏目
|
2019-12-28 10:02:01 +08:00 |