xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
12 years ago |
 nwb
|
9c75b701f4
|
修改BUG
|
12 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
12 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
 wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
12 years ago |
 yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
12 years ago |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
12 years ago |
 z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
12 years ago |
 sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
12 years ago |
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
12 years ago |
|
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
12 years ago |
 kg
|
0f51480bab
|
amend course search
|
12 years ago |
|
kg
|
e9bd8a8f3e
|
revise project index,course,search
|
12 years ago |
|
yanxd
|
8f5958abc1
|
mao
|
12 years ago |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
12 years ago |
|
kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
kg
|
0ff3734aae
|
delete nothing
|
12 years ago |
|
kg
|
77ea0092b7
|
add course homepage activity
|
12 years ago |
|
yanxd
|
2052d36abe
|
issue:socialForge#381
|
12 years ago |
|
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
kg
|
709629bcdf
|
add course activity
|
12 years ago |
Wen
|
cf762e6aa3
|
bug fix~
|
12 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
12 years ago |
|
Wen
|
3dbe7c5896
|
课程的学校ID自动设置为开课教师的学校ID
去掉课程添加界面上的学校选择
|
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 |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
12 years ago |
|
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定！
|
12 years ago |
|
yanxd
|
634dd15be3
|
project html
|
12 years ago |
|
yanxd
|
96fcdbacf2
|
课程里搜东西 没有内容项目里也跳出来的问题
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
Wen
|
24d7234fec
|
作业顺序按照截止日期排序
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 alan
|
5c2a037a8f
|
user dup
|
12 years ago |
|
yanxd
|
850ff6194f
|
issue#509,#510
|
12 years ago |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
12 years ago |
|
yanxd
|
35d1c33a29
|
...
|
12 years ago |
|
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
12 years ago |
|
Wen
|
ce7af30788
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
12 years ago |
|
yanxd
|
9c54c9c1b6
|
重构项目和课程排序部分，修复分页数量错误
|
12 years ago |
|
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
12 years ago |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
12 years ago |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
12 years ago |
|
yanxd
|
2878c57d43
|
新建作业 除了学生
|
12 years ago |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
12 years ago |
|
wanglinchun
|
b45332bab0
|
课程默认活跃度排序
|
12 years ago |
 baiyu
|
13fdbde1cf
|
个人分数
|
12 years ago |
|
yanxd
|
90a37a5f4e
|
竞赛众包的留言修改
|
12 years ago |
|
yanxd
|
9cd931cb7f
|
ajax
|
12 years ago |
|
yanxd
|
ebc803a88a
|
项目留言.
|
12 years ago |
