 yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
2014-06-13 10:59:43 +08:00 |
 z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
2014-06-06 10:37:06 +08:00 |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
2014-05-30 10:57:13 +08:00 |
|
yanxd
|
c7d6a07b72
|
gems
|
2014-05-28 09:57:30 +08:00 |
yanxd
|
22d4835d08
|
asset pipeline. gemfile
|
2014-05-27 18:14:45 +08:00 |
 wanglinchun
|
ae622eb74e
|
sdfsd
|
2014-04-23 17:33:32 +08:00 |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
2014-04-22 10:59:50 +08:00 |
|
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
|
Administrator
|
14fb820df3
|
修正 注册
|
2013-08-17 10:34:19 +08:00 |
 william
|
9cc86f3cd8
|
移除seems_ratabale插件。
|
2013-08-08 17:26:37 +08:00 |
|
william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
2013-08-08 17:01:56 +08:00 |
 huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |