 alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 sw
|
bc36e16e57
|
1.修改创建作业后跳转到作业列表
2.修改作业创建成功提示
|
11 years ago |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
|
sw
|
4d1730f92e
|
修改
|
11 years ago |
|
alan
|
1d76d559dd
|
添加功能<用户搜索的问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
11 years ago |
 z9hang
|
990c37061b
|
调整按钮样式
|
11 years ago |
|
alan
|
495c4db43e
|
增加功能<增加学生列表是否公开功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8cec84dca7
|
添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
c2fe1b7c72
|
修正评分不能点问题，作品留言
|
11 years ago |
|
z9hang
|
8bfcbcc602
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
cb87d6337c
|
留言修改
|
11 years ago |
 gonglexin
|
e8e7708d6e
|
作业匿评功能
|
11 years ago |
|
sw
|
8a6da7a0a1
|
作业参与人员增加退出作业按钮显示，实现参与人员自主退出作业的功能
|
11 years ago |
|
z9hang
|
96626eeb6b
|
恢复respond_path路由并修改部分respond_path
恢复homework_list.html.erb文件
|
11 years ago |
|
z9hang
|
c3bfbf7a97
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/_homeworks_list.html.erb
|
11 years ago |
|
z9hang
|
44433e1672
|
评分界面修改
|
11 years ago |
|
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 |
|
z9hang
|
b59ff98006
|
修改留言界面
|
11 years ago |
|
sw
|
58d32bcf2b
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
f5e9528b12
|
修改base_homework界面
|
11 years ago |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
11 years ago |
|
z9hang
|
cc42511a38
|
修改base_homwwork显示的内容
|
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
|
7d3a18197b
|
修改bug<注册时用户可以不填真实姓名，将其设置为可选>和《测试版：项目--点击作品下载报500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d2740c8a3a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
a594326bce
|
修改课程详细信息界面教师单位为开设课程单位
|
11 years ago |
|
z9hang
|
887a3cbe46
|
两个英文国际化丢失问题
|
11 years ago |
|
gonglexin
|
ab9a9628c0
|
解决#1220 甘特图 PNG 格式中文乱码问题
|
11 years ago |
|
sw
|
943b9656d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e220f100d6
|
#1163项目、课程讨论区新建帖子增加js验证
|
11 years ago |
|
alan
|
72ed73fb05
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
ed292c8216
|
修改参数作品打分。把百分比变成人数
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
782098c6e7
|
修改测试版个人修改学校、学校列表跨域访问的问题
|
11 years ago |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
923a33add5
|
#1397、#1396新建竞赛通知增加js验证
|
11 years ago |
|
z9hang
|
2e3bdf1179
|
将上传资源权限从添加、编辑、缺陷及编辑缺陷注释权限中分离出来，修正未加入任何课程、项目的用户无法上传资源附件bug
|
11 years ago |
|
sw
|
34c7b47580
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c76439c515
|
#1381修复选择相关内容类型、文件类型后，资源列表表头显示异常的BUG
2.格式化页面代码
3.项目资源列表也有相关问题，一并修复
|
11 years ago |
|
sw
|
216537a844
|
#1278修改课程列表中单位名称为开设课程的单位
|
11 years ago |
|
sw
|
a001f85502
|
#1379
1.隐藏作业类型
2.取消无效作业描述
|
11 years ago |
|
z9hang
|
ede14268dc
|
tag字数过多的显示问题
|
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
|
984c33acfb
|
添加合作单位名称，url的非空验证、字符长度验证（不超过255）、url格式验证，及新建、编辑时的错误提示信息
|
11 years ago |
|
z9hang
|
af59cef90b
|
网站页脚配置功能
|
11 years ago |
|
sw
|
7a710a4a8f
|
去除掉部分无用预览按钮
|
11 years ago |
|
sw
|
379e721191
|
#1345 修改老师综评价界面
|
11 years ago |
|
sw
|
2e3ff531f6
|
1.#1181课程描述显示的问题
2.修改项目首页用户动态显示按字符长度截取导致页面不协调的BUG
|
11 years ago |
|
sw
|
8cd3dd0287
|
1.#1249 未登录和非本人进入用户课程界面时隐藏课程不显示
解决方案：判断当前用户和所查看的用户是否一致，不一致取消隐藏课程的显示
2.国际化代码以及页面代码调整
|
11 years ago |
|
sw
|
26550bf0a0
|
1.国际化代码
2.项目讨论区标题省略号出现不正确的BUG
|
11 years ago |
|
sw
|
caabbd44cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ddca1a0316
|
#1331 创新竞赛：点击竞赛“ 2014 年 Android 程序设计竞赛 ”返回404错误 原因，1、路由缺失，补上路由。2、更多链接处加上参数。3、对应show_contest_user方法中一个@users写错成@uers修正之
|
11 years ago |
|
sw
|
f6561395a4
|
#1281
|
11 years ago |
|
sw
|
53bb8442b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
045a09e2ed
|
添加贴吧资源下载权限控制
|
11 years ago |
|
sw
|
57835abb37
|
1.增加管理员不能退出项目
2.增加退出项目时的提示
|
11 years ago |
|
sw
|
2542dd5592
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
sw
|
f477f45dec
|
页面修改
|
11 years ago |
|
z9hang
|
3393b8ba73
|
公共贴吧回帖的主题添加“RE： ”前缀，编辑帖子时的“修改主题”改为“编辑帖子”
|
11 years ago |
|
z9hang
|
21343a0111
|
超级管理员权限报表界面项目权限与课程权限分开整理，#1300 配置管理--角色和权限--权限报表，显示超出边框 解决：修改css样式
|
11 years ago |
|
alan
|
8d657fd0af
|
修复bug:
1,竞赛通知，点击取消也能成功添加
2， “删除”二字竖的排列
3， 编辑竞赛显示为“新闻”
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
e5d89590e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
4604720475
|
修改竞赛作品信息
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
086d99fe2a
|
#1280 公共贴吧--新建帖子，置所有条件为空，点击发布按钮，却返回帖子列表及其他相关问题。修改：发布失败后停留在发帖页面
|
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
|
5a14798290
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
0e07bed1ad
|
将contest 中的中文转换成zh.yml中的标签
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
1976aa9c72
|
公共贴吧--编辑帖子，“置顶”与“引用”控件重叠及中英文混排问题 #1258
|
11 years ago |
linhk
|
5824f70fe3
|
输出日志代码
|
11 years ago |
|
sw
|
98b6be61ba
|
1.修复回复贴吧信息错误后错误信息不及时清除的BUG
2.修复课程讨论区新建帖子跳转页面为回复的BUG
3.修复新建作业后报错的BUg
解决方案：路由错误
|
11 years ago |
|
sw
|
51a783c9a9
|
1.修改竞赛首页通知公告
2.调整竞赛首页页面布局
解决方案：查找系统中最新的最多5条通知公告，显示在首页，用户可以点击相应公告进入公告详细信息页面
|
11 years ago |
|
sw
|
8f0fdbdb75
|
首页页面改造
|
11 years ago |
|
sw
|
1b97361ec6
|
1.修改课程讨论区回复不会自动换号
2.本地化代码
|
11 years ago |
|
alan
|
8c19ec8aa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/projects_helper.rb
app/views/contest_notification/show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
z9hang
|
e83ebedd00
|
高校页面代码优化：1、中文国际化。2、写死的链接改为从配置中读取
|
11 years ago |
|
alan
|
64eb4d362c
|
将contest主页中通知公告的颜色改成蓝色
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
f70edc1a0b
|
修复老师角色在没有任何附件情况下点击打包下载报500错误的BUG #1209
解决方案：增加判断是否有一个以上附件，当没有任何附件时，跳转到相应页面，提示用户没有任何文件可以下载
|
11 years ago |
|
z9hang
|
f13eb73a72
|
label写错纠正，一个写死的主页链接纠正
|
11 years ago |
|
alan
|
304effa8e4
|
pull competition branch
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
e0cdcc0211
|
课程讨论区发帖，添加附件，admin帐户删除附件报错，原因：判断attachment的containers是否为课程的时候少判断了课程讨论区的附件这种情况，解决：加上该判断。问题2 #1002 forge网站的主页项目列表登录前和登陆后，显示的不一样。 解决方法：项目列表、课程列表中的私有项目、私有课程添加私有标志
|
11 years ago |
|
sw
|
c743f58104
|
“我的课程” 讨论区中 讨论内容框没有名字，且是否为必须没有提示 #1524
|
11 years ago |
|
z9hang
|
e3a7d365ea
|
评审任务移动到显眼位置
|
11 years ago |
|
sw
|
c7caa08c70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5afcb73624
|
1.修改中英提示
2.修改查看差别页面会超出界面的BUG
|
11 years ago |
|
z9hang
|
f0db3e1b4a
|
添加负积分修正为0的说明
|
11 years ago |
|
z9hang
|
060759774b
|
课程、项目中资源切换资源类型时弹出error问题（原因：1.未新建分页对象（从某个类型切回全部），2.资源类型信息丢失）
|
11 years ago |
|
z9hang
|
42285ce44d
|
积分少于2分时不能踩人
|
11 years ago |
|
linhk
|
9f3392eba8
|
删除主留言时确认删除的提示信息
|
11 years ago |
|
sw
|
273c932acf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 zhanghaitao
|
3279fda3e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhanghaitao
|
b635a6b3c5
|
1.添加工作台分页处理操作
2.分页处理路由函数添加
|
11 years ago |
|
sw
|
1498f5c20b
|
1.修改课程通知时按钮状态
2.新建作业描述不正确
|
11 years ago |
|
sw
|
a690fd79cf
|
课程修改通知时标题不正确的问题
|
11 years ago |
|
linhk
|
4c57136a1d
|
项目留言删除功能
|
11 years ago |
|
sw
|
90e65825db
|
修复界面中英文问题
|
11 years ago |
|
sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
daeab7ef64
|
1.修改新建、修改贴吧时描述编辑框
2.增加字段长度限定的提示
3.修改帖子内容展示
|
11 years ago |
|
sw
|
14a436a310
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
08115c9de4
|
1.修复文本格式化报错的问题
2.修改作业留言清除按钮描述不正确的问题
|
11 years ago |
 chenmin
