 huang
|
f4a5aeec07
|
样式优化
|
9 years ago |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
9 years ago |
 cxt
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
|
huang
|
b40a112015
|
配置页面一级域名超过的时候显示样式
|
9 years ago |
|
huang
|
9c18b37349
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
 Tim
|
c3aec4d115
|
组织一级栏目名称过长时溢出
|
9 years ago |
|
huang
|
7f9a327166
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/sub_document_comments/show.html.erb
|
9 years ago |
|
Tim
|
cd95ed0558
|
二级回复展开更多效果实现
|
9 years ago |
 yuanke
|
d32e07bda9
|
项目符号有的地方多余，issue详情里面项目符号显示为数字改为圆点.
|
9 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 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
|
9 years ago |
|
yuanke
|
a863c143f3
|
收缩箭头修改
|
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 |
|
Tim
|
4bf1883ba2
|
组织门户导航栏二级显隐
|
9 years ago |
|
yuanke
|
283a83013c
|
KE 修改项目符号、表格颜色问题
|
9 years ago |
|
Tim
|
d0f97275cc
|
组织二级栏目显隐效果
|
9 years ago |
|
cxt
|
55718f2d44
|
设置课程大纲时若博客标题太长以省略号结束
|
9 years ago |
|
Tim
|
c3514f5b6a
|
二级栏目名长度控制
|
9 years ago |
|
Tim
|
787dbaaffc
|
二维码处文字样式处理
|
9 years ago |
|
Tim
|
abbbe9b7d6
|
二级子目录样式处理
|
9 years ago |
|
cxt
|
6c184b9248
|
题库的分享请求
|
9 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
|
9 years ago |
|
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
9 years ago |
 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
|
9 years ago |
|
Linda
|
0fc142d822
|
组织配置logo样式
|
9 years ago |
|
Tim
|
714deebe21
|
二级导航调整
|
9 years ago |
|
huang
|
7fbf6f4011
|
模式二帖子列表添加分页
|
9 years ago |
|
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
9 years ago |
|
cxt
|
d3e3e9d22b
|
补交作品的样式
|
9 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
9 years ago |
|
txz
|
de8b303b93
|
微信数据请求时显示加载中
|
9 years ago |
|
yuanke
|
5f24fb6496
|
锁的样式修改
|
9 years ago |
|
cxt
|
14a539bd0a
|
样式冲突
|
9 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
Tim
|
56a4a64d09
|
北斗详情翻页更改；位置超出省略号
|
9 years ago |
|
Tim
|
1f87d105d0
|
添加二级目录弹窗，翻页css
|
9 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
9 years ago |
|
Tim
|
ebe6004833
|
组织二级目录添加列表
|
9 years ago |
|
Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
9 years ago |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
9 years ago |
|
Tim
|
024667d035
|
title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等
|
9 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
Tim
|
5d44dc5bba
|
滚动栏js效果修改
|
9 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
9 years ago |
