 sw
|
8a7757f3c2
|
1.整理踩、赞页面代码
2.增加作业点赞功能
3.作业列表界面增加是否已经点赞判断
|
11 years ago |
 z9hang
|
5cbbb98536
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
z9hang
|
79b7373446
|
留言修改
|
11 years ago |
|
sw
|
2dc79889b9
|
1.增加访问界面时根据角色不同显示不同界面
2.增加学生创建作业、删除作业功能
3.修改学生创建作业时的路由
|
11 years ago |
|
sw
|
58d2306728
|
增加学生进入课程作业界面后相关的路由、界面动态切换显示
|
11 years ago |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
11 years ago |
|
sw
|
3fa5a4b3c5
|
1.增加课程留言界面的路由
2.增加点击已批作业、未批作业、全部作业、留言的ajax调用
3.实现点击已批作业、未批作业、全部作业、留言时界面切换
|
11 years ago |
|
sw
|
afa1ef22d5
|
1.未批作业改为动态页面
2.优化分页查询代码
3.修改页面css样式
4.增加查找未批作业路由以及相应的action
|
11 years ago |
 alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
f15c870053
|
1、代码优化。2、项目新建项目后个人主页中项目tab页点击报错问题
|
11 years ago |
|
z9hang
|
e4ff85894d
|
1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
|
11 years ago |
|
z9hang
|
2cabec22f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
11 years ago |
|
sw
|
4c41c10e0d
|
首页增加加入课程按钮，用户可以输入课程ID以及课程密码加入对应的课程，已过期课程会给出对应提示
|
11 years ago |
|
sw
|
97f66a2b08
|
Merge branch 'develop' into szzh
|
11 years ago |
|
z9hang
|
af59cef90b
|
网站页脚配置功能
|
11 years ago |
|
sw
|
7a710a4a8f
|
去除掉部分无用预览按钮
|
11 years ago |
|
z9hang
|
ddca1a0316
|
#1331 创新竞赛：点击竞赛“ 2014 年 Android 程序设计竞赛 ”返回404错误 原因，1、路由缺失，补上路由。2、更多链接处加上参数。3、对应show_contest_user方法中一个@users写错成@uers修正之
|
11 years ago |
|
alan
|
02470491bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/index.html.erb
|
11 years ago |
|
alan
|
f44dbf76ac
|
测试course路由
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
98b6be61ba
|
1.修复回复贴吧信息错误后错误信息不及时清除的BUG
2.修复课程讨论区新建帖子跳转页面为回复的BUG
3.修复新建作业后报错的BUg
解决方案：路由错误
|
11 years ago |
|
alan
|
dea1a299af
|
修改competition的view文件，将其中不规范的代码进行修改，并将其中所有的link_to
修改成"link_to ‘welcome’ home_path, {option}" 的形式；
统一route风格
match 'path', :to => 'controller#action'
如果 path = controller#action 则 match 'path'
Example:
match 'welcome/course', :to => 'welcome#course' 变成 match 'welcome/cource'
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
64eb4d362c
|
将contest主页中通知公告的颜色改成蓝色
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
linhk
|
9f3392eba8
|
删除主留言时确认删除的提示信息
|
11 years ago |
 zhanghaitao
|
b635a6b3c5
|
1.添加工作台分页处理操作
2.分页处理路由函数添加
|
11 years ago |
|
linhk
|
4c57136a1d
|
项目留言删除功能
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
11 years ago |
|
sw
|
31e8ad98ae
|
1.修复竞赛作品每次修改之后，都会吧图片清空的BUG
2.修改删除竞赛作品图片功能
|
11 years ago |
|
sw
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
11 years ago |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
11 years ago |
 nwb
|
222959d1da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
27fda1f938
|
竞赛首页修改
|
11 years ago |
 yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
11 years ago |
|
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
11 years ago |
|
yanxd
|
37d0560b70
|
test test
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
z9hang
|
470f40db82
|
去除绝对网址
|
11 years ago |
|
sw
|
3e185c3a4b
|
修改学校链接
|
11 years ago |
|
sw
|
b42d742c06
|
1.增加我的学校链接
2.修改当我的学校未开设课程时报出的BUG
|
11 years ago |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
11 years ago |
|
sw
|
063460f119
|
tt
|
11 years ago |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
11 years ago |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
11 years ago |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
11 years ago |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
11 years ago |
|
nwb
|
936c40b490
|
提交作业逻辑和视图修改
|
11 years ago |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
11 years ago |
|
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
|
11 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
11 years ago |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
11 years ago |
|
yanxd
|
3fd7104448
|
welcome index obj.includes, routes add school logo
|
11 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
|
11 years ago |
|
yanxd
|
362570e34b
|
contestnotification_edit function
|
11 years ago |
|
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
ae8fcca14f
|
1.课程接触视图修改
2.添加课程成员列表视图
|
11 years ago |
|
nwb
|
165dbc3f78
|
修改words_controller与课程相关方法及视图
|
11 years ago |
|
nwb
|
70901832a8
|
1.修改课程讨论区control index、show方法及路由
2.BoardsHelper添加课程相关方法
|
11 years ago |
|
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
11 years ago |
|
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
11 years ago |
|
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
11 years ago |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
11 years ago |
|
yanxd
|
4c7bcd50f5
|
contests delete routes error
|
11 years ago |
yanxd
|
c3865ab319
|
notificationcomments
|
11 years ago |
 wanglinchun
|
45e12c4bef
|
xx
|
11 years ago |
|
nwb
|
c1f9f389b7
|
修改课程讨论区视图，从项目中分离
|
11 years ago |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
11 years ago |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
|
wanglinchun
|
ed84ec633f
|
竞赛通知
|
11 years ago |
|
wanglinchun
|
ae70081288
|
eter
|
11 years ago |
|
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
11 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
11 years ago |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
11 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
11 years ago |
|
wanglinchun
|
a3fb48a4bb
|
0603
|
11 years ago |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
11 years ago |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
11 years ago |
|
wanglinchun
|
81a45fe977
|
dfs
|
11 years ago |
|
nwb
|
e490f7979d
|
添加课程index界面
|
11 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
11 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
|
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
|
nwb
|
4e815a38b6
|
更改路由，课程独立出来，不再包含在项目中
|
11 years ago |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
11 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
11 years ago |
|
yanxd
|
98444ef01e
|
remove fuzzy routes|add school missing row
|
11 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
11 years ago |
|
yanxd
|
4b1d7e049d
|
233
|
11 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
11 years ago |
|
sw
|
4de089250f
|
修改删除留言方法为destroy_jour，以及相关路由，访问action的改变
|
11 years ago |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
11 years ago |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
11 years ago |
|
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
11 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
11 years ago |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
029eb1a195
|
作业回复
|
11 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
4235ca8984
|
修正BUG
|
11 years ago |
|
nwb
|
c0c184d8bf
|
1.修正错误
2.添加全部资源视图时的对资源分类的编辑
|
11 years ago |
|
nwb
|
1caa7940dc
|
1、资源发布者的分类和tag编辑；
2、网站管理者对资源的再分类和tag再编辑
|
11 years ago |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
11 years ago |
|
wanglinchun
|
65340f604d
|
sdf
|
11 years ago |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
11 years ago |
|
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
11 years ago |
|
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
11 years ago |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
11 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
|
11 years ago |
Wen
|
e6288627ad
|
中国高校页面，下拉框修改
|
11 years ago |
|
Wen
|
10fdcbb050
|
一个简单的后台上传学校logo的页面.
|
11 years ago |
|
Wen
|
cc738edf2f
|
学校列表添加了搜索功能
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
11 years ago |
