 z9hang
|
cd333c8f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
 sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
12 years ago |
xianbo
|
a70593ad76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
yanxd
|
200c052bb4
|
watchers
|
12 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
12 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 nwb
|
68b9a7efc5
|
修正批准成员申请未选择角色时的BUG
|
12 years ago |
 fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
12 years ago |
 wanglinchun
|
4afc41a171
|
修改了编辑参赛作品不能更新托管项目的问题
|
12 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
12 years ago |
|
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
12 years ago |
|
wanglinchun
|
8d77c62359
|
sdfd
|
12 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
12 years ago |
|
wanglinchun
|
b416d69639
|
vxc
|
12 years ago |
 yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
12 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
ee3a5f5719
|
代码修改
|
12 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
12 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
12 years ago |
|
z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
12 years ago |
|
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 |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
6b5fda1c78
|
read txt attachment
|
12 years ago |
|
sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
71bbc50542
|
增加作业留言的分页显示
|
12 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
12 years ago |
|
nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
9c75b701f4
|
修改BUG
|
12 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
12 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
nwb
|
4f9625b265
|
修改BUG
|
12 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
12 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
12 years ago |
|
z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
12 years ago |
|
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
12 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
12 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
12 years ago |
|
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
12 years ago |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
12 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
fanqiang
|
290d07ffdd
|
修改新建帖子bug（open_source_project）
|
12 years ago |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
12 years ago |
|
z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
12 years ago |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
12 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
12 years ago |
|
z9hang
|
5b8b2045f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
b3489d3e68
|
修改删除文件后跳转错误问题
|
12 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
12 years ago |
|
sw
|
4de089250f
|
修改删除留言方法为destroy_jour，以及相关路由，访问action的改变
|
12 years ago |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
12 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
12 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
12 years ago |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
12 years ago |
|
z9hang
|
edf2a84072
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
2524600aeb
|
修正贴吧留言删除附件后跳转错误问题
|
12 years ago |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
12 years ago |
|
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
12 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
12 years ago |
|
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
12 years ago |
|
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
12 years ago |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
12 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
029eb1a195
|
作业回复
|
12 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
12 years ago |
|
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af.
|
12 years ago |
|
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168.
|
12 years ago |
|
nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
12 years ago |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
03dbcb1168
|
acount
|
12 years ago |
|
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
12 years ago |
|
yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
12 years ago |
|
yanxd
|
13a5aa988a
|
issues#623
|
12 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
12 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
12 years ago |
|
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
12 years ago |
|
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
12 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
12 years ago |
|
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
12 years ago |
|
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
12 years ago |
ganyiang
|
eda5121195
|
1.新增osp项目所有帖子的显示页面（待改进）
2.修改osp社区主页的[全球热帖]显示数量，默认25条->10条
|
12 years ago |
|
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致（新回复在前）
|
12 years ago |
|
z9hang
|
da37a12158
|
优化代码
|
12 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
12 years ago |
|
z9hang
|
57a4f45cad
|
修复编辑作业提交返回错误信息时填入正确信息后异常bug
|
12 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
12 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
12 years ago |
|
nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
12 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
12 years ago |
|
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
12 years ago |
|
wanglinchun
|
cf18b94326
|
调整了竞赛中的参赛作品列表按得分排序；
增加参赛作品页面和竞赛中参赛作品得分
|
12 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
12 years ago |
|
wanglinchun
|
dcc4167e06
|
将竞赛中参赛作品列表的排序方式改为按打分高低
|
12 years ago |
|
yanxd
|
f35dd2a30d
|
提交作业字段不合验证，返回页面bug
|
12 years ago |
|
yanxd
|
c702867250
|
Merge remote-tracking branch 'origin/develop' into develop
|
12 years ago |
|
yanxd
|
e6e001246f
|
# 必填自己的工作单位，其实就是学校
|
12 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
12 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
12 years ago |
|
wanglinchun
|
19eb071a77
|
dfd
|
12 years ago |
|
wanglinchun
|
38c7216097
|
添加了新建参赛作品后弹出新建成功的提示框
|
12 years ago |
|
wanglinchun
|
2b44b1b893
|
将竞赛中参赛作品列表按照时间顺序逆序排列（针对参赛应用）
|
12 years ago |
|
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
12 years ago |
|
wanglinchun
|
7d33bb9b2d
|
将原有的新建参赛作品时弹出新页面变为了本页弹出下拉框
|
12 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
12 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
12 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
12 years ago |
|
wanglinchun
|
538f8516b0
|
目前已经通过判断将属于竞赛的项目或是应用显示到我要参赛的作品列表中
|
12 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
12 years ago |
|
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用
|
12 years ago |
|
wanglinchun
|
fb3c513da2
|
给“我要参赛”应用了base——newcontest的整体样式
|
12 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
12 years ago |
|
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
12 years ago |
|
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
12 years ago |
|
wanglinchun
|
c6576c71bf
|
增加了每个app打分的总人数
|
12 years ago |
|
fanqiang
|
e89d74e2a9
|
开源项目中新增tag，搜索查找待新增tag的obj
|
12 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
|
12 years ago |
|
yanxd
|
2b5cdf161c
|
不能删除帖子问题
|
12 years ago |
 kg
|
776a9d1e35
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
Wen
|
e6288627ad
|
中国高校页面，下拉框修改
|
12 years ago |
|
wanglinchun
|
e48edac988
|
增加参赛应用页面的打分细节--初级版
|
12 years ago |
|
wanglinchun
|
3da6d5cd37
|
应用页面列表排序（按时间排序已好，另一种排序暂未定）
|
12 years ago |
|
wanglinchun
|
dbe4c26322
|
应用列表分页功能
|
12 years ago |
|
wanglinchun
|
0403666cea
|
增加应用列表页面的分页功能
|
12 years ago |
|
kg
|
0f51480bab
|
amend course search
|
12 years ago |
|
Wen
|
50745d5d21
|
course首页布局上的小调整
|
12 years ago |
