Commit Graph

598 Commits

Author SHA1 Message Date
guwd 18b86274a6 结构优化 2020-09-07 18:13:27 +08:00
guwd 734b8c0c01 错误修改 2020-09-07 17:00:02 +08:00
guwd 622ff4504d store组件规范 2020-09-07 14:59:52 +08:00
guwd 3fa1b5d6d3 Merge remote-tracking branch 'origin/master' 2020-09-07 14:06:41 +08:00
sgjj 4509931488 修复安全问题 2020-09-07 11:58:45 +08:00
sgjj da964ddd77 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/application.yml
2020-09-07 11:44:41 +08:00
sgjj cd8a67bc06 ssl 2020-09-07 11:43:26 +08:00
luoxj b040cd5d1a 配置文件 2020-09-07 11:14:46 +08:00
luoxj 9f9f903592 标签bug 2020-09-04 11:26:27 +08:00
luoxj 91c6ce2587 类型 2020-09-04 10:43:43 +08:00
guwd 55633f20a7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/webapp/WEB-INF/manager/index.ftl
2020-09-03 18:47:59 +08:00
luoxj 511cad477e store.js 2020-09-03 18:07:27 +08:00
luoxj debfe0bf33 Merge remote-tracking branch 'origin/master' 2020-09-03 16:53:35 +08:00
luoxj 9be4a1ee17 表单标记 2020-09-03 16:53:12 +08:00
sgjj b56d77c4da 添加查询子项目 2020-09-03 16:40:42 +08:00
guwd 523814b249 Merge branch 'master' of /Volumes/Transcend/git/ms-mcms with conflicts. 2020-09-03 16:20:08 +08:00
sgjj 93a379190d 使用新的store 2020-09-03 15:49:10 +08:00
luoxj c2775e2b01 提示 2020-09-03 11:11:56 +08:00
luoxj 79d58c67e9 Merge remote-tracking branch 'origin/master' 2020-09-03 11:10:21 +08:00
luoxj 6346898cca 文章伪删除 2020-09-03 11:10:04 +08:00
vip 1b15a2dda4 修改拼写错误添加默认时间 2020-09-03 09:17:43 +08:00
vip 8edbedfaf0 修改文章 2020-09-03 09:16:01 +08:00
luoxj ce8319edf3 store地址修改 2020-09-02 18:05:20 +08:00
luoxj 8a28ed1b62 列表排序 2020-09-02 16:42:17 +08:00
luoxj 588d0791eb 上传 2020-09-02 10:54:45 +08:00
luoxj cd98976326 分页 2020-09-01 16:29:42 +08:00
luoxj 49e02e6940 清理 2020-08-31 11:04:18 +08:00
guwd d66a118372 修复模版上次 2020-08-31 09:05:17 +08:00
luoxj ab0628619e Merge remote-tracking branch 'origin/master' 2020-08-29 11:59:09 +08:00
luoxj 7ad3c8afb9 开源同步 2020-08-29 11:58:50 +08:00
sgjj c68b5d25c2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
2020-08-28 15:31:17 +08:00
sgjj b6568f6c40 修复没有上一篇的问题 2020-08-28 15:30:20 +08:00
luoxj ddba70fad2 表单标记 2020-08-28 13:45:49 +08:00
luoxj 6fd16fbd48 文章列表接口增加静态地址 2020-08-27 18:38:04 +08:00
luoxj eccc7c699a sql 更新 2020-08-27 11:53:43 +08:00
luoxj c4c08c1e9a css 2020-08-24 14:14:12 +08:00
panpp 65bc10e352 store客户端 2020-08-13 14:00:28 +08:00
vip 0bb7660f16 视频未显示和 2020-08-13 09:14:45 +08:00
wujj e38d1bbed1 测试store 2020-08-11 15:30:36 +08:00
sgjj 73d06da7bb Merge remote-tracking branch 'origin/master' 2020-08-08 08:37:40 +08:00
sgjj 7c14089dd1 修复注入问题 2020-08-07 18:00:22 +08:00
luoxj f0d75c5e25 滚动条 2020-08-07 15:20:51 +08:00
vip 054af2f9d1 修改数据库 2020-08-07 12:19:27 +08:00
vip 1020cb2103 修改数据库 2020-08-07 12:13:08 +08:00
vip 0009b375ac 主页和完善栏目编辑 2020-08-07 11:46:22 +08:00
vip 38fc069f41 主页和完善栏目编辑 2020-08-07 11:46:22 +08:00
guwd aa96601681 测试配置 2020-08-07 11:43:59 +08:00
guwd b35d2e6bba 栏目描述 2020-08-07 11:42:19 +08:00
vip e8995119c9 修复注册页面 2020-08-07 11:29:32 +08:00
vip a5893c605a 修复问题 2020-08-07 11:00:45 +08:00
sgjj 7153e35eae Merge remote-tracking branch 'origin/master' 2020-08-07 09:49:16 +08:00
sgjj a8e8f68187 修数据库链接 2020-08-07 09:48:30 +08:00
vip 042cdb9eaa 栏目首页增加排序 2020-08-07 09:42:23 +08:00
vip 87c920acf0 Merge branch 'master' of http://imingsoft.cn:3000/mingsoft/ms-mcms 2020-08-06 13:52:58 +08:00
sgjj 78a8b4c48c 修复栏目路径问题 2020-08-06 10:15:37 +08:00
vip fc5020ed57 静态文件 2020-08-04 16:25:22 +08:00
panpp ae1825454c Merge remote-tracking branch 'origin/master' 2020-08-03 18:57:35 +08:00
panpp 4e03ca33cb 设计器 2020-08-03 18:57:05 +08:00
wujj ca7677f4ae 配置文件 2020-07-31 09:28:09 +08:00
wujj 1b080a160c 链接地址 2020-07-31 09:15:15 +08:00
wujj 31aff72628 链接地址 2020-07-31 09:09:12 +08:00
vip 0f2cd8143a content浏览量+1 2020-07-21 12:09:55 +08:00
wujj 82f7af6909 类图 2020-07-07 15:08:29 +08:00
wujj 3b47b0c931 拼音util 2020-07-07 14:25:00 +08:00
wujj c1e9aec97e 验证码 2020-07-06 10:27:18 +08:00
wujj 4325e71164 注释 2020-07-04 17:49:54 +08:00
wujj 297c9a12a1 资源文件更新 2020-07-03 08:44:20 +08:00
wujj 3714e70d1c Merge remote-tracking branch 'origin/master' 2020-07-02 15:28:23 +08:00
wujj 86fa059999 js去除 2020-07-02 11:35:32 +08:00
panpp 3d934928b9 Merge remote-tracking branch 'origin/master' 2020-07-02 08:47:43 +08:00
panpp fc144a457d 修复了ms.util的时间格式化默认格式问题 2020-07-02 08:47:17 +08:00
luoxj a41d33740d 修改资源404 2020-07-02 08:40:48 +08:00
panpp c4bcf2b999 修改了常用功能样式 2020-07-01 14:08:53 +08:00
panpp 33df7e9f8a Merge remote-tracking branch 'origin/master' 2020-07-01 09:16:34 +08:00
panpp db3741229e 去除了ftl 的一处初始化 2020-07-01 09:16:12 +08:00
sgjj 5be80533b1 去除栏目管理的国际化 2020-07-01 08:54:11 +08:00
sgjj 09c59d7705 去除语言切换 2020-06-30 15:36:18 +08:00
sgjj 231ca1ca13 Merge remote-tracking branch 'origin/master' 2020-06-30 14:07:00 +08:00
sgjj cb77002e6c 添加国际化 2020-06-30 14:06:31 +08:00
luoxj 0e366386f0 修改资源404 2020-06-29 16:08:42 +08:00
luoxj 5b9787167f 修改ui 2020-06-29 15:55:02 +08:00
luoxj 802afa43fc 修改ui 2020-06-29 15:52:46 +08:00
luoxj d4da9e63a2 修改ui 2020-06-29 15:50:32 +08:00
luoxj b5ec9bb51b 修改ui 2020-06-29 15:39:35 +08:00
wujj 342f28aea4 资源文件 2020-06-29 14:57:35 +08:00
wujj 107cd17ec5 数据库 2020-06-29 14:49:42 +08:00
sgjj a96f78d384 sql注入问题 2020-06-28 18:03:39 +08:00
sgjj b03b44a3c6 sql注入问题 2020-06-28 17:59:51 +08:00
sgjj 7170fece88 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	doc/历史/5.0.0-to-5.0.1-mysql.sql
#	src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
2020-06-28 17:38:16 +08:00
sgjj 94b30bddbd 添加插件打包 2020-06-28 17:28:20 +08:00
wujj 1f692d7627 模板恢复 2020-06-28 16:44:28 +08:00
wujj 40a809e655 模板恢复 2020-06-28 11:43:05 +08:00
sgjj 05aa41fd9c 删除无用方法 2020-06-28 09:26:57 +08:00
sgjj 992a43df68 完成标签解析 2020-06-24 18:19:51 +08:00
sgjj 22db6187be 添加新标签 2020-06-24 11:24:40 +08:00
sgjj 2cc387c271 修改标签 2020-06-24 08:53:52 +08:00
vip 20798bf4d7 Merge remote-tracking branch 'origin/master' 2020-06-23 18:49:22 +08:00
vip dc63d6dd09 重复新增封面栏目bug 2020-06-23 18:48:55 +08:00
panpp eaa4ee4852 Merge remote-tracking branch 'origin/master' 2020-06-23 18:46:18 +08:00
panpp 1fda008a23 站点管理的bug 修复了 2020-06-23 18:45:50 +08:00