guwd
|
197bbe33e7
|
优化依赖
|
2020-05-14 09:10:59 +08:00 |
|
铭飞
|
0abf45c4f6
|
!232 添加XSS过滤器
Merge pull request !232 from 灰色DT/5.0.1
|
2020-05-13 18:09:39 +08:00 |
sgjj
|
279f96ffa4
|
添加XSS过滤
|
2020-05-13 18:07:57 +08:00 |
|
铭飞
|
8c1c762d51
|
!231 更新sql
Merge pull request !231 from 灰色DT/5.0.1
|
2020-05-11 17:46:46 +08:00 |
|
sgjj
|
ba7860c2d4
|
更新sql
|
2020-05-11 17:44:58 +08:00 |
|
铭飞
|
f6de61ea3b
|
!230 sql注入修复
Merge pull request !230 from 灰色DT/5.0.1
|
2020-05-11 16:28:51 +08:00 |
|
sgjj
|
0ca41ed7c0
|
sql注入
|
2020-05-11 16:20:49 +08:00 |
|
sgjj
|
3212423620
|
防sql注入
|
2020-05-11 16:19:16 +08:00 |
|
sgjj
|
0834087b9b
|
Merge branch '5.0.1' of https://gitee.com/mingSoft/MCMS into 5.0.1
|
2020-05-09 17:26:22 +08:00 |
|
guwd
|
e01cc46c3d
|
依赖
|
2020-05-09 16:59:39 +08:00 |
|
铭飞
|
f4613006e1
|
!229 阿里云中央仓库
Merge pull request !229 from 测试哥/5.0.1
|
2020-05-08 23:21:11 +08:00 |
vip
|
e258f2341c
|
配置阿里maven仓库
|
2020-05-08 17:54:12 +08:00 |
|
vip
|
5bd6074328
|
配置阿里maven仓库
|
2020-05-08 17:48:08 +08:00 |
信 赵
|
f70d5f26dd
|
修复导入重复菜单的BUG
|
2020-04-28 17:57:51 +08:00 |
|
铭飞
|
72a699642a
|
!228 修复bug
Merge pull request !228 from 灰色DT/5.0.1
|
2020-04-28 16:29:04 +08:00 |
|
信 赵
|
0a2f344bba
|
Merge branch '5.0.1' of https://gitee.com/mingSoft/MCMS into 5.0.1
Conflicts:
pom.xml
src/main/webapp/static/plugins/ms/1.0.0/compatible.js
|
2020-04-28 16:23:51 +08:00 |
|
信 赵
|
ef542c34cc
|
修复bug
|
2020-04-28 15:59:56 +08:00 |
|
铭飞
|
db98d5aa6a
|
!227 文章内容图片标签修复
Merge pull request !227 from 小伍/master
|
2020-03-24 21:21:15 +08:00 |
wujj
|
ccc8cda53e
|
图片
|
2020-03-24 20:48:25 +08:00 |
|
铭飞
|
3fa9aac67a
|
!226 appId调整
Merge pull request !226 from 小伍/master
|
2020-02-15 14:05:35 +08:00 |
|
wujj
|
92a99a4442
|
appId问题
|
2020-02-13 18:15:03 +08:00 |
|
铭飞
|
ff22e631f8
|
!225 shiro启用
Merge pull request !225 from 小伍/master
|
2020-02-13 16:06:16 +08:00 |
|
wujj
|
6e5bdba347
|
百度编辑器appId问题
|
2020-02-13 16:03:43 +08:00 |
|
wujj
|
e99194d202
|
shiro权限启用
|
2020-02-13 15:31:50 +08:00 |
|
wujj
|
7133d078db
|
百度编辑器上传参数新增appId
|
2020-02-13 11:07:13 +08:00 |
|
ms group dev
|
7fcab1aac8
|
依赖更新
|
2020-02-10 11:55:24 +08:00 |
|
ms group dev
|
018f9b0951
|
依赖更新
|
2020-02-10 11:50:25 +08:00 |
|
铭飞
|
008faab1b1
|
!224 file文件表
Merge pull request !224 from 小伍/master
|
2020-02-08 11:50:02 +08:00 |
|
wujj
|
28fd1e1061
|
file文件表
|
2020-02-08 11:44:03 +08:00 |
|
ms group dev
|
713f726c4d
|
pom优化
|
2020-02-05 11:35:09 +08:00 |
|
ms group dev
|
085266e154
|
配置文件优化
|
2020-02-05 11:34:47 +08:00 |
|
ms group dev
|
7344183824
|
增加最新mstore依赖
|
2020-02-04 14:56:37 +08:00 |
|
ms group dev
|
da9f66831c
|
依赖更新
|
2020-02-04 14:52:25 +08:00 |
|
ms group dev
|
9e5438a928
|
依赖更新
|
2020-02-04 11:45:35 +08:00 |
|
铭飞
|
f016900e3b
|
!223 添加IE兼容
Merge pull request !223 from 灰色DT/master
|
2020-02-01 08:39:50 +08:00 |
|
信 赵
|
5d04542856
|
Merge branch 'master' of https://gitee.com/mingSoft/MCMS
Conflicts:
src/main/webapp/WEB-INF/manager/main.ftl
|
2020-01-31 18:16:58 +08:00 |
|
信 赵
|
23fec95b10
|
自定义sql更新
|
2020-01-31 18:06:44 +08:00 |
|
信 赵
|
70541b9a91
|
修复兼容问题 删除多余的方法体
|
2020-01-31 17:44:49 +08:00 |
|
信 赵
|
6201a48d58
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# 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
|
2020-01-31 10:03:25 +08:00 |
|
ms group dev
|
c27af1cf19
|
Merge remote-tracking branch 'origin/5.0.0'
|
2020-01-21 15:05:10 +08:00 |
|
铭飞
|
4c21f2769a
|
!222 添加注释,主页选中问题
Merge pull request !222 from 灰色DT/master
|
2020-01-21 11:12:23 +08:00 |
|
铭飞
|
db27368dab
|
!221 跳转
Merge pull request !221 from 小伍/5.0.0
|
2020-01-21 11:05:34 +08:00 |
|
huise
|
2d19a084ca
|
修复jar包无法运行问题
|
2020-01-20 18:42:37 +08:00 |
|
huise
|
17f5ad42a1
|
修复主页生成问题
|
2020-01-20 18:17:55 +08:00 |
|
huise
|
ba09b022c4
|
Merge branch '5.0.0' of https://gitee.com/shangg/MCMS
|
2020-01-20 17:32:12 +08:00 |
|
sgjj
|
9756518080
|
修复BUG
|
2020-01-16 13:41:04 +08:00 |
|
ms group dev
|
1e56e0f641
|
修改字段长度
|
2020-01-11 22:18:57 +08:00 |
|
ms group dev
|
897e577d4d
|
增加视频
|
2020-01-11 22:03:28 +08:00 |
|
ms group dev
|
77b2762423
|
说明更新
|
2020-01-11 14:47:58 +08:00 |
|
ms group dev
|
2fdd369a0e
|
说明更新
|
2020-01-11 14:47:36 +08:00 |