铭飞
|
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 |
|
ms group dev
|
299ca80634
|
说明更新
|
2020-01-11 14:47:14 +08:00 |
|
ms group dev
|
6996232330
|
说明更新
|
2020-01-11 14:45:22 +08:00 |
|
ms group dev
|
f11c0cb163
|
说明更新
|
2020-01-11 14:44:47 +08:00 |
|
ms group dev
|
4c2e749b42
|
说明更新
|
2020-01-11 14:42:36 +08:00 |
|
sgjj
|
1b9a7c090b
|
Merge branch 'master' of https://gitee.com/mingSoft/MCMS into 5.0.0
|
2020-01-11 14:37:28 +08:00 |
|
sgjj
|
6d728c0551
|
添加资源文件
|
2020-01-11 14:19:35 +08:00 |
|
wujj
|
5d39c8d47f
|
跳转
|
2020-01-11 10:05:14 +08:00 |
|
ms group dev
|
69c8700c3b
|
配置文件描述更新
|
2020-01-11 09:59:00 +08:00 |
|
ms group dev
|
ce85694d95
|
注释更新
|
2020-01-11 09:25:50 +08:00 |
|
ms group dev
|
a868612916
|
说明更新
|
2020-01-10 22:15:40 +08:00 |
|
ms group dev
|
6d358949df
|
5.0.0
|
2020-01-10 22:14:08 +08:00 |
|
铭飞
|
80372c87fd
|
!220 清理
Merge pull request !220 from 小伍/5.0.0
|
2020-01-10 21:33:47 +08:00 |
|
wujj
|
a1bf1c6c34
|
上传资源
|
2020-01-10 21:19:59 +08:00 |
|
铭飞
|
e2bb189ef1
|
!219 修复问题
Merge pull request !219 from 灰色DT/5.0.0
|
2020-01-10 21:16:53 +08:00 |
|
铭飞
|
4c51a7401d
|
!218 上传位置
Merge pull request !218 from 小伍/5.0.0
|
2020-01-10 21:16:45 +08:00 |
|
wujj
|
2182bd62b0
|
搜索
|
2020-01-10 18:50:54 +08:00 |
|
wujj
|
ee56c9f9cc
|
搜索
|
2020-01-10 18:24:05 +08:00 |
|
sgjj
|
f91963c665
|
修复一个可能存在的问题
|
2020-01-10 17:27:37 +08:00 |
|
铭飞
|
d678961a60
|
!216 提交配置
Merge pull request !216 from 灰色DT/5.0.0
|
2020-01-10 15:07:32 +08:00 |
|
wujj
|
0892395f90
|
版本回退
|
2020-01-10 15:03:23 +08:00 |
|
sgjj
|
405fc9c647
|
修复问题
|
2020-01-10 14:09:38 +08:00 |