 z9hang
|
f9a17241da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
12 years ago |
 yanxd
|
d2b5560d5e
|
userscore 事务
|
12 years ago |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
12 years ago |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
12 years ago |
|
yanxd
|
73f5bab075
|
document css/
wiki h2 bug
|
12 years ago |
|
yanxd
|
541b22b84d
|
score statistics init
|
12 years ago |
|
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
12 years ago |
|
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
12 years ago |
 wanglinchun
|
8b78929190
|
修改竞赛通知中评论的相关文件
|
12 years ago |
|
z9hang
|
ae5ced6a51
|
课程权限添加（部分）
|
12 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
wanglinchun
|
81a45fe977
|
dfs
|
12 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
12 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
12 years ago |
|
yanxd
|
8c33cf0afb
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
12 years ago |
xianbo
|
325bb85cc5
|
fix linchun
|
12 years ago |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
12 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
12 years ago |
|
yanxd
|
c7d6a07b72
|
gems
|
12 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
12 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
12 years ago |
 nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
8f0ee69b8b
|
隐藏竞赛中的参赛项目和参赛应用
|
12 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
wanglinchun
|
b182debc16
|
将竞赛页面中“新建参赛作品”的弹出形式由弹出新页面改为本页弹出下拉框，目前已有效果，写数据库有问题
|
12 years ago |
|
wanglinchun
|
30f9bc9178
|
隐藏竞赛页面参赛项目和参赛应用；
隐藏竞赛页面中关注的“更多”功能
|
12 years ago |
|
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用
|
12 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
12 years ago |
yanxd
|
d9cadfc43e
|
未登录500报错
|
12 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
12 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
12 years ago |
|
wanglinchun
|
982ff342fd
|
显示竞赛页面参赛项目菜单
|
12 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
e136254c8d
|
回复了项目页面中的头像
|
12 years ago |
|
yanxd
|
d137e78f19
|
remove tmp file rake task/
|
12 years ago |
|
yanxd
|
bde4e0f4f7
|
fix courselist
|
12 years ago |
 kg
|
e92383940f
|
#b2896c16453fc51
|
12 years ago |
|
xianbo
|
b2896c1645
|
fix
|
12 years ago |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
12 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
12 years ago |