|
4acf5f3f06
|
添加文件提示页面元素变量处理
|
11 years ago |
|
sw
|
79c6722aad
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
f99543ab4b
|
#1294
1.修改缺陷列表中缺陷描述样式
2.修改缺陷、日历查询时，Closed->关闭于，角色成员减少学生、老师、助教等3个角色
|
11 years ago |
|
chenmin
|
027bd1ace6
|
修复参加竞赛页面显示错误
|
11 years ago |
|
chenmin
|
e12a540061
|
项目日历页面描述错误修改；
|
11 years ago |
|
sw
|
0c597d23a2
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
f7635370d7
|
优化课程首页效率
|
11 years ago |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
linhk
|
70a1839e74
|
英文界面-用户下拉菜单（我的课程、项目、编辑资料）显示问题
|
11 years ago |
|
zhanghaitao
|
d9a9867f96
|
#815 中英文显示问题修改
|
11 years ago |
|
sw
|
7179943f8b
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
78343effaf
|
em.yml还原
|
11 years ago |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
11 years ago |
|
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
11 years ago |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhanghaitao
|
45cc3ddb9b
|
#873提示信息修改
|
11 years ago |
|
linhk
|
f173db4c9d
|
英文版用户注册页面身份下拉框显示错误的Bug
|
11 years ago |
|
sw
|
37e5bdee22
|
修复某些课程动态内容为空的BUG #1128
|
11 years ago |
|
sw
|
5f3ab0322b
|
修改竞赛上传图片提示 #1127
|
11 years ago |
|
sw
|
94f6e871b1
|
修改新建用户时企业名不是英文且提示错误的BUG #1130
|
11 years ago |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
11 years ago |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
a3cbcdad51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
f0cee20f11
|
tt
|
11 years ago |
|
sw
|
41d983e904
|
取消过期缺陷邮件的发送(很有问题)！！！
|
11 years ago |
|
sw
|
31e8ad98ae
|
1.修复竞赛作品每次修改之后，都会吧图片清空的BUG
2.修改删除竞赛作品图片功能
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
|
sw
|
01ea6238a4
|
修复竞赛通知描述过长时报错的BUG
|
11 years ago |
|
sw
|
b05e112a3f
|
1.修改邮件服务器配置
2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能
|
11 years ago |
|
sw
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
11 years ago |
|
sw
|
c1bbd8a535
|
对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件
|
11 years ago |
 nwb
