 huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
9 years ago |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
d047409d31
|
项目动态
|
9 years ago |
|
huang
|
ba344a86b5
|
颜色
|
9 years ago |
|
huang
|
d532cd3c6c
|
权限
|
9 years ago |
|
huang
|
135e50b2e7
|
链接
|
9 years ago |
|
huang
|
1f073c19ae
|
域名问题
|
9 years ago |
|
huang
|
22cafdbd05
|
二级目录弹出
|
9 years ago |
|
huang
|
eecf12eda6
|
添加链接
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
9 years ago |
 cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
9 years ago |
|
huang
|
81ab73e286
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
9 years ago |
|
huang
|
698e4bd7b3
|
header
|
9 years ago |
 Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
9 years ago |
|
huang
|
46e4f2c143
|
组织新base框架
|
9 years ago |
|
huang
|
12ac353de9
|
北斗新base
|
9 years ago |
|
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
2abb68c00c
|
组织代码公共部分整理
|
9 years ago |
|
Tim
|
65c7719ed2
|
设置大纲图标在讨论区换行显示问题
|
9 years ago |
|
huang
|
0e03798f6e
|
组织框架结构（yeild）修改
|
9 years ago |
|
huang
|
e9c35ae20f
|
组织未登录情况默认图片展示
|
9 years ago |
|
Tim
|
15ea9a9659
|
组织门户自动播放禁用
|
9 years ago |
|
Tim
|
1402ae190d
|
组织头像
|
9 years ago |
|
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
10 years ago |
|
huang
|
7bd047f7e4
|
组织模式二中名师榜样式
|
10 years ago |
|
cxt
|
d303a06377
|
首页列表的排序
|
10 years ago |
|
Tim
|
2461a5c918
|
组织门户二级目录位置重新设置
|
10 years ago |
|
Tim
|
c2e7a77150
|
组织门户二级菜单延迟隐藏
|
10 years ago |
|
Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
10 years ago |
|
huang
|
967a76af67
|
图片变大的问题
|
10 years ago |
|
huang
|
3469d928d8
|
图片变的很大问题
|
10 years ago |
|
huang
|
23a23fd085
|
组织logo上传图片
|
10 years ago |
|
huang
|
86b0470b76
|
隐藏掉搜索功能
|
10 years ago |
|
huang
|
a267c75ec7
|
首页的隐藏可见
|
10 years ago |
|
huang
|
d9b0c654aa
|
组织门户二级目录显隐
|
10 years ago |
|
huang
|
5133338923
|
组织门户二级目录显隐
|
10 years ago |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
huang
|
42814feab8
|
js问题
|
10 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
|
10 years ago |
|
Tim
|
4bf1883ba2
|
组织门户导航栏二级显隐
|
10 years ago |
|
huang
|
6057ea15e1
|
一级目录新界面鼠标经过显示子目录
|
10 years ago |
|
huang
|
231f8f3526
|
二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框
|
10 years ago |
|
huang
|
cd6124895d
|
鼠标经过一级目录的时候显示二级目录
|
10 years ago |
|
huang
|
aaf97ac81c
|
新版块3和板块2合并，板块3取前四个
|
10 years ago |
 yuanke
|
9dc92fe817
|
列表优化
|
10 years ago |
|
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
|
10 years ago |
|
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
10 years ago |
