 huang
|
c3a016607b
|
解决冲突
|
9 years ago |
|
huang
|
aefcb78926
|
新base
|
9 years ago |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
17a9de8ec4
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
885b6f6092
|
隐藏掉“综合”选项，分页每页显示20个
|
9 years ago |
 Tim
|
e2907565bd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
4bf1883ba2
|
组织门户导航栏二级显隐
|
9 years ago |
|
huang
|
0b43fb5502
|
隐藏可见及箭头的局部刷新
|
9 years ago |
|
huang
|
6057ea15e1
|
一级目录新界面鼠标经过显示子目录
|
9 years ago |
|
huang
|
231f8f3526
|
二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框
|
9 years ago |
|
huang
|
cd6124895d
|
鼠标经过一级目录的时候显示二级目录
|
9 years ago |
|
huang
|
51f3e27a99
|
模式二详情目录调整
|
9 years ago |
|
huang
|
e9c3d5cceb
|
模式二 二级目录调整
|
9 years ago |
|
huang
|
c400b44230
|
一级目录列表引起的问题
|
9 years ago |
|
huang
|
d0db711449
|
编辑功能
|
9 years ago |
|
huang
|
1d2e6327a8
|
二级域名隐藏可见局部刷新
|
9 years ago |
|
huang
|
e9f88c5593
|
链接问题
|
9 years ago |
|
Tim
|
24c5cdfdda
|
二级栏目效果改
|
9 years ago |
|
huang
|
3565e0bf6f
|
base左侧链接
|
9 years ago |
|
huang
|
62da2928a8
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
02d6186045
|
二级域名讨论帖子添加删除链接
|
9 years ago |
|
Tim
|
c8da24b6bc
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
d0f97275cc
|
组织二级栏目显隐效果
|
9 years ago |
|
huang
|
e0c011948c
|
二级域名的隐藏和显示
|
9 years ago |
guange
|
72f5f5b795
|
加入组织
|
9 years ago |
|
huang
|
79cd36f297
|
二级域名排序
|
9 years ago |
|
guange
|
17282083a6
|
merge
|
9 years ago |
|
guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
9 years ago |
|
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
9 years ago |
|
huang
|
6d28d0becd
|
二级域名的删除功能
|
9 years ago |
|
huang
|
2920f21c95
|
二级域名编辑功能自动刷新
|
9 years ago |
|
huang
|
5f696fe123
|
添加二级域名局部刷新
|
9 years ago |
|
huang
|
36e6d44ac1
|
二级目录新建的时候暂时隐藏资源
|
9 years ago |
 cxt
|
5f50ad046c
|
留言报500
|
9 years ago |
|
Tim
|
71b70cf937
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
9536f87c26
|
标题多行控制
|
9 years ago |
|
huang
|
72e19b8b67
|
完成左中板块内容空白的配置
|
9 years ago |
|
huang
|
159728c3ba
|
模式二为空的时候显示情况
|
9 years ago |
|
huang
|
a0ea2c7e5d
|
模式二3在配置整合
|
9 years ago |
|
huang
|
18dff4f8a3
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
aaf97ac81c
|
新版块3和板块2合并，板块3取前四个
|
9 years ago |
|
cxt
|
d845b14992
|
讨论区的模板消息
|
9 years ago |
|
Tim
|
c3514f5b6a
|
二级栏目名长度控制
|
9 years ago |
|
cxt
|
bd22364f0a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
2efe80c520
|
commit
|
9 years ago |
|
cxt
|
5e8c749715
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
121aca7505
|
缺陷模板消息
|
9 years ago |
|
Tim
|
787dbaaffc
|
二维码处文字样式处理
|
9 years ago |
|
huang
|
06e90c83e4
|
二级目录不进行排列定制和域名申请
|
9 years ago |
