Commit Graph

13150 Commits

Author SHA1 Message Date
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
Tim 399f757811 0 2016-05-04 09:01:51 +08:00
huang 39dd62580a 完成2级目录详情页面 2016-05-03 20:08:40 +08:00
huang a9059c4c2e 帖子添加编辑删除功能 2016-05-03 19:32:38 +08:00
huang 48002eb247 二级目录讨论区添加帖子回复功能 2016-05-03 19:03:28 +08:00
huang 0e46d0ac27 二级域名中帖子回复功能 2016-05-03 17:11:08 +08:00
huang 5fb5a2e8bc 二级域名帖子列表两种形式区分 2016-05-03 16:49:13 +08:00
huang 6635ded1e8 组织base中添加二级域名 2016-05-03 14:55:08 +08:00
huang 517db8f105 组织二级域名弹框 2016-05-03 11:24:39 +08:00
huang 14335d5da3 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
2016-04-29 17:14:12 +08:00
huang 90a285b35e base中添加二级目录 2016-04-29 17:13:09 +08:00
Tim 56a4a64d09 北斗详情翻页更改;位置超出省略号 2016-04-29 17:09:15 +08:00
huang 84ae444880 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 16:53:02 +08:00
Tim 0d3c79eb12 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 16:47:32 +08:00
Tim 1f87d105d0 添加二级目录弹窗,翻页css 2016-04-29 16:47:06 +08:00
huang 253189ea7a 帖子列表中添加分页 2016-04-29 16:33:10 +08:00
huang 0bd34c2099 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
2016-04-29 16:15:10 +08:00
huang f6c3e89454 二级目录帖子详细页面 2016-04-29 16:14:08 +08:00
Tim 388c059047 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 15:38:53 +08:00
Tim 5f1b335cfb 北斗二级菜单显隐 2016-04-29 15:38:38 +08:00
huang 2b4f16e5f1 二级目录新界面的帖子列表页面 2016-04-29 14:46:40 +08:00
huang 44f0615763 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 11:34:24 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00