|
d6876fabc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1156387161
|
“文件密级”改为“是否公开”
|
11 years ago |
|
sw
|
e344f16f5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
11 years ago |
|
nwb
|
9da116c0e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
11 years ago |
|
sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
11 years ago |
|
z9hang
|
1daec14ab5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
11 years ago |
|
nwb
|
9c9778d433
|
项目的“资料下载”改为“作品下载”
|
11 years ago |
|
nwb
|
f052d0d461
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
11 years ago |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
70003c8374
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/zipdown_controller.rb
|
11 years ago |
|
sw
|
6d5f72326f
|
增加定时任务
|
11 years ago |
|
z9hang
|
7eb1a76734
|
修改编辑贴吧无导航栏、提交失败无提示bug
|
11 years ago |
|
z9hang
|
4542b9e21a
|
积分修改
|
11 years ago |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
11 years ago |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
11 years ago |
|
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
11 years ago |
|
sw
|
ab55043880
|
修复当作业附件列表为空时，点击打包下载会报500错的BUG
|
11 years ago |
|
nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
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 |
|
nwb
|
5adac1a32a
|
课程讨论区回复内容为空时提示
|
11 years ago |
|
nwb
|
b655f0c7b0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
29618d6a72
|
竞赛界面调整
|
11 years ago |
|
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
11 years ago |
|
nwb
|
02b4029e8c
|
资源文件下载界面调整
|
11 years ago |
|
z9hang
|
d9e04bab0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
11 years ago |
|
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
sw
|
b142953a4b
|
1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
|
yanxd
|
37d0560b70
|
test test
|
11 years ago |
|
z9hang
|
cf339edb6c
|
添加首页定制的非空验证，长度验证
|
11 years ago |
|
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
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
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
yanxd
|
803e9cbdb5
|
globel issue#858, 中国高校--输入无效条件点击搜索，建议给出提示信息
|
11 years ago |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
11 years ago |
|
sw
|
41823fbddf
|
test
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
11 years ago |
|
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
ae32b310cd
|
新建竞赛时的日期信息提醒变更
|
11 years ago |
|
z9hang
|
470f40db82
|
去除绝对网址
|
11 years ago |
|
nwb
|
3a7065bb2d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
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
|
ae8093c400
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
41999e64b7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
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 |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
z9hang
|
fe3861c1d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
11 years ago |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
11 years ago |
|
sw
|
063460f119
|
tt
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
 linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
