 nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
2014-06-17 10:12:44 +08:00 |
 wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
2014-06-05 10:28:36 +08:00 |
|
nwb
|
4404222437
|
0604
|
2014-06-04 14:13:26 +08:00 |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
 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
|
2014-05-05 09:11:59 +08:00 |
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
|
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
|
2014-04-18 16:03:52 +08:00 |
|
yanxd
|
84d3e40c41
|
zip down controller created
|
2014-04-16 11:27:08 +08:00 |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
2014-04-03 20:47:09 +08:00 |
|
fanqiang
|
d935152ed7
|
initial crawl
|
2014-03-29 10:57:36 +08:00 |
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
2014-03-21 18:02:55 +08:00 |
|
yanxd
|
48650a2a91
|
init forum. again.
|
2013-11-22 21:55:21 +08:00 |
|
fanqiang
|
16f70437d1
|
forum init.
|
2013-11-22 10:24:15 +08:00 |
 huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
 william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
2013-08-08 17:01:56 +08:00 |
 kaizheng
|
e635237acd
|
添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端
|
2013-08-01 20:26:19 +08:00 |