Commit Graph

13172 Commits

Author SHA1 Message Date
huang 3565e0bf6f base左侧链接 2016-05-05 16:59:06 +08:00
huang 62da2928a8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 16:43:36 +08:00
huang 02d6186045 二级域名讨论帖子添加删除链接 2016-05-05 16:43:20 +08:00
Tim c8da24b6bc Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 16:21:01 +08:00
Tim d0f97275cc 组织二级栏目显隐效果 2016-05-05 16:20:49 +08:00
huang e0c011948c 二级域名的隐藏和显示 2016-05-05 15:16:14 +08:00
huang 79cd36f297 二级域名排序 2016-05-05 14:39:27 +08:00
huang 6d28d0becd 二级域名的删除功能 2016-05-05 12:27:35 +08:00
huang 2920f21c95 二级域名编辑功能自动刷新 2016-05-05 11:28:28 +08:00
huang 5f696fe123 添加二级域名局部刷新 2016-05-05 11:06:11 +08:00
huang 36e6d44ac1 二级目录新建的时候暂时隐藏资源 2016-05-05 11:01:02 +08:00
Tim 71b70cf937 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 10:36:30 +08:00
Tim 9536f87c26 标题多行控制 2016-05-05 10:36:18 +08:00
huang 72e19b8b67 完成左中板块内容空白的配置 2016-05-05 10:36:17 +08:00
huang 159728c3ba 模式二为空的时候显示情况 2016-05-05 10:20:31 +08:00
huang a0ea2c7e5d 模式二3在配置整合 2016-05-05 10:05:53 +08:00
huang 18dff4f8a3 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-05 09:45:53 +08:00
huang aaf97ac81c 新版块3和板块2合并,板块3取前四个 2016-05-05 09:45:34 +08:00
Tim c3514f5b6a 二级栏目名长度控制 2016-05-05 09:28:49 +08:00
Tim 787dbaaffc 二维码处文字样式处理 2016-05-05 09:08:01 +08:00
huang 06e90c83e4 二级目录不进行排列定制和域名申请 2016-05-04 20:12:09 +08:00
huang ccea42cc8b 项目和课程的动态只参与五种配置 2016-05-04 19:47:44 +08:00
huang f94a45c398 完成模块8没内容显示 2016-05-04 19:40:48 +08:00
huang d75f39cd81 模式7空白内容显示 2016-05-04 19:36:30 +08:00
huang d86fec6f03 模式6没有内容的显示 2016-05-04 19:30:01 +08:00
huang 33bf4fafa6 模式4没有内容的显示情况 2016-05-04 19:12:53 +08:00
huang 04b2aee166 板块一没有图片的显示情况 2016-05-04 18:50:25 +08:00
huang 2996daef71 二级域名局部刷新 2016-05-04 17:06:32 +08:00
Tim 6098e47ffe Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 16:54:14 +08:00
Tim abbbe9b7d6 二级子目录样式处理 2016-05-04 16:53:59 +08:00
huang c32479270c Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 15:51:07 +08:00
huang 8dfe95dfd1 配置页面新建二级域名样式 2016-05-04 15:50:53 +08:00
Tim c7ea675e7d Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 15:44:17 +08:00
Tim 51ff1b0aa6 滚动栏效果调整 2016-05-04 15:43:46 +08:00
huang a691fb7eb7 添加或者取消提交时候弹框自动消失 2016-05-04 15:19:26 +08:00
huang 65a907bc99 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
2016-05-04 15:06:20 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Linda cbec7cc8f8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
2016-05-04 14:41:54 +08:00
Linda 0fc142d822 组织配置logo样式 2016-05-04 14:40:25 +08:00
Tim 80ff421853 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 14:09:20 +08:00
Tim 714deebe21 二级导航调整 2016-05-04 14:08:57 +08:00
huang efb91abfb0 分页不跳转问题 2016-05-04 14:03:18 +08:00
huang c0acaab404 首页logo上传图片 2016-05-04 13:55:27 +08:00
huang f8ba77dc20 banner点击添加图片 2016-05-04 11:32:11 +08:00
huang daa154db02 鼠标经过字母录显示结构 2016-05-04 11:16:25 +08:00
huang 578982faba subdomain 404跳转 2016-05-04 11:08:16 +08:00
huang 7fbf6f4011 模式二帖子列表添加分页 2016-05-04 11:04:41 +08:00
huang fd543828ac Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/controllers/sub_document_comments_controller.rb
	app/views/sub_document_comments/_show_newstyle.html.erb
	app/views/sub_document_comments/show.html.erb
2016-05-04 09:46:26 +08:00
huang 557e731343 模式二添加回复功能,模式一回复超过三行则隐藏 2016-05-04 09:45:02 +08:00
Tim 765d52a2ce 详情页面格式调整 2016-05-04 09:40:20 +08:00