xianbo
|
a3a95556a3
|
fix 王林春提交了冲突文件
|
11 years ago |
 yanxd
|
f44b930037
|
233
|
11 years ago |
 nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
 z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
yanxd
|
f9166a71a7
|
issues#555
|
11 years ago |
|
yanxd
|
9373666576
|
混淆课程数量
|
11 years ago |
|
z9hang
|
eaa9c94290
|
自己的用户界面也不现实邮箱
|
11 years ago |
|
z9hang
|
2b12d31fb8
|
去除网站中的邮箱地址显示
|
11 years ago |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
 wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
11 years ago |
|
wanglinchun
|
30f9bc9178
|
隐藏竞赛页面参赛项目和参赛应用；
隐藏竞赛页面中关注的“更多”功能
|
11 years ago |
|
wanglinchun
|
3edb1114c3
|
修改参赛作品列表页面的部分显示方式
|
11 years ago |
|
wanglinchun
|
5c04f91857
|
修改了竞赛页面中关注人数的统计
|
11 years ago |
|
wanglinchun
|
caff0f55c9
|
调整了竞赛页面中参赛作品数量统计及跳转
|
11 years ago |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
11 years ago |
|
nwb
|
faab40456a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
11 years ago |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
688438241e
|
调整应用列表页面中的bug
|
11 years ago |
|
wanglinchun
|
c40bc242cd
|
调整了应用列表页面中的搜索显示格式；
调整了竞赛页面中的参赛应用列表的简介的长度（增加了显示长度限制）；
调整了具体参赛应用页面中应用应用简介的长度（将原来的限制为150改为不限制，便于读者）
|
11 years ago |
|
t430
|
6b526ee438
|
fix
|
11 years ago |
|
wanglinchun
|
bdb1c3f74e
|
实现应用列表页面
|
11 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
11 years ago |
|
yanxd
|
be6ae6ef34
|
d
|
11 years ago |
|
yanxd
|
939e4cc100
|
footer 下方距离
welcome调整下主页
|
11 years ago |
|
yanxd
|
08892d1cf7
|
s
|
11 years ago |
|
wanglinchun
|
c16933120d
|
修改竞赛子站首页显示
|
11 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
ed71a3faa1
|
调整删除竞赛的显示样式及位置
|
11 years ago |
|
yanxd
|
2052d36abe
|
issue:socialForge#381
|
11 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
yanxd
|
e2a5e2f730
|
footer
|
11 years ago |
Wen
|
7be7fd3d9b
|
学校选择形式改为弹窗
|
11 years ago |
|
wanglinchun
|
b318166c15
|
给参与竞赛的应用页面增加导航条
|
11 years ago |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
11 years ago |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
|
fanqiang
|
8600265f00
|
修改查询条件样式
|
11 years ago |
|
xianbo
|
bb4d141b0e
|
erge branch 'competition' into develop
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
yanxd
|
a4ab29f49d
|
footer logo modify
|
11 years ago |
|
wanglinchun
|
3d02cb7ce0
|
修改首页显示部分数据
|
11 years ago |
|
kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
bdefa322cc
|
modify foot
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
11 years ago |
