tianbj
|
2e6c20e40e
|
首页
|
2019-12-31 13:38:34 +08:00 |
wujj
|
f8a59a5e43
|
问号提示
|
2019-12-30 23:26:11 +08:00 |
|
wujj
|
653c403181
|
圆角
|
2019-12-30 22:04:24 +08:00 |
|
wujj
|
bf18409b64
|
清理
|
2019-12-30 21:55:47 +08:00 |
|
wujj
|
70d83994c6
|
静态资源
|
2019-12-30 18:49:24 +08:00 |
|
wujj
|
7ac1d387ae
|
模板
|
2019-12-30 17:17:05 +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
|
644a653141
|
修改连接
|
2019-12-29 21:25:16 +08:00 |
zhongyh
|
72f7732a4f
|
显示优化
|
2019-12-28 18:20:42 +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 |
|
tianbj
|
b7b3904f09
|
文章
|
2019-12-28 09:05:30 +08:00 |
|
tianbj
|
f6e3f6cc1a
|
提示
|
2019-12-27 17:17:32 +08:00 |
|
tianbj
|
39d5e8abff
|
链接
|
2019-12-27 17:15:03 +08:00 |
|
tianbj
|
4c05f02b9f
|
静态化
|
2019-12-27 16:51:26 +08:00 |
|
tianbj
|
e6d1840763
|
文章
|
2019-12-27 16:10:30 +08:00 |
|
tianbj
|
ffe26f9348
|
删除旧文章
|
2019-12-27 15:59:14 +08:00 |
|
tianbj
|
1d7e5413d6
|
bug
|
2019-12-27 15:56:21 +08:00 |
|
zhongyh
|
2468068391
|
Merge remote-tracking branch 'origin/master'
|
2019-12-27 11:53:56 +08:00 |
|
zhongyh
|
53f587bcb6
|
提交资源文件
|
2019-12-27 11:53:01 +08:00 |
|
tianbj
|
bfdae66b6b
|
Merge remote-tracking branch 'origin/master'
|
2019-12-27 11:32:24 +08:00 |
|
tianbj
|
a8e7118cd0
|
链接
|
2019-12-27 11:32:04 +08:00 |
|
zhongyh
|
f40087b84c
|
添加插件
|
2019-12-27 10:52:09 +08:00 |
|
zhongyh
|
ffa51c87c8
|
修改beanName
|
2019-12-27 08:57:30 +08:00 |
|
tianbj
|
8a249af400
|
静态化
|
2019-12-26 15:50:43 +08:00 |
sgjj
|
eeff1573b1
|
Merge remote-tracking branch 'origin/master'
|
2019-12-26 14:53:30 +08:00 |
|
sgjj
|
8e544e9df9
|
添加自定义模型
|
2019-12-26 14:52:56 +08:00 |
|
zhongyh
|
ef6aa587e8
|
添加浏览记录文件
|
2019-12-23 11:28:58 +08:00 |
|
zhongyh
|
e9aeeeca17
|
更新文章点击数aop
|
2019-12-23 10:59:51 +08:00 |
|
sgjj
|
7f1612442e
|
修复bug
|
2019-12-21 10:20:26 +08:00 |
|
tianbj
|
9818f7b0a8
|
栏目
|
2019-12-18 08:41:01 +08:00 |
|
tianbj
|
6cfcb6fd0a
|
优化
|
2019-12-17 19:19:30 +08:00 |
|
tianbj
|
879f9c553b
|
Merge remote-tracking branch 'origin/master'
|
2019-12-17 18:17:03 +08:00 |
|
tianbj
|
56de943904
|
文章分类
|
2019-12-17 18:16:35 +08:00 |
|
zhongyh
|
b21bd89ad0
|
Merge remote-tracking branch 'origin/master'
|
2019-12-17 17:56:35 +08:00 |
|
zhongyh
|
ad9220882d
|
删除提示
|
2019-12-17 17:56:13 +08:00 |
|
tianbj
|
3932bb6bbd
|
文章分类
|
2019-12-17 16:54:57 +08:00 |
|
tianbj
|
7f159a07d8
|
文章
|
2019-12-17 10:06:42 +08:00 |
|
tianbj
|
9a4a9e8278
|
静态化
|
2019-12-16 10:02:03 +08:00 |
|
tianbj
|
92bace7d67
|
主页面
|
2019-12-16 09:38:08 +08:00 |
|
tianbj
|
ffc3e38596
|
5.0.0
|
2019-12-16 08:57:30 +08:00 |
|
tianbj
|
aca1933f55
|
栏目
|
2019-12-13 16:01:58 +08:00 |
wwb
|
08c4593ca4
|
Merge remote-tracking branch 'origin/master'
|
2019-12-13 14:46:54 +08:00 |
|
wwb
|
d72bd49c84
|
bug
|
2019-12-13 14:46:15 +08:00 |
|
sgjj
|
e4f6f46715
|
Merge remote-tracking branch 'origin/master'
|
2019-12-13 12:12:31 +08:00 |
|
sgjj
|
8bb777f9ec
|
修改链接地址
|
2019-12-13 12:11:19 +08:00 |
|
tianbj
|
26deb58943
|
链接地址
|
2019-12-12 18:17:59 +08:00 |
|
tianbj
|
c31868dd2a
|
后台
|
2019-12-11 16:58:51 +08:00 |
|
zhongyh
|
6780c53bbf
|
增加编号
|
2019-12-06 18:29:20 +08:00 |
|
zhongyh
|
3894715a7a
|
修复bug
|
2019-12-05 15:11:51 +08:00 |
|
ms group dev
|
240bc2a9ff
|
搜索变量
|
2019-12-04 18:15:09 +08:00 |
|
sgjj
|
ac217e7c8a
|
标签升级
|
2019-12-03 19:29:17 +08:00 |
|
sgjj
|
b03361cda5
|
恢复标签
|
2019-12-02 18:36:51 +08:00 |
|
sgjj
|
765bfd55e5
|
添加自定义模型
|
2019-12-02 14:24:25 +08:00 |
|
sgjj
|
f1a1ee7e87
|
添加自定义模型
|
2019-11-30 18:04:18 +08:00 |
|
zhongyh
|
ad7d54027e
|
删除老文件
|
2019-11-30 17:00:27 +08:00 |
|
zhongyh
|
c8daf08a82
|
对接口
|
2019-11-30 16:59:46 +08:00 |
|
tianbj
|
f71e551ee9
|
模板
|
2019-11-30 16:34:42 +08:00 |
|
tianbj
|
3624771362
|
静态化
|
2019-11-30 13:59:12 +08:00 |
|
tianbj
|
a1450f4715
|
样式
|
2019-11-30 09:36:05 +08:00 |
|
tianbj
|
698e7255ce
|
样式
|
2019-11-30 09:22:54 +08:00 |
|
tianbj
|
a96859d733
|
滚动条
|
2019-11-29 17:15:35 +08:00 |
|
tianbj
|
7b15cae20f
|
静态文件
|
2019-11-29 16:02:05 +08:00 |
|
tianbj
|
d668c3825a
|
跳转
|
2019-11-29 15:47:51 +08:00 |
|
tianbj
|
5a73e33cca
|
bug
|
2019-11-29 15:13:04 +08:00 |
|
tianbj
|
d15c5508a6
|
样式
|
2019-11-29 13:47:10 +08:00 |
|
tianbj
|
e127692651
|
优化
|
2019-11-29 12:06:01 +08:00 |
|
tianbj
|
b3ffa311ed
|
分类
|
2019-11-29 09:57:55 +08:00 |
|
tianbj
|
2a4ab99b06
|
图标
|
2019-11-28 19:27:25 +08:00 |
|
tianbj
|
5b1f41fcbe
|
分类文章结构
|
2019-11-28 19:06:54 +08:00 |
|
tianbj
|
d46aff177d
|
4.7.2
|
2019-11-28 15:12:40 +08:00 |
|
wwb
|
8abc9ea374
|
后台样式修改
|
2019-11-08 18:06:37 +08:00 |
|
wwb
|
c58a38d1e5
|
后台搜索样式修改
|
2019-11-07 17:49:15 +08:00 |
|
ms group dev
|
1058ef2112
|
Merge remote-tracking branch 'origin/4.7.2'
Conflicts:
pom.xml
src/main/java/net/mingsoft/config/WebConfig.java
|
2019-10-30 23:28:09 +08:00 |
|
sgjj
|
1b202b5270
|
图标更新
|
2019-10-30 11:34:03 +08:00 |
|
sgjj
|
ce3386ed92
|
Merge remote-tracking branch 'origin/4.7.2' into 4.7.2
|
2019-10-29 08:49:04 +08:00 |
|
sgjj
|
b502ca9503
|
样式更新
|
2019-10-29 08:48:36 +08:00 |
|
tianbj
|
a305de4ece
|
样式
|
2019-10-28 18:21:58 +08:00 |
|
tianbj
|
dd900e1f1e
|
菜单图标
|
2019-10-28 18:12:30 +08:00 |
|
tianbj
|
fe55c0edff
|
菜单升级
|
2019-10-28 16:41:34 +08:00 |
|
tianbj
|
29ce50d775
|
样式
|
2019-10-28 16:34:51 +08:00 |
|
sgjj
|
c51ba2aa69
|
更新资源文件
|
2019-10-28 10:18:48 +08:00 |
|
sgjj
|
2de48d5046
|
更新资源文件
|
2019-10-26 17:06:58 +08:00 |
|
sgjj
|
241a1809e4
|
修复无法访问swagger的问题
|
2019-10-25 13:47:18 +08:00 |
|
sgjj
|
983de28d50
|
添加组件
|
2019-10-24 15:18:59 +08:00 |
|
sgjj
|
f891a44ccd
|
添加资源文件
|
2019-10-12 18:35:22 +08:00 |
|
sgjj
|
0a8e5f575a
|
更新模板
|
2019-10-12 17:38:36 +08:00 |
|
sgjj
|
11717c3b6e
|
添加资源文件
|
2019-10-12 15:51:59 +08:00 |
|
铭飞
|
c33fe93a08
|
!188 修复默认主页问题
Merge pull request !188 from 灰色DT/4.7.2
|
2019-10-11 11:39:30 +08:00 |
|
sgjj
|
7161b213a5
|
xss
|
2019-10-10 10:42:13 +08:00 |
|
sgjj
|
aa2d8ac17c
|
xss
|
2019-10-10 10:31:37 +08:00 |
|
sgjj
|
2d4d257bfe
|
修复主页store不显示问题
|
2019-10-09 11:07:31 +08:00 |
|
sgjj
|
3ddfb59464
|
修复默认不跳主页的问题
|
2019-09-30 14:33:09 +08:00 |
|
铭飞
|
9b3d486e7f
|
!187 修复linux下相对目录的问题
Merge pull request !187 from 灰色DT/4.7.2
|
2019-09-30 10:09:57 +08:00 |
|
sgjj
|
e705e84417
|
相对目录
|
2019-09-30 10:02:02 +08:00 |