Commit Graph

14466 Commits

Author SHA1 Message Date
huang 45f185bf9b Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-06-15 14:38:16 +08:00
huang c15ef27fc0 管理员能看到组织资源 2016-06-15 14:36:38 +08:00
Tim f7832b00c9 更新历史版本时描述位置调整 2016-06-15 14:02:09 +08:00
huang 5515fb660f 完成资源更新的时候 描述继承问题,并且可以修改描述 2016-06-14 14:47:02 +08:00
huang d4d4e38c41 门户模式中含有三级域名的用户图像https问题 2016-06-12 16:48:35 +08:00
huang c9021eb70f 版本库附件打包下载从配置文件获取 2016-06-12 15:01:28 +08:00
huang 1a1fde778f Merge branch 'develop' into hjq_beidou 2016-06-12 13:49:58 +08:00
huang 928d71500d 门户模式--组织栏目没有动态时显示位置 2016-06-12 13:45:22 +08:00
huang d18094cc92 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-12 13:36:53 +08:00
huang 78b445a7ae 组织历史数据迁移 模式术语修改, 配置页面域名长度问题 2016-06-12 13:36:35 +08:00
yuanke 7504b353c9 组织报500问题修复 2016-06-08 16:50:13 +08:00
cxt a1e49d9a81 Merge branch 'cxt_course' into develop 2016-06-08 15:24:00 +08:00
cxt c0d167d2e2 项目缺陷动态的回复不显示 2016-06-08 15:23:19 +08:00
huang 871a4d2d7b 组织设为首页500问题 2016-06-08 13:15:08 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
huang 90aaaa544a 最新动态按创建时间排序 2016-06-08 11:36:32 +08:00
cxt b6eb5a3668 还原作品列表的拖动 2016-06-08 11:28:20 +08:00
huang 388e862241 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-08 11:25:33 +08:00
huang 2f9dcc8a31 文章点击500问题 2016-06-08 11:23:16 +08:00
cxt fa58fbdca1 微信的menu.yml和wechat.yml不提交 2016-06-08 11:21:02 +08:00
yuanke 670c00b8a7 Merge branch 'yuanke' into develop 2016-06-08 11:12:08 +08:00
yuanke e4312674c4 KE表格修改 2016-06-08 11:11:32 +08:00
huang a138ee31ab 详情页面取消首页问题 2016-06-08 11:00:19 +08:00
huang 3d3c859473 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-08 10:54:15 +08:00
huang 6cdccc3b08 设置首页显示问题 2016-06-08 10:53:56 +08:00
yuanke 3ce5efbfe1 Merge branch 'yuanke' into develop 2016-06-08 10:45:41 +08:00
yuanke 4cb4213a52 修改blockquote样式 2016-06-08 10:44:58 +08:00
huang 7e44eb1577 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-08 10:02:24 +08:00
huang 49406681ef 详情页面留言为空的问题 2016-06-08 10:02:10 +08:00
yuanke 41efa6456a Merge branch 'yuanke' into develop 2016-06-08 09:41:41 +08:00
yuanke ec39c16c66 Merge branch 'develop' into yuanke 2016-06-08 09:41:18 +08:00
huang 67f0cad331 组织网站动态新页面 2016-06-08 09:40:05 +08:00
huang e4f48f046b 子页面没有内容显示 2016-06-08 09:16:57 +08:00
yuanke 5999189f3a 1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
2016-06-08 09:02:00 +08:00
guange b965698fdf merge 2016-06-07 17:45:19 +08:00
guange 8b05b33e38 不刷新返回 2016-06-07 17:38:38 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
huang 9c01bb63e7 配置页面管理员栏目权限控制 2016-06-07 17:36:33 +08:00
guange 1251e31061 不刷新返回 2016-06-07 17:36:11 +08:00
guange 37975552c9 base 2016-06-07 17:27:17 +08:00
guange 5b34f498c9 base 2016-06-07 17:23:56 +08:00
guange fbfb382d78 base 2016-06-07 17:22:57 +08:00
huang a8b68d64ee 导航权限控制 2016-06-07 17:19:19 +08:00
guange f993fa87ff base 2016-06-07 17:18:28 +08:00
guange 8fb88dfdea base 2016-06-07 17:17:14 +08:00
guange 5fe41d80e9 base 2016-06-07 17:06:13 +08:00
guange b01a671fb4 base 2016-06-07 16:59:26 +08:00
huang 09ff5954bd 字体过长演示问题(模式二子页面) 2016-06-07 16:56:20 +08:00
guange 81e35de2b6 base 2016-06-07 16:47:06 +08:00
guange 90ac57ed6a base 2016-06-07 16:46:10 +08:00