11 years ago |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
11 years ago |
|
nwb
|
b4af75f289
|
部分界面优化
|
11 years ago |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
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 |
|
linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
11 years ago |
|
z9hang
|
773b728828
|
修改：自己不能踩或顶自己
|
11 years ago |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
11 years ago |
|
nwb
|
8a5e1f5d9f
|
界面修改
|
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 |
senluo
|
cc39172d87
|
fix
|
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
|
93d13c8867
|
system bin, 坑
|
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 |
|
wanglinchun
|
d76eec27cc
|
为竞赛通知评论添加登录权限
|
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 |
|
wanglinchun
|
a40db3dc4b
|
首页添加了竞赛所获奖项显示
|
11 years ago |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
11 years ago |
|
sw
|
26b933dddb
|
t
|
11 years ago |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
11 years ago |
|
wanglinchun
|
1393aebace
|
完成了按钮样式
|
11 years ago |
|
yanxd
|
4c7bcd50f5
|
contests delete routes error
|
11 years ago |
yanxd
|
c3865ab319
|
notificationcomments
|
11 years ago |
|
wanglinchun
|
45e12c4bef
|
xx
|
11 years ago |
|
wanglinchun
|
372de9932a
|
英文版竞赛子站完成
|
11 years ago |
|
wanglinchun
|
42aba52111
|
竞赛子站英文版5
|
11 years ago |
|
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
11 years ago |
|
sw
|
8f94985186
|
1.添加作业时权限判断
2.增加作业成员tab页
|
11 years ago |
|
wanglinchun
|
c31c5d49d1
|
竞赛子站英文版4
|
11 years ago |
|
wanglinchun
|
6546d107c8
|
英文版3
|
11 years ago |
|
wanglinchun
|
b1b7c19e58
|
英文版实施2
|
11 years ago |
|
wanglinchun
|
0e09137b99
|
竞赛子站英文版实施中
|
11 years ago |
|
z9hang
|
09368442c6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
wanglinchun
|
040e469cb2
|
竞赛子站国际化
|
11 years ago |
|
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
11 years ago |
|
wanglinchun
|
928d61a3cd
|
国际化竞赛子站
|
11 years ago |
|
wanglinchun
|
bbf7aca174
|
完成了英文版参赛作品页面
|
11 years ago |
|
wanglinchun
|
56ca98ab18
|
完成英文版竞赛列表页面
|
11 years ago |
|
wanglinchun
|
8a2e57d675
|
竞赛列表英文页面完成
|
11 years ago |
|
nwb
|
c1f9f389b7
|
修改课程讨论区视图，从项目中分离
|
11 years ago |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
11 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
11 years ago |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
|
wanglinchun
|
ed84ec633f
|
竞赛通知
|
11 years ago |
|
wanglinchun
|
ae70081288
|
eter
|
11 years ago |
|
z9hang
|
ae5ced6a51
|
课程权限添加（部分）
|
11 years ago |
|
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
11 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
|
sw
|
78ac974a75
|
1.修改课程作业列表界面提交作业
2.修复获取当前用户在指定作业下提交作业方法不正确的问题
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
11 years ago |
|
wanglinchun
|
da26c70f6c
|
修改首页子站入口
|
11 years ago |
|
wanglinchun
|
a38ffb9e9d
|
首页修改4
|
11 years ago |
|
wanglinchun
|
7abeabeadf
|
首页修改3
|
11 years ago |
|
wanglinchun
|
4b54f2949d
|
首页修改2
|
11 years ago |
|
wanglinchun
|
e5a76251a5
|
修改首页2
|
11 years ago |
|
wanglinchun
|
ebcdd2cc9e
|
修改首页英文显示
|
11 years ago |
|
wanglinchun
|
b5be2d58ce
|
英文子站首页
|
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 |
