 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 |
|
Tim
|
ebe6004833
|
组织二级目录添加列表
|
2016-04-29 10:53:04 +08:00 |
|
huang
|
1685449381
|
二级目录框架及结构
|
2016-04-28 17:36:29 +08:00 |
|
Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
2016-04-28 11:12:44 +08:00 |
|
huang
|
4635c04798
|
关注添加次数
|
2016-04-28 10:57:45 +08:00 |
|
huang
|
b8f7a6a300
|
500问题
|
2016-04-28 10:43:42 +08:00 |
|
huang
|
7aaa13ca1a
|
左一只取一个
|
2016-04-28 10:26:41 +08:00 |
|
huang
|
ae8bb8e83b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-28 10:25:42 +08:00 |
|
huang
|
b596c0d66f
|
二级目录的创建等
|
2016-04-28 10:25:26 +08:00 |
|
huang
|
e48189ae97
|
项目获取数
|
2016-04-28 10:24:53 +08:00 |
|
Tim
|
6b02acb329
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-28 10:18:22 +08:00 |
|
Tim
|
024667d035
|
title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等
|
2016-04-28 10:17:59 +08:00 |
|
huang
|
002d0c18ba
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-27 17:03:25 +08:00 |
|
huang
|
9fbf713709
|
完成组织二级域名
|
2016-04-27 17:02:44 +08:00 |
|
Tim
|
5d7c8c0b61
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-04-27 15:18:50 +08:00 |
|
Tim
|
5d44dc5bba
|
滚动栏js效果修改
|
2016-04-27 15:16:23 +08:00 |
|
huang
|
811c3a065e
|
完成左中一模块定制
|
2016-04-27 14:09:15 +08:00 |
|
huang
|
ddf1e6f2db
|
组织模式3完成
|
2016-04-27 11:29:01 +08:00 |
|
huang
|
70fa3fddfd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-27 10:41:15 +08:00 |
|
huang
|
cded1802cc
|
右上模块定制完成
|
2016-04-27 10:41:05 +08:00 |
|
Tim
|
c9cc4739aa
|
北斗组织微信块调整
|
2016-04-27 09:57:41 +08:00 |
|
huang
|
b6f5bfc450
|
右下版本模块定制
|
2016-04-27 09:45:56 +08:00 |
|
Tim
|
c8dde5565e
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-04-27 09:38:29 +08:00 |
|
Tim
|
b8d6ca0229
|
北斗组织门户样式更改
|
2016-04-27 09:36:54 +08:00 |