 z9hang
|
b4be18ab9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/files_controller.rb
|
2014-08-05 16:41:23 +08:00 |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
2014-08-05 16:39:33 +08:00 |
 sw
|
c155ebdfd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-05 15:38:01 +08:00 |
 chenmin
|
fbe3e535b4
|
修复课程资源排序bug
修复课程动态时间段约束bug
|
2014-08-05 15:23:01 +08:00 |
linhk
|
3862f857f7
|
解决当帖子回复条件为空排列次序错误
|
2014-08-05 14:02:39 +08:00 |
|
chenmin
|
8b217735c3
|
1029 修复部分课程资源排序不可用问题
|
2014-08-05 12:00:39 +08:00 |
|
z9hang
|
2c77d1b4cf
|
访问资源库问题
|
2014-08-05 11:10:41 +08:00 |
|
linhk
|
65174ad8ef
|
项目--wiki--重定向/重命名：“重”字被掩盖
|
2014-08-05 09:19:05 +08:00 |
|
linhk
|
f8d7aeebac
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-05 08:49:28 +08:00 |
|
chenmin
|
226d19b912
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-04 17:36:44 +08:00 |
|
sw
|
37e5bdee22
|
修复某些课程动态内容为空的BUG #1128
|
2014-08-04 17:36:07 +08:00 |
|
chenmin
|
8c8127c8d9
|
1016 修复课程显示界面空行问题；
|
2014-08-04 17:36:04 +08:00 |
|
z9hang
|
426ea23d6e
|
回复帖子内容为空时报错问题
|
2014-08-04 17:30:29 +08:00 |
|
sw
|
94f6e871b1
|
修改新建用户时企业名不是英文且提示错误的BUG #1130
|
2014-08-04 15:49:23 +08:00 |
|
sw
|
8b3b1bdcfa
|
取消编辑参赛作品时注意提示
|
2014-08-04 15:36:19 +08:00 |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
2014-08-04 15:01:39 +08:00 |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
2014-08-04 12:23:20 +08:00 |
 linhk
|
653c505471
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-04 09:39:14 +08:00 |
|
sw
|
209c1aeaab
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-02 17:06:39 +08:00 |
|
sw
|
69f7f97bf8
|
修复个人动态主页缺陷描述超出页面的BUG
|
2014-08-02 17:05:56 +08:00 |
zhanghaitao
|
01ab676622
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-02 15:17:21 +08:00 |
|
zhanghaitao
|
5a5ac28833
|
用户列表显示修改
|
2014-08-02 15:16:51 +08:00 |
|
linhk
|
25cfb7aa71
|
解决谷歌浏览器新建版本库文本框会默认填写缓存内容的问题
|
2014-08-02 14:43:05 +08:00 |
|
z9hang
|
ff02c4f9f2
|
修正课程显示老师、学生人数与课程中老师、学生数量不一致问题
修正学校主页课程推荐中显示的课程人数与课程总人数不一致问题
|
2014-08-01 17:43:06 +08:00 |
|
sw
|
c5a7497910
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 17:36:50 +08:00 |
|
sw
|
63cfa9b35a
|
取消打包下载的ajax
|
2014-08-01 16:14:00 +08:00 |
|
z9hang
|
c78047ae98
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 16:01:33 +08:00 |
|
z9hang
|
acb41158e7
|
错误提示页面导航栏添加
登陆时自动忽略登陆名前后空格
|
2014-08-01 16:01:16 +08:00 |
 nwb
|
204ced9490
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 16:00:06 +08:00 |
|
nwb
|
5a2d0ce649
|
issue#1077 新建竞赛的奖金换行显示，长度约束
|
2014-08-01 15:52:18 +08:00 |
|
linhk
|
54a246b6e6
|
中国高校搜索文本Enter快捷操作
|
2014-08-01 15:46:05 +08:00 |
|
z9hang
|
0d46c63c54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 14:55:55 +08:00 |
|
sw
|
9e5f7e6fc6
|
取消主页加入课程链接
|
2014-08-01 14:36:41 +08:00 |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
2014-08-01 14:08:38 +08:00 |
|
zhanghaitao
|
c1519984de
|
Issue#1091,文本显示修改
|
2014-08-01 13:56:12 +08:00 |
|
sw
|
b8f27b51c0
|
取消主页加入课程链接
|
2014-08-01 11:37:14 +08:00 |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
2014-07-31 17:27:01 +08:00 |
|
sw
|
d5ac443f90
|
修复竞赛列表搜索结果不正确的BUG
|
2014-07-31 17:02:30 +08:00 |
|
sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
2014-07-31 14:39:18 +08:00 |
|
sw
|
2c689b6399
|
删除竞赛时删除竞赛下所有作品
|
2014-07-31 14:02:25 +08:00 |
|
sw
|
7b32debb92
|
修复谷歌浏览器用户列表翻到第5页后角色信息和翻页列表在同一行的BUG
|
2014-07-31 13:55:22 +08:00 |
|
sw
|
a9fad79c8d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-31 11:35:50 +08:00 |
|
sw
|
bb6be3ed8a
|
修改html错误
|
2014-07-31 11:35:16 +08:00 |
|
z9hang
|
27feeee03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-31 10:21:33 +08:00 |
|
z9hang
|
8a9e2b47ad
|
调用存储过程刷新项目提交次数
|
2014-07-31 10:21:11 +08:00 |
|
sw
|
a3cbcdad51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-31 10:13:51 +08:00 |
|
sw
|
41d983e904
|
取消过期缺陷邮件的发送(很有问题)！！！
|
2014-07-31 09:45:46 +08:00 |
|
z9hang
|
290d9b1973
|
课程首页课程名过长导致个别信息显示不全问题
|
2014-07-30 16:31:59 +08:00 |
|
z9hang
|
cb6c95c632
|
课程列表提示框里有html标签问题
|
2014-07-30 16:03:23 +08:00 |
|
sw
|
31e8ad98ae
|
1.修复竞赛作品每次修改之后，都会吧图片清空的BUG
2.修改删除竞赛作品图片功能
|
2014-07-30 15:48:13 +08:00 |
|
z9hang
|
4dc2a23f9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-30 15:31:23 +08:00 |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
2014-07-30 15:26:55 +08:00 |
|
sw
|
1f4943483e
|
1.现在竞赛作品名称、开发人员、开发环境的长度
2.修复竞赛作品一上传的图片，编辑时资源列表不显示的问题
|
2014-07-30 13:52:55 +08:00 |
 yanxd
|
281c48c0b3
|
.
|
2014-07-30 10:18:49 +08:00 |
|
z9hang
|
847bb35906
|
修正谷歌浏览器贴吧图标偏移问题
|
2014-07-30 10:00:07 +08:00 |
|
z9hang
|
5800cf5fff
|
修正登陆错误
|
2014-07-30 08:58:28 +08:00 |
|
z9hang
|
952fcce0de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-29 18:04:45 +08:00 |
|
z9hang
|
c60188038e
|
得分机制修改
|
2014-07-29 18:04:35 +08:00 |
|
sw
|
28606f030d
|
修复搜索参赛作品结果翻页跳转不正确的BUG
|
2014-07-29 17:55:14 +08:00 |
|
sw
|
c4aa9aadbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-29 17:47:37 +08:00 |
|
sw
|
b05e112a3f
|
1.修改邮件服务器配置
2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能
|
2014-07-29 17:47:20 +08:00 |
|
sw
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
2014-07-29 17:35:22 +08:00 |
|
nwb
|
81b77bc870
|
文件删除修改
|
2014-07-29 16:14:49 +08:00 |
|
sw
|
c1bbd8a535
|
对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件
|
2014-07-29 14:29:59 +08:00 |
|
sw
|
e7503237f1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-29 11:16:14 +08:00 |
|
z9hang
|
d8fcf8eb9b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-29 10:07:02 +08:00 |
|
z9hang
|
225e3c396a
|
个人得相关分方法添加
|
2014-07-29 10:06:48 +08:00 |
|
sw
|
52dcc6d1a1
|
讨论区帖子添加回复时，取消修改帖子的更新时间。项目最新动态只显示最新的回复，不将帖子创建重复显示
|
2014-07-29 09:16:11 +08:00 |
|
sw
|
e344f16f5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 17:50:13 +08:00 |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
2014-07-28 17:49:28 +08:00 |
|
nwb
|
9da116c0e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 17:14:20 +08:00 |
|
nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
2014-07-28 17:14:02 +08:00 |
|
yanxd
|
bf9a992399
|
活跃度排序不一致
|
2014-07-28 15:37:26 +08:00 |
|
z9hang
|
0d0fb7052e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 15:16:37 +08:00 |
|
sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 15:09:14 +08:00 |
|
z9hang
|
90a35fa24a
|
竞赛、课程首页，贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
|
2014-07-28 15:06:54 +08:00 |
|
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
2014-07-28 14:58:01 +08:00 |
|
nwb
|
2c79a51e48
|
优化文件读取编码解析
|
2014-07-28 14:43:38 +08:00 |
|
z9hang
|
9bf8abd03b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 13:53:57 +08:00 |
|
z9hang
|
a4ecccc048
|
修复贴吧动态中昵称过长回复被挤到不正确位置bug
|
2014-07-28 13:53:39 +08:00 |
|
nwb
|
1b589bf562
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 11:30:02 +08:00 |
|
nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
2014-07-28 11:29:55 +08:00 |
|
yanxd
|
a8ed4272cc
|
ckeditor: 描述中网址后面带有换行，projects列表出错
|
2014-07-28 11:03:39 +08:00 |
|
nwb
|
f8328727cd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 10:46:15 +08:00 |
|
nwb
|
dfdc58719a
|
课程主留言添加删除功能
|
2014-07-28 10:46:05 +08:00 |
|
z9hang
|
1daec14ab5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-28 10:38:23 +08:00 |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
2014-07-28 10:37:22 +08:00 |
|
sw
|
cc215e6c7b
|
修复个人动态图片显示不准确的问题
|
2014-07-28 09:47:11 +08:00 |
|
nwb
|
ef62fc1fac
|
修正缺陷搜索缺陷编号显示问题
|
2014-07-28 09:46:19 +08:00 |
|
nwb
|
f36ccad76a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 09:23:47 +08:00 |
|
yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
2014-07-28 09:22:52 +08:00 |
|
nwb
|
983cdebbb6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-28 09:18:45 +08:00 |
|
nwb
|
00cf448bda
|
用户动态兼容空留言
|
2014-07-28 09:18:24 +08:00 |
|
yanxd
|
4fae105b96
|
project testing.
|
2014-07-25 17:43:19 +08:00 |
|
nwb
|
f052d0d461
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 17:37:07 +08:00 |
|
z9hang
|
a1e06991d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 17:36:11 +08:00 |
|
nwb
|
f8a59220e3
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 17:08:01 +08:00 |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
2014-07-25 16:05:33 +08:00 |
|
sw
|
43efd63dda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 15:42:01 +08:00 |
|
sw
|
b5b246f098
|
修复个性签名未自动换行的问题
|
2014-07-25 15:12:24 +08:00 |
|
nwb
|
c0ac9924e7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 15:09:56 +08:00 |
|
nwb
|
2a4daf04f9
|
删除资源文件修改
|
2014-07-25 15:09:29 +08:00 |
|
sw
|
ea322d6177
|
修复项目提交时间字的长度过长时会换行的BUG
|
2014-07-25 14:51:10 +08:00 |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 14:06:59 +08:00 |
|
nwb
|
6531bf5195
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 14:05:40 +08:00 |
|
nwb
|
735d7f2c1f
|
文件下载权限判断优化
|
2014-07-25 14:05:25 +08:00 |
|
z9hang
|
2c08f39001
|
修改首页简介样式
|
2014-07-25 14:02:23 +08:00 |
|
z9hang
|
d6a425849a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 13:38:20 +08:00 |
|
z9hang
|
34626e03a4
|
调整主页显示图片大小
|
2014-07-25 13:37:49 +08:00 |
|
z9hang
|
5a0d76c1e0
|
竞赛通知发布完成
|
2014-07-25 11:51:52 +08:00 |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
2014-07-25 11:31:16 +08:00 |
|
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-25 11:12:08 +08:00 |
|
sw
|
70003c8374
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/zipdown_controller.rb
|
2014-07-25 11:10:45 +08:00 |
|
sw
|
6d5f72326f
|
增加定时任务
|
2014-07-25 11:09:47 +08:00 |
|
z9hang
|
42f0c49093
|
作业打包下载错误提示页无导航问题
|
2014-07-25 11:08:16 +08:00 |
|
z9hang
|
7eb1a76734
|
修改编辑贴吧无导航栏、提交失败无提示bug
|
2014-07-25 10:42:56 +08:00 |
|
z9hang
|
3b54def1c7
|
首页定制修改
|
2014-07-25 10:01:02 +08:00 |
|
z9hang
|
6ad3a1128e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 09:19:47 +08:00 |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
2014-07-25 09:19:29 +08:00 |
|
z9hang
|
4542b9e21a
|
积分修改
|
2014-07-24 18:05:37 +08:00 |
|
yanxd
|
6a14676248
|
remove pry
|
2014-07-24 17:24:30 +08:00 |
|
yanxd
|
1755d7a790
|
issues controller & unit testing, word log print.
|
2014-07-24 17:23:46 +08:00 |
|
nwb
|
8b0b31f749
|
附件下载更新
|
2014-07-24 11:20:33 +08:00 |
|
sw
|
1b503f3b6d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-24 11:15:51 +08:00 |
|
nwb
|
0fc2e3be21
|
修改BUG
|
2014-07-24 10:43:19 +08:00 |
|
nwb
|
d59ab02db8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-24 10:40:02 +08:00 |
|
nwb
|
990dc3cbff
|
修改项目文档显示
|
2014-07-24 10:39:42 +08:00 |
|
sw
|
dd589c4811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-24 08:50:44 +08:00 |
|
z9hang
|
6b441760c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 17:57:34 +08:00 |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
2014-07-23 17:56:15 +08:00 |
|
yanxd
|
9c3ff51633
|
remove useless navbar method called
|
2014-07-23 11:03:43 +08:00 |
|
sw
|
da05ce5d61
|
t
|
2014-07-23 10:40:53 +08:00 |
|
z9hang
|
fb6cd2e9d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 09:25:17 +08:00 |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
2014-07-23 09:24:26 +08:00 |
|
sw
|
a7debdae98
|
格式化代码
|
2014-07-23 09:16:06 +08:00 |
|
nwb
|
0a06e2033f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 08:43:36 +08:00 |
|
nwb
|
5d22bc5510
|
文件上传修改
|
2014-07-23 08:43:23 +08:00 |
|
yanxd
|
ee95d9b115
|
user_activity page
|
2014-07-22 17:57:11 +08:00 |
|
yanxd
|
18d096f0d8
|
删除项目，竞赛表project_id会置空，projecting_softapplications模型不知道干嘛用，此表也不存在
|
2014-07-22 17:40:32 +08:00 |
|
yanxd
|
cccbd941ce
|
用户删除，管理界面用户去排序，删除后跳转，去无效参数
|
2014-07-22 17:17:42 +08:00 |
|
nwb
|
f22a39fbfa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:56:34 +08:00 |
|
nwb
|
a5d829b95e
|
1.优化课程通知模块
2.优化文件上传
|
2014-07-22 16:49:32 +08:00 |
|
z9hang
|
41ea3a1baf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:00:11 +08:00 |
|
z9hang
|
dee09aad75
|
修复导航bug
|
2014-07-22 15:59:35 +08:00 |
|
nwb
|
8f74241eda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 15:05:27 +08:00 |
|
nwb
|
095cb7fc32
|
加强对chrome浏览器文件上传的支持
|
2014-07-22 15:02:58 +08:00 |
|
sw
|
c2ff861fba
|
1.当作业文件列表为空时报403错提示改为alert提示
2.异常捕获代码后给出js提示：暂时不能下载此文件
|
2014-07-22 14:29:45 +08:00 |
|
sw
|
47ae398748
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 13:49:25 +08:00 |
|
sw
|
de17a84061
|
增加异常捕获，当作业未找到相应文件时，跳到文件未找到页面(不报500错误)
|
2014-07-22 13:48:30 +08:00 |
|
nwb
|
42c2f6c2ee
|
更改项目文档按作者排序
|
2014-07-22 13:47:05 +08:00 |
|
nwb
|
3ba8ba010d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-22 10:52:21 +08:00 |
|
sw
|
d9b9b2152f
|
增加教师功能用户打包下载所有作业的功能
|
2014-07-22 09:56:29 +08:00 |
|
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
2014-07-22 09:52:16 +08:00 |
|
sw
|
58c3e98a21
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-22 09:44:24 +08:00 |
|
sw
|
ab55043880
|
修复当作业附件列表为空时，点击打包下载会报500错的BUG
|
2014-07-22 09:42:41 +08:00 |
|
yanxd
|
87671e9d73
|
base footer merge bug.
|
2014-07-22 09:39:27 +08:00 |
|
nwb
|
5954ba1788
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:32:54 +08:00 |
|
nwb
|
cf11cac0ad
|
项目文档权限判断优化
|
2014-07-22 09:32:46 +08:00 |
|
yanxd
|
8496d6e0d2
|
删除project多余导致删除项目失败的关联关系
|
2014-07-22 09:17:21 +08:00 |
|
yanxd
|
edee2b2327
|
删掉welcome没用的方法
|
2014-07-22 09:17:21 +08:00 |
|
nwb
|
67dfd72845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:15:28 +08:00 |
|
nwb
|
518edeac68
|
项目文档浏览BUG修改
|
2014-07-22 09:15:19 +08:00 |
|
z9hang
|
513fd32ec5
|
修复查看个人动态无权限bug
|
2014-07-22 09:11:37 +08:00 |
|
z9hang
|
221aef4a7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 08:53:24 +08:00 |
|
z9hang
|
3e79dd6e32
|
竞赛通知鼠标悬停
导航丢失问题
|
2014-07-22 08:53:14 +08:00 |
|
nwb
|
b49344107c
|
用户动态权限判定修改
|
2014-07-22 08:51:35 +08:00 |
|
nwb
|
aebae800dd
|
竞赛首页修改
|
2014-07-22 08:37:07 +08:00 |
|
nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 17:50:51 +08:00 |
|
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 17:45:01 +08:00 |
|
sw
|
bfda30ee80
|
1.增加修改竞赛作品页面作品类型、关联项目的默认选择
|
2014-07-21 17:44:14 +08:00 |
|
nwb
|
feaea8375e
|
优化资源下载界面
|
2014-07-21 17:33:13 +08:00 |
|
nwb
|
774eed0dbf
|
优化公开资源的下载权限判断
|
2014-07-21 17:29:30 +08:00 |
|
sw
|
b1251db30c
|
1.修改竞赛作品时增加作品类别下拉框选择
2.修改竞赛作品时增加获取选择其他时作品类别
|
2014-07-21 17:23:45 +08:00 |
|
nwb
|
5e462f1ae7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 17:00:36 +08:00 |
|
nwb
|
51e4d00691
|
课程回复后编辑框隐藏
|
2014-07-21 17:00:27 +08:00 |
|
sw
|
c8aaa2776c
|
1.作品类别增加其他选项，当用户选择其他时，显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
2014-07-21 16:59:00 +08:00 |
|
yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
2014-07-21 16:41:11 +08:00 |
|
nwb
|
222959d1da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 16:19:54 +08:00 |
|
nwb
|
27fda1f938
|
竞赛首页修改
|
2014-07-21 16:19:45 +08:00 |
|
yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
2014-07-21 15:49:23 +08:00 |
|
nwb
|
aea41ba997
|
修改竞赛首页搜索功能
|
2014-07-21 15:45:00 +08:00 |
|
sw
|
890bc7459d
|
修改项目列表页面当管理人员过多时，显示更多。点击更多按钮，跳转到该项目的成员列表页面
|
2014-07-21 15:31:15 +08:00 |
|
nwb
|
5adac1a32a
|
课程讨论区回复内容为空时提示
|
2014-07-21 15:15:10 +08:00 |
|
nwb
|
35ab3a2c7d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 13:53:45 +08:00 |
|
nwb
|
d8d8473811
|
优化课程列表成员数计算
|
2014-07-21 13:52:23 +08:00 |
|
nwb
|
3a249e7196
|
修正课程通知编辑BUG
|
2014-07-21 13:40:38 +08:00 |
|
nwb
|
ec71e8eeeb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 13:37:48 +08:00 |
|
nwb
|
c7f80effb7
|
修正课程讨论区删除帖子BUG
|
2014-07-21 13:37:36 +08:00 |
|
z9hang
|
5e4571d6af
|
修复部分页面导航丢失问题
|
2014-07-21 11:14:17 +08:00 |
|
nwb
|
2a8929b90f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 10:11:36 +08:00 |
|
z9hang
|
162a4cfa84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 16:53:02 +08:00 |
|
z9hang
|
0322258386
|
去掉一个参加竞赛中多出来的项目创建
|
2014-07-19 16:52:43 +08:00 |
|
z9hang
|
376ba1d793
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-07-19 16:48:14 +08:00 |
|
sw
|
8db6b50a65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
|
2014-07-19 16:47:05 +08:00 |
|
sw
|
e24323147d
|
修复项目描述过长不会自动换行的BUG
|
2014-07-19 16:45:27 +08:00 |
|
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
2014-07-19 16:41:29 +08:00 |
|
sw
|
ba66cde840
|
1.优化作业显示界面加载效率
2.修复获取作业的互评得分、综评得分、教师评分不准确的问题
|
2014-07-19 16:38:29 +08:00 |
|
nwb
|
bda9921fb0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 15:58:37 +08:00 |
|
nwb
|
49aa3a994e
|
学时不允许为空
|
2014-07-19 15:58:11 +08:00 |
|
nwb
|
0922715301
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-19 14:41:30 +08:00 |
|
sw
|
6186ff343e
|
去除无效的标签
|
2014-07-19 14:31:25 +08:00 |
|
nwb
|
4259d9c282
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-19 13:28:07 +08:00 |
|
sw
|
fdfba199f3
|
修复评奖位置不正确的问题
|
2014-07-19 13:22:23 +08:00 |
|
sw
|
93d8fd31a0
|
增加作品分类下拉框
|
2014-07-19 13:16:29 +08:00 |
|
sw
|
64f025fe70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
|
2014-07-19 13:16:11 +08:00 |
|
sw
|
71ffdb9164
|
作品分类在下拉列表框中选择
|
2014-07-19 13:13:46 +08:00 |
|
nwb
|
206aeeccfb
|
优化2级菜单效果
|
2014-07-19 11:39:09 +08:00 |
|
sw
|
79c76d26c8
|
创建作品分类表，并插入部分数据
|
2014-07-19 11:35:43 +08:00 |
|
nwb
|
f20f0aaa45
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-19 11:11:58 +08:00 |
|
nwb
|
60fa473608
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 10:59:30 +08:00 |
|
nwb
|
6bced5106e
|
调整课程列表视图
|
2014-07-19 10:55:46 +08:00 |
|
sw
|
9fe4c9f8a2
|
修改竞赛作品列表显示样式与创建作品样式
|
2014-07-19 10:44:23 +08:00 |
|
z9hang
|
599a277af3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 10:36:24 +08:00 |
|
z9hang
|
74ff5d505d
|
修改加入竞赛创建项目链接域名不正确问题
|
2014-07-19 10:36:11 +08:00 |
|
nwb
|
e1edb46ba2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/course.rb
|
2014-07-19 09:42:46 +08:00 |
|
nwb
|
908254b911
|
项目、竞赛首页描述优化，鼠标悬停显示内容优化
|
2014-07-19 09:39:48 +08:00 |
|
yanxd
|
6af11fea68
|
course class period
|
2014-07-18 17:10:41 +08:00 |
|
z9hang
|
40d8ec6c6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:58:25 +08:00 |
|
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
2014-07-18 16:56:00 +08:00 |
|
sw
|
6a42ce143b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 16:53:35 +08:00 |
|
z9hang
|
b44b488807
|
导航栏调整
|
2014-07-18 16:51:41 +08:00 |
|
nwb
|
6780167674
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-18 16:45:58 +08:00 |
|
nwb
|
0e0da39113
|
修改BUG
|
2014-07-18 16:44:40 +08:00 |
|
sw
|
9f02003bb9
|
用户课程列表增加自动换行
|
2014-07-18 16:42:18 +08:00 |
|
nwb
|
0e9a15aad5
|
短描述修改
|
2014-07-18 16:41:55 +08:00 |
|
sw
|
41983833d7
|
用户项目列表增加自动换行
|
2014-07-18 16:40:57 +08:00 |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
2014-07-18 16:39:39 +08:00 |
|
sw
|
e0f5708038
|
修改错误
|
2014-07-18 16:21:20 +08:00 |
|
sw
|
999a252f7b
|
修改软件创客搜索结果显示样式
|
2014-07-18 15:47:48 +08:00 |
|
nwb
|
5087f90a26
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 15:33:56 +08:00 |
|
nwb
|
3b9245d143
|
隐藏新建竞赛作品时的作品类型
|
2014-07-18 15:33:47 +08:00 |
|
sw
|
0f3c2ff558
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 15:00:21 +08:00 |
|
nwb
|
0443f2085e
|
修改首页问题
|
2014-07-18 15:00:03 +08:00 |
|
nwb
|
bc50d5f469
|
允许上传空文件
|
2014-07-18 14:35:44 +08:00 |
|
sw
|
46c7a4bb9f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 14:15:52 +08:00 |
|
sw
|
4a04d47c3c
|
commit
|
2014-07-18 14:15:30 +08:00 |
|
nwb
|
b655f0c7b0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-18 13:50:30 +08:00 |
|
nwb
|
29618d6a72
|
竞赛界面调整
|
2014-07-18 13:48:45 +08:00 |
|
nwb
|
c443de5873
|
去掉课程名称验证
|
2014-07-18 11:49:47 +08:00 |
|
nwb
|
5272a90227
|
修改人数显示
|
2014-07-18 11:35:05 +08:00 |
|
nwb
|
7898bc1dd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 11:25:16 +08:00 |
|
nwb
|
046142f437
|
优化students_for_courses表相关逻辑
|
2014-07-18 11:25:04 +08:00 |
|
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
2014-07-18 11:08:36 +08:00 |
|
sw
|
5838b3e47d
|
不选择新闻时，取消"添加新闻"按钮的显示。不选择问题跟踪时，取消“新建问题”和“自定义查询”按钮的显示,不选择讨论区时，取消“发布新帖”按钮的显示
|
2014-07-18 10:54:22 +08:00 |
|
z9hang
|
057447f810
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 10:49:38 +08:00 |
|
nwb
|
a4d06fbb12
|
课程成员设置为只能使用单一权限
|
2014-07-18 10:29:49 +08:00 |
|
sw
|
6f858795ef
|
项目模块配置未选中wiki时，取消左侧项目工具集的WIKI显示
|
2014-07-18 10:24:49 +08:00 |
|
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
2014-07-18 10:01:54 +08:00 |
|
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
2014-07-18 09:57:47 +08:00 |
|
nwb
|
6968039c87
|
修改课程学生计算函数
|
2014-07-18 09:55:10 +08:00 |
|
z9hang
|
036f8a3870
|
user.trustie.net域名下的用户列表课程项目链接跳转域名不正确
|
2014-07-18 09:46:11 +08:00 |
|
nwb
|
28543e3288
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-18 09:21:21 +08:00 |
|
nwb
|
8eac756ac7
|
1.项目首页的描述更改，不再限制项目描述字数
2.竞赛首页的描述更改，不再限制竞赛描述字数
|
2014-07-18 09:21:09 +08:00 |
|
yanxd
|
164ec645ee
|
boards created frequently, css file file EOF.
|
2014-07-18 09:20:16 +08:00 |
|
z9hang
|
5b7fc4048a
|
user.trustie.net域名下课程主页导航栏多个课程实践菜单
页面跳转时域名不正确问题重新修正
|
2014-07-18 09:11:02 +08:00 |
|
z9hang
|
0f4933240b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-17 18:10:42 +08:00 |
|
z9hang
|
7c3a81735c
|
user。trustie.net域名下跳转到项目页面时主域名没变bug（尚需测试）
user.trustie.net域名下主导航栏多一个项目托管菜单问题
|
2014-07-17 18:10:32 +08:00 |
|
nwb
|
ed00adb3ba
|
优化下载权限判断
|
2014-07-17 17:06:54 +08:00 |
|
nwb
|
3b1b057f0a
|
课程描述自动换行
|
2014-07-17 16:56:45 +08:00 |
|
nwb
|
634ef8df5f
|
界面修改
|
2014-07-17 16:11:32 +08:00 |
|
nwb
|
f4d6696d2e
|
优化资源搜索界面
|
2014-07-17 16:06:10 +08:00 |
|
nwb
|
02b4029e8c
|
资源文件下载界面调整
|
2014-07-17 15:05:49 +08:00 |
|
nwb
|
615b3ac2ac
|
课程界面调整
|
2014-07-17 14:32:07 +08:00 |
|
nwb
|
6a65b2a84b
|
去掉测试代码
|
2014-07-17 10:52:01 +08:00 |
|
nwb
|
0dc2466539
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-17 09:55:52 +08:00 |
|
nwb
|
b60a0ddf59
|
1.添加给gitlab项目新增用户及赋权限接口
2.添加给gitlab项目删除用户接口
|
2014-07-17 09:55:40 +08:00 |
|
yanxd
|
12fb6bf5ca
|
.
|
2014-07-17 09:52:56 +08:00 |
|
nwb
|
63e855725f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-17 09:10:38 +08:00 |
|
nwb
|
a58a747cfa
|
屏蔽用户界面的关注需求功能
|
2014-07-17 09:10:29 +08:00 |
|
yanxd
|
4eee70a845
|
course new/created test
|
2014-07-16 17:46:17 +08:00 |
|
nwb
|
b34a8d6166
|
项目搜索优化
|
2014-07-16 17:25:47 +08:00 |
|
nwb
|
3d8571b59e
|
1.实现新增gitlab用户接口
2.实现删除gitlab用户接口
|
2014-07-16 16:50:28 +08:00 |
|
nwb
|
1f5d792783
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 15:52:52 +08:00 |
|
nwb
|
6dcc50e60b
|
添加gitlab创建项目(版本库)接口
|
2014-07-16 15:52:41 +08:00 |
|
z9hang
|
8d181c4e93
|
迁移文件出错问题
|
2014-07-16 15:32:27 +08:00 |
|
z9hang
|
2cab9f7895
|
热门项目排序添加空值判断，默认按活跃度排序
|
2014-07-16 15:24:56 +08:00 |
|
z9hang
|
ab05bf6f36
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 15:16:20 +08:00 |
|
z9hang
|
494d3af9a4
|
修复贴吧分页问题
|
2014-07-16 15:16:10 +08:00 |
|
nwb
|
36ab954cf9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-16 15:05:57 +08:00 |
|
nwb
|
297fe9a3f4
|
添加gitlab远程登录接口
|
2014-07-16 15:05:16 +08:00 |
|
z9hang
|
d9e04bab0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 14:22:37 +08:00 |
|
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
2014-07-16 14:22:12 +08:00 |
|
nwb
|
62af03debd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 10:36:32 +08:00 |
|
nwb
|
ca7ad03a05
|
1.优化课程动态信息
2.优化项目动态信息
|
2014-07-16 10:36:22 +08:00 |
|
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-16 10:15:43 +08:00 |
|
nwb
|
3254c4a237
|
修正二级菜单名称显示问题
|
2014-07-16 09:45:39 +08:00 |
|
nwb
|
13a3725b06
|
BUG修改
|
2014-07-16 09:28:12 +08:00 |
|
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-15 16:16:13 +08:00 |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
2014-07-15 16:13:50 +08:00 |
|
sw
|
121ffa0342
|
修改缺陷时增加跟踪者的删除和增加功能
|
2014-07-15 15:09:52 +08:00 |
|
sw
|
b142953a4b
|
1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示
|
2014-07-15 10:28:49 +08:00 |
|
sw
|
bff1319c5e
|
去除课程数据兼容代码
|
2014-07-15 09:53:03 +08:00 |
|
sw
|
61ba2c47ee
|
1.修改历史数据中作业为项目时作业显示列表未改变的问题
2.修改作业列表关联项目过长，增加省略号显示和鼠标移动到相应位置的气泡显示
|
2014-07-15 09:43:13 +08:00 |
|
yanxd
|
ec2384f110
|
自动化测试框架
|
2014-07-14 16:36:56 +08:00 |
|
sw
|
8f8fb79a63
|
1.软件创客搜索功能修改表单提交为在js中提交
2.增加判断搜索条件是不是为空
|
2014-07-14 16:29:59 +08:00 |
|
z9hang
|
cf339edb6c
|
添加首页定制的非空验证，长度验证
|
2014-07-14 16:12:58 +08:00 |
|
sw
|
90e28518f2
|
增加学校列表查询时，如查询条件为空，增加提示
|
2014-07-14 15:45:38 +08:00 |
|
nwb
|
1da147684a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-14 15:15:56 +08:00 |
|
nwb
|
2a1a051362
|
课程资源文件密级BUG修正
|
2014-07-14 15:15:28 +08:00 |
|
sw
|
ef95835bc6
|
修复当前用户为超级管理员时，创建项目后，在个人信息的参与项目栏内无该项目的记录
|
2014-07-14 14:49:05 +08:00 |
|
sw
|
31245f6fb2
|
修复软件创客列表中某些用户的用户名显示不为超链接(未激活账户)
|
2014-07-14 13:55:22 +08:00 |
|
sw
|
b704a44dfb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-14 13:54:14 +08:00 |
|
sw
|
7a9b5156c9
|
修复软件创客列表当用户姓名比较长时，用户姓名会被个人得分覆盖掉的BUG
|
2014-07-14 11:46:52 +08:00 |
|
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-14 11:32:01 +08:00 |
|
nwb
|
0031f90c64
|
1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
|
2014-07-14 11:31:24 +08:00 |
|
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
2014-07-14 10:44:07 +08:00 |
|
yanxd
|
fd5747f4dc
|
test 3-framework
|
2014-07-14 10:27:54 +08:00 |
|
z9hang
|
98ddd6940d
|
修正错误
|
2014-07-14 09:31:55 +08:00 |
|
z9hang
|
f44c715cfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-14 09:18:46 +08:00 |
|
z9hang
|
6b6fd2906f
|
竞赛列表。贴吧列表的非空判断
数据迁移报错问题修改
|
2014-07-14 09:18:31 +08:00 |
|
sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-11 14:52:15 +08:00 |
|
sw
|
9da70f9a20
|
调整项目列表样式
|
2014-07-11 14:51:33 +08:00 |
|
sw
|
9472a7eb5c
|
未登录时取消显示我的学校按钮
|
2014-07-11 13:41:05 +08:00 |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-11 11:45:46 +08:00 |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
2014-07-11 11:41:54 +08:00 |
|
nwb
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
2014-07-11 11:38:36 +08:00 |
|
nwb
|
6d698cb5d8
|
下载添加权限判断
|
2014-07-11 11:36:00 +08:00 |
|
sw
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
2014-07-11 10:31:52 +08:00 |
|
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
2014-07-11 09:11:37 +08:00 |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
2014-07-11 09:08:50 +08:00 |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
2014-07-11 09:07:09 +08:00 |
|
sw
|
bed662c2e5
|
修复项目缺陷列表描述显示不正常的BUG
|
2014-07-10 17:42:40 +08:00 |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
2014-07-10 17:38:04 +08:00 |
|
sw
|
86adfaecce
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-10 16:59:59 +08:00 |
|
sw
|
51ef3fa5a1
|
修复主页课程介绍显示有误的BUG
|
2014-07-10 16:58:57 +08:00 |
|
sw
|
7bcb1cbe2e
|
修复个人主页中作业、项目介绍不正确的BUG
|
2014-07-10 16:57:04 +08:00 |
|
sw
|
47ad20421e
|
修复当课程描述中有特殊标签是，课程列表描述显示有误的BUG
|
2014-07-10 16:48:13 +08:00 |
|
yanxd
|
056f86caad
|
can't download, html. after exception return;
|
2014-07-10 16:41:34 +08:00 |
|
sw
|
39434766e3
|
1.修复超级管理员无法访问课程作业列表的BUG
2.修改作业描述样式
|
2014-07-10 16:35:53 +08:00 |
|
yanxd
|
803e9cbdb5
|
globel issue#858, 中国高校--输入无效条件点击搜索，建议给出提示信息
|
2014-07-10 16:21:55 +08:00 |
|
yanxd
|
e573438e43
|
eager_load
|
2014-07-10 15:39:40 +08:00 |
|
yanxd
|
249ea19c0c
|
神坑，users和user_statuses表中，关注信息不同步，按照影响力排序还会有问题。以及users表中在us表没有对应条目，排序中是不会显示的
|
2014-07-10 15:27:24 +08:00 |
|
sw
|
a5518363c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-10 11:31:44 +08:00 |
|
sw
|
65c137e617
|
修复进入课程作业报错的问题
|
2014-07-10 11:27:06 +08:00 |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
2014-07-10 10:15:20 +08:00 |
|
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
2014-07-10 10:05:45 +08:00 |
|
sw
|
76db0e61c3
|
调整页面样式
|
2014-07-10 09:21:24 +08:00 |
|
yanxd
|
91eb7751da
|
issue global 859. 搜索处理空格
|
2014-07-10 09:02:28 +08:00 |
|
Administrator
|
6082eca117
|
test
|
2014-07-10 08:56:52 +08:00 |
|
z9hang
|
4d75fbfcb8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-09 16:02:36 +08:00 |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
2014-07-09 16:02:15 +08:00 |
|
yanxd
|
0998438e67
|
bootstrap fine tuning.
|
2014-07-09 15:20:00 +08:00 |
|
yanxd
|
4259f63fbf
|
预览在issue和new里报错
|
2014-07-09 14:53:29 +08:00 |
|
z9hang
|
fd71435b30
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-09 14:40:11 +08:00 |
|
yanxd
|
38b3e86e62
|
ip=nil
|
2014-07-09 14:38:52 +08:00 |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
2014-07-08 18:02:10 +08:00 |
|
yanxd
|
449b87e38d
|
remove cnzz
|
2014-07-08 15:38:37 +08:00 |
|
z9hang
|
4c6fb2a266
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-08 14:29:34 +08:00 |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
2014-07-08 10:59:20 +08:00 |
|
z9hang
|
0fa552c8d3
|
软件众包中点击我要参与报无权限问题
|
2014-07-08 09:34:41 +08:00 |
|
z9hang
|
b4bf320c2e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-08 09:12:28 +08:00 |
|
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
2014-07-08 09:12:16 +08:00 |
|
yanxd
|
4dbe149b42
|
删掉user里的扩展表信息，防止第一次迁移失败
|
2014-07-07 17:24:51 +08:00 |
|
yanxd
|
ab03962e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-07 16:53:00 +08:00 |
|
yanxd
|
aca63146e9
|
搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法
|
2014-07-07 16:52:39 +08:00 |
|
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-07 16:27:49 +08:00 |
|
nwb
|
8b2199e28c
|
新建竞赛时的日期判断优化
|
2014-07-07 15:01:10 +08:00 |
|
nwb
|
431b4541c3
|
新建竞赛时奖励设置为不能为空
|
2014-07-07 14:37:32 +08:00 |
|
nwb
|
b4ee106ce9
|
竞赛搜索项为空时给出提示
|
2014-07-07 14:31:21 +08:00 |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
2014-07-07 13:41:44 +08:00 |
|
nwb
|
633c4278d8
|
修改课程列表视图
|
2014-07-07 10:12:07 +08:00 |
|
nwb
|
0471446ac8
|
新增、修改缺陷发送邮件的缺陷编写优化
|
2014-07-07 10:07:50 +08:00 |
|
nwb
|
beeb707347
|
用户未登陆时首页不提示“该学校未开设任何课程”
|
2014-07-07 09:37:45 +08:00 |
|
nwb
|
5f18b1a38c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 15:11:57 +08:00 |
|
z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
2014-07-05 14:43:15 +08:00 |
|
nwb
|
fb8e97ff61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/show.html.erb
|
2014-07-05 13:51:41 +08:00 |
|
nwb
|
eb15edd5ff
|
1.添加文档
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
|
2014-07-05 13:31:32 +08:00 |
|
z9hang
|
5c93442c79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:44:21 +08:00 |
|
z9hang
|
01da0852e3
|
新建贴吧错误提示修改
|
2014-07-05 11:44:05 +08:00 |
|
sw
|
6365d01051
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:21:27 +08:00 |
|
sw
|
f1b8b7caed
|
t
|
2014-07-05 11:20:59 +08:00 |
|
z9hang
|
470f40db82
|
去除绝对网址
|
2014-07-05 11:00:01 +08:00 |
|
z9hang
|
011d161f8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:49:57 +08:00 |
|
yanxd
|
db28ecd883
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:40:11 +08:00 |
|
yanxd
|
2fa9a4855c
|
最后创建人信息的正确显示（+去掉了乱78糟的table套table）
div-class内标明activity-title等，内嵌css属性等没有问题再移动出html文件
|
2014-07-05 09:39:58 +08:00 |
|
nwb
|
efbffa7436
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-05 09:34:34 +08:00 |
|
nwb
|
c927bb6fd6
|
首页课程列表修改
|
2014-07-05 09:33:52 +08:00 |
|
z9hang
|
8c65e1ac03
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 16:56:26 +08:00 |
|
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题（尚需测试）
|
2014-07-04 16:55:59 +08:00 |
|
sw
|
8b389776a1
|
打开缺陷列表改为从新建窗口打开
|
2014-07-04 16:14:11 +08:00 |
|
sw
|
65c25feabb
|
修复项目的缺陷模块改版之后，新增缺陷界面找不到的问题
|
2014-07-04 16:00:18 +08:00 |
|
nwb
|
fd25f42e61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 15:41:38 +08:00 |
|
nwb
|
2395ee4b1d
|
留言发送邮件优化
|
2014-07-04 15:41:26 +08:00 |
|
sw
|
eac725a0f4
|
修改作业、用户、课程界面中相关学校的链接
|
2014-07-04 15:21:56 +08:00 |
|
sw
|
698870ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 14:48:06 +08:00 |
|
sw
|
71b17cd98e
|
1
|
2014-07-04 14:47:38 +08:00 |
|
yanxd
|
8ccc39ae71
|
首页更多报错
|
2014-07-04 14:43:57 +08:00 |
|
nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
2014-07-04 14:19:34 +08:00 |
|
sw
|
62bcccedea
|
新建作业时给必填项添加*号
|
2014-07-04 14:04:31 +08:00 |
|
sw
|
bc9f1e5a01
|
1.修改软件创客中每个用户内容显示不一致的BUG
2.去掉用户项目列表最后一个项目后的逗号
|
2014-07-04 13:59:08 +08:00 |
|
nwb
|
164d4f9e78
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-04 13:39:34 +08:00 |
|
nwb
|
b42605accd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 13:38:50 +08:00 |
|
nwb
|
864ef17941
|
清理课程状态表，修正同一课程出现多次的BUG
|
2014-07-04 13:38:34 +08:00 |
|
sw
|
b492ead0c0
|
修改学校链接
|
2014-07-04 11:51:26 +08:00 |
|
sw
|
a1920ca54c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 11:31:09 +08:00 |
|
yanxd
|
36c90f1dfd
|
取不到学校，再拿id直接空指针
|
2014-07-04 11:30:41 +08:00 |
|
sw
|
0e0b8fb8d8
|
历史数据中当课程名称字段为空时从项目列表里获取名称
|
2014-07-04 11:30:22 +08:00 |
|
sw
|
1e6693cdcf
|
1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
|
2014-07-04 11:26:37 +08:00 |
|
yanxd
|
d54f37e630
|
个人动态，判断留言人逻辑有误
|
2014-07-04 11:15:58 +08:00 |
|
nwb
|
3a7065bb2d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-04 11:12:27 +08:00 |
|
nwb
|
ff8994fc9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 11:11:38 +08:00 |
|
nwb
|
08a6dec39d
|
课程讨论区回复时主题只读
|
2014-07-04 11:11:27 +08:00 |
|
sw
|
2506e8e50d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 10:30:14 +08:00 |
|
sw
|
108866b8ba
|
1
|
2014-07-04 10:29:31 +08:00 |
|
sw
|
016ef25019
|
1.注释无效代码
2.修改软件总包列表分页统一使用@bid_count
|
2014-07-04 10:22:35 +08:00 |
|
z9hang
|
d525220aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 10:10:41 +08:00 |
|
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题，修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
2014-07-04 10:10:20 +08:00 |
|
nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 09:10:36 +08:00 |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
2014-07-04 09:10:17 +08:00 |
|
sw
|
7acf73c4ca
|
修复未登陆用户进入学校主页列表出错的问题
|
2014-07-04 08:42:00 +08:00 |
|
sw
|
fd1f3b45c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 18:21:18 +08:00 |
|
nwb
|
6e53796aa9
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 18:21:17 +08:00 |
|
sw
|
f86e889c23
|
修复学校列表链接
|
2014-07-03 18:20:16 +08:00 |
|
nwb
|
42a602a9bc
|
修改首页
|
2014-07-03 18:20:03 +08:00 |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
2014-07-03 18:14:44 +08:00 |
|
sw
|
3e185c3a4b
|
修改学校链接
|
2014-07-03 18:11:10 +08:00 |
|
nwb
|
1a666900c0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 17:30:45 +08:00 |
|
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 17:28:20 +08:00 |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
2014-07-03 17:28:13 +08:00 |
|
sw
|
b42d742c06
|
1.增加我的学校链接
2.修改当我的学校未开设课程时报出的BUG
|
2014-07-03 17:25:51 +08:00 |
|
yanxd
|
271af6ead5
|
Merge branch 'szzh' into develop
|
2014-07-03 17:23:29 +08:00 |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
2014-07-03 17:22:48 +08:00 |
|
sw
|
fe4e1cc175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 16:41:48 +08:00 |
|
nwb
|
a03cdf272e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 16:17:01 +08:00 |
|
nwb
|
9f7951a22c
|
修改BUG
|
2014-07-03 16:16:21 +08:00 |
|
nwb
|
41ff47b839
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 16:08:36 +08:00 |
|
nwb
|
52ddee2b2f
|
界面优化
|
2014-07-03 16:07:30 +08:00 |
|
nwb
|
bc50390a2e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:51:49 +08:00 |
|
nwb
|
5c0b1f3a47
|
修改界面
|
2014-07-03 15:51:18 +08:00 |
|
sw
|
740f6a19ec
|
项目名称唯一
|
2014-07-03 15:50:36 +08:00 |
|
nwb
|
8564f7a904
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:46:51 +08:00 |
|
nwb
|
8d22ccd23a
|
修改BUG
|
2014-07-03 15:45:50 +08:00 |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-03 15:41:15 +08:00 |
|
nwb
|
39b4bd37d4
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:31:43 +08:00 |
|
nwb
|
b928eb6ed8
|
修改课程首页“更多”链接错误
|
2014-07-03 15:30:52 +08:00 |
|
nwb
|
ae8093c400
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:26:26 +08:00 |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
2014-07-03 15:24:06 +08:00 |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-03 10:33:35 +08:00 |
|
nwb
|
41999e64b7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 10:14:12 +08:00 |
|
nwb
|
2d9e0d507e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:12:46 +08:00 |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
2014-07-03 10:12:30 +08:00 |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:09:25 +08:00 |
|
yanxd
|
10a844c67f
|
合并导致的，任务列表分页错误
|
2014-07-03 10:06:57 +08:00 |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
2014-07-03 09:07:09 +08:00 |
|
yanxd
|
663634b9da
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-07-03 09:03:17 +08:00 |
|
z9hang
|
050a780b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 17:07:10 +08:00 |
|
z9hang
|
6f5d6c382b
|
给用户留言的回复若为查看计入新留言数
|
2014-07-02 17:06:34 +08:00 |
|
nwb
|
70dc5e2b49
|
去除主版本库标识允许为空的设置
|
2014-07-02 15:10:33 +08:00 |
|
nwb
|
898ecb443a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 14:59:02 +08:00 |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
2014-07-02 14:58:52 +08:00 |
|
z9hang
|
fe3861c1d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 11:33:00 +08:00 |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
2014-07-02 11:32:49 +08:00 |
|
nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 09:11:56 +08:00 |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
2014-07-02 09:11:45 +08:00 |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
2014-07-01 18:20:30 +08:00 |
xianbo
|
830e2d4fb4
|
隐藏 站长统计
|
2014-07-01 18:18:25 +08:00 |
|
sw
|
063460f119
|
tt
|
2014-07-01 17:49:12 +08:00 |
|
z9hang
|
cc2862ae0f
|
修正缺陷不能踩自己提示错误
|
2014-07-01 17:21:16 +08:00 |
|
z9hang
|
8b0f155be7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 17:13:08 +08:00 |
|
z9hang
|
d34ab220cc
|
登录名区分大小写
|
2014-07-01 17:12:48 +08:00 |
|
nwb
|
138211efba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 16:56:33 +08:00 |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
2014-07-01 16:56:23 +08:00 |
|
z9hang
|
2e38f66899
|
搜索用户修改为按昵称搜索
|
2014-07-01 16:31:40 +08:00 |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
2014-07-01 15:19:08 +08:00 |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
2014-07-01 11:53:55 +08:00 |
|
z9hang
|
0f9c098df9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 10:31:54 +08:00 |
|
z9hang
|
0bcc0beaf1
|
修复留言计分
|
2014-07-01 10:31:44 +08:00 |
|
sw
|
12b6525cc6
|
t
|
2014-07-01 10:29:37 +08:00 |
|
sw
|
bb86ef4612
|
修复获取作业列表时课程老师参数获取不正确的问题
|
2014-07-01 09:23:49 +08:00 |
|
sw
|
bc434a82a4
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2014-07-01 09:23:16 +08:00 |
|
z9hang
|
33c883146a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 09:16:17 +08:00 |
|
z9hang
|
4906bad7d2
|
修正进项目报错异常
|
2014-07-01 09:15:53 +08:00 |
|
sw
|
98d2c144ae
|
修改时间排序为升序排序
|
2014-06-30 17:52:01 +08:00 |
|
nwb
|
671eaa8d45
|
测试
|
2014-06-30 17:49:55 +08:00 |
|
sw
|
d03718e30f
|
修复新评分规则下按分数排序不正确的问题
|
2014-06-30 17:44:29 +08:00 |
|
nwb
|
6141cc56e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-30 17:26:25 +08:00 |
|
nwb
|
e863c30352
|
部分BUG修正
|
2014-06-30 17:26:11 +08:00 |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
2014-06-30 16:19:28 +08:00 |
|
sw
|
f6d9bfc91d
|
修改新建作业时传递参数
|
2014-06-30 11:15:52 +08:00 |
|
sw
|
be2faea15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/bids_controller.rb
app/views/courses/new_homework.html.erb
|
2014-06-30 11:15:25 +08:00 |
 linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
2014-06-28 08:51:23 +08:00 |
|
nwb
|
25a3114a5a
|
老师的学生列表显示为真实姓名
|
2014-06-27 16:44:53 +08:00 |
|
nwb
|
917288c84c
|
修正课程讨论区、课程通知等创建时BUG修正
|
2014-06-27 15:58:41 +08:00 |
|
sw
|
3f8f141107
|
修复 创建作业时，由于输入参数错误导致保存失败后，再次输入错误参数会报错。如再次输入参数正确，会进入一个空白页面 的BUG
|
2014-06-27 15:35:55 +08:00 |
|
nwb
|
99c9f81aea
|
BUG修正
|
2014-06-27 15:26:42 +08:00 |
|
nwb
|
1a4ee62853
|
修正课程错误信息显示2遍的问题
|
2014-06-27 14:17:21 +08:00 |
|
nwb
|
ad97066a45
|
课程名称有效性判断
|
2014-06-27 11:42:45 +08:00 |
|
nwb
|
c0f0e294e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-27 11:25:00 +08:00 |
|
nwb
|
beeab518e8
|
课程动态中留言链接BUG修复
|
2014-06-27 11:24:48 +08:00 |
|
z9hang
|
0717148a0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-27 11:15:20 +08:00 |
|
z9hang
|
bc587f3e7d
|
屏蔽个人分数实时刷新功能
修复个人分数计分异常
|
2014-06-27 11:15:10 +08:00 |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
2014-06-27 10:50:23 +08:00 |
|
sw
|
09d79ae4e0
|
添加作业增加默认日期为当前时间的下一天
|
2014-06-27 10:10:30 +08:00 |
|
sw
|
745727b8e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:55:18 +08:00 |
|
z9hang
|
d57688413e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:55:21 +08:00 |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
2014-06-26 17:55:01 +08:00 |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
2014-06-26 17:49:23 +08:00 |
|
nwb
|
33baf88886
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 17:47:40 +08:00 |
|
nwb
|
38baa247bf
|
BUG修正
|
2014-06-26 17:47:27 +08:00 |
|
sw
|
12b16f0bb6
|
1.修复作业界面点击所属任务链接出错的BUG
2.点击所属任务返回作业列表界面
|
2014-06-26 16:47:49 +08:00 |
|
z9hang
|
2501f31ef1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-06-26 15:15:46 +08:00 |
|
z9hang
|
7399e1aca2
|
添加项目个人得分统计功能
|
2014-06-26 15:05:24 +08:00 |
|
sw
|
392dc0c365
|
增加访问作业显示列表的权限
|
2014-06-26 14:58:59 +08:00 |
|
sw
|
dbd5c49246
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 14:48:31 +08:00 |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
2014-06-26 14:47:29 +08:00 |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
2014-06-26 14:42:32 +08:00 |
|
sw
|
56ce9e8bdb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-26 11:41:10 +08:00 |
|
sw
|
c4b2c47dc7
|
调整作业显示样式
|
2014-06-26 11:40:54 +08:00 |
|
sw
|
12087f40c7
|
1.当作业未选定项目时，项目得分为灰色的N/A，选定了项目，项目得分为橘色的分数
2.当无人对作业进行互评、综评时，作业的互评、综评得分为灰色的N/A，有人进行评分则为橘色的分数
3.简化代码
|
2014-06-26 11:22:48 +08:00 |
|
nwb
|
b4af75f289
|
部分界面优化
|
2014-06-26 11:15:06 +08:00 |
|
sw
|
7702b746c6
|
修复作业显示界面，提交作业按钮不显示的问题
|
2014-06-26 10:55:50 +08:00 |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
2014-06-26 10:01:44 +08:00 |
|
nwb
|
88c3347f7c
|
修正合并分支后的创建课程错误
|
2014-06-26 09:15:56 +08:00 |
|
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
|
2014-06-26 08:53:16 +08:00 |
|
z9hang
|
b04992b226
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-24 18:07:14 +08:00 |
|
z9hang
|
57cdb55282
|
修正get_level方法是用错误
仿照用户得分规则实现项目个人得分
|
2014-06-24 17:31:39 +08:00 |
|
nwb
|
d5665c7bb7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-24 15:42:39 +08:00 |
|
nwb
|
ae3457e68b
|
1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
|
2014-06-24 15:42:28 +08:00 |
|
z9hang
|
02e221eedb
|
修改：网站中的旧分数显示为新分数
|
2014-06-24 13:57:51 +08:00 |
|
nwb
|
6a2c486f62
|
修改作业数为10倍数时的显示BUG
|
2014-06-24 09:58:05 +08:00 |
|
sw
|
c320ede205
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-24 09:24:29 +08:00 |
|
linchun
|
c1e780a0f8
|
yan
|
2014-06-23 18:48:57 +08:00 |
|
linchun
|
0c501022fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-06-23 18:06:29 +08:00 |
|
z9hang
|
dc1bd010f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-23 17:59:10 +08:00 |
|
nwb
|
e367c03f6e
|
修正课程作业列表显示BUG
|
2014-06-23 17:50:45 +08:00 |
|
z9hang
|
df89e5e173
|
去掉多的一个分数显示
|
2014-06-23 17:49:20 +08:00 |
|
linchun
|
e602c0f149
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-06-23 17:18:17 +08:00 |
|
nwb
|
ef61e41d48
|
去掉首页缓存
|
2014-06-23 16:00:10 +08:00 |
|
linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
2014-06-23 15:06:37 +08:00 |
|
sw
|
91408cc960
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-23 14:59:41 +08:00 |
|
sw
|
358d4a53b8
|
修复未公开项目动态仍在主页最新动态显示的问题
|
2014-06-23 14:19:01 +08:00 |
|
z9hang
|
773b728828
|
修改：自己不能踩或顶自己
|
2014-06-23 11:17:42 +08:00 |
|
sw
|
0dce86d47e
|
修改首页项目显示为按活跃度排名的前10个项目
|
2014-06-23 09:42:08 +08:00 |
|
z9hang
|
f16bec924c
|
处理undefined method `update_user_level' for nil:NilClass问题
|
2014-06-23 09:27:21 +08:00 |
|
z9hang
|
9d9bc76af4
|
定时刷新分数
|
2014-06-21 17:06:08 +08:00 |
|
z9hang
|
24172c85c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-21 16:45:15 +08:00 |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
2014-06-21 15:34:10 +08:00 |
|
sw
|
339b5b0296
|
缺陷编辑页面直接显示，不需要点击留言按钮才显示缺陷编辑页面
|
2014-06-20 17:14:43 +08:00 |
|
sw
|
05659fa2db
|
修复注册后在”修改资料“中发现我在注册时选择的”学生“身份和地区信息以及学号信息都没有了，需要重新填写。
|
2014-06-20 14:45:41 +08:00 |
|
z9hang
|
55b28296a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-20 14:04:24 +08:00 |
|
z9hang
|
54d4b957ee
|
修复竖排的踩顶图标在踩或顶完后变成横排问题
|
2014-06-20 14:04:11 +08:00 |
|
sw
|
18762e2da7
|
增加、修改作业时提交项目增加空值选择，即不选定任何关联项目
|
2014-06-20 13:52:17 +08:00 |
|
sw
|
d2376eb0b1
|
将页面部分jS代码转为JQuary代码
|
2014-06-20 11:16:08 +08:00 |
|
sw
|
d0c9390e91
|
增加什么是项目链接。点击什么是项目 实现jQuary窗帘效果显示解释
|
2014-06-20 10:52:34 +08:00 |
|
nwb
|
8cdab80d31
|
用户课程界面链接BUG修改
|
2014-06-20 10:32:51 +08:00 |
|
sw
|
5277eddb95
|
封装获取一个作业参与人员方法
|
2014-06-20 09:40:12 +08:00 |
|
nwb
|
6039cf63af
|
课程讨论区文件上传权限优化
|
2014-06-20 09:08:18 +08:00 |
|
sw
|
600ec536b3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-19 20:15:46 +08:00 |
|
sw
|
989407dad2
|
12
|
2014-06-19 20:15:15 +08:00 |
|
sw
|
09eae9e253
|
1.作业列表增加项目得分显示
2.封装获取指定项目得分的方法，并保留2位有效数字
|
2014-06-19 20:14:48 +08:00 |
|
sw
|
36fecfc635
|
1.界面颜色调整
2.得分显示取消“分”字
|
2014-06-19 19:48:03 +08:00 |
|
sw
|
19530df395
|
作业附件显示修改
|
2014-06-19 19:14:51 +08:00 |
|
z9hang
|
2ee5b422fb
|
RolesController.rb移回app/controls
|
2014-06-19 18:16:55 +08:00 |
|
sw
|
463edeee71
|
1.修复未开启互评功能作业总评得分计算不正确的问题
2.修复未选择项目新建、修改有误的BUG
|
2014-06-19 17:49:18 +08:00 |
|
sw
|
e43a84ab4b
|
1.修复作业无关联项目是进入编辑界面报错的问题
2.修复作业综评页面不会及时更新的问题
|
2014-06-19 17:00:40 +08:00 |
|
sw
|
59e6433938
|
修复获取当前用户建立项目不正确的问题
|
2014-06-19 16:52:53 +08:00 |
|
z9hang
|
a764888055
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-19 16:05:30 +08:00 |
|
z9hang
|
31049fcf4e
|
修复同时更新缺陷状态和缺陷完成度时只有缺陷完成度加分及记录分数变化细节，缺陷状态更改操作未加分及记录分数变化细节bug
|
2014-06-19 15:59:55 +08:00 |
|
sw
|
4d06d26303
|
优化新建作业页面显示
|
2014-06-19 15:58:49 +08:00 |
|
sw
|
f3f303e6e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-19 15:56:07 +08:00 |
|
sw
|
ef234d8c50
|
1.按照新的评分规则修改作业得分
2.修改作业列表显示界面
3.增加获取作业的互评得分、教师评分、最终评分方法
|
2014-06-19 15:55:42 +08:00 |
|
nwb
|
0736dd1254
|
课程讨论区回复权限和界面BUG修正
|
2014-06-19 15:50:42 +08:00 |
|
z9hang
|
9e4dbcc08e
|
加回学校主页学校的超链接
|
2014-06-19 15:31:30 +08:00 |
|
z9hang
|
3e37a54a0f
|
修复竞赛处不能留言问题
|
2014-06-19 14:44:58 +08:00 |
|
z9hang
|
f2cb1390da
|
修复带pre标签缺陷留言的显示问题
|
2014-06-19 14:33:57 +08:00 |
|
sw
|
d38e009469
|
取消学号显示，增加参与人员在作业列表的显示
|
2014-06-19 14:01:18 +08:00 |
|
sw
|
71bb76ff91
|
作业显示界面页面改造，实现新的页面显示效果
|
2014-06-19 13:51:39 +08:00 |
|
nwb
|
8a5e1f5d9f
|
界面修改
|
2014-06-19 11:45:02 +08:00 |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
2014-06-19 10:45:30 +08:00 |
|
nwb
|
f5c9123647
|
管理员创建课程逻辑修改，管理员创建课程后成为该课程成员
|
2014-06-19 09:37:58 +08:00 |
|
z9hang
|
3c89de4c81
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-18 17:35:26 +08:00 |
|
z9hang
|
c0d97870d5
|
项目=》文档 文档提交者添加超链接
|
2014-06-18 17:35:05 +08:00 |
|
sw
|
2f66296b62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-18 17:30:42 +08:00 |
|
nwb
|
f0b016bcbe
|
讨论区留言编辑修改
|
2014-06-18 16:45:33 +08:00 |
|
nwb
|
e17090d506
|
修改课程通知show方法，并添加独立视图
|
2014-06-18 16:29:29 +08:00 |
|
nwb
|
462e5ab589
|
修改课程资源文件类型编辑BUG
|
2014-06-18 15:48:06 +08:00 |
|
nwb
|
80145c5c3b
|
修改课程列表动态数显示不正确的BUG
|
2014-06-18 15:18:30 +08:00 |
|
z9hang
|
d2db58050d
|
修复部分未填工作单位报错问题
|
2014-06-18 14:21:05 +08:00 |
|
z9hang
|
08ba10c32d
|
添加超链接
已添加的超链接：
学校主页，课程信息中的学校名称
竞赛中项目列表： 参赛人
竞赛中参入竞赛tab页：参赛代表
修改作业界面教师单位不显示问题，并添加超链接
作业界面作业名称添加超链接
软件众包页面：软件众包名称
软件众包页面：关注栏下头像添加链接，参与项目栏：图片添加链接
贴吧帖子：修复 发帖回帖下方 “由xxx在XXX之前添加”中名子未链接问题
|
2014-06-18 11:42:59 +08:00 |
|
nwb
|
0480405afb
|
1.修改原课程各数据迁移文件BUG
2.迁移课程学生数据
|
2014-06-18 11:08:44 +08:00 |
|
sw
|
efb6c1fd19
|
1.修改、新增作业增加提交项目选项(可以为空)
2.homework_attach与project增加关联关系
|
2014-06-18 10:07:19 +08:00 |
|
sw
|
872357cdf4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-18 08:35:11 +08:00 |
|
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目，以及数据更新项目的实现
|
2014-06-17 18:49:21 +08:00 |
|
yanxd
|
8840a11a99
|
attachments error
|
2014-06-17 18:38:13 +08:00 |
|
yanxd
|
9b707f2b5a
|
a
|
2014-06-17 18:03:50 +08:00 |
|
nwb
|
3afb70bf84
|
主讲教师修改为不允许退出课程
|
2014-06-17 17:48:02 +08:00 |
|
z9hang
|
1cb1eeeb1d
|
个人主页：姓名、工作单位
课程主页：课程名称、教师单位
项目主页：项目名称
竞赛主页：竞赛名称
主页：课程列=>单位名称
修复部分个人主页报错问题
|
2014-06-17 17:41:59 +08:00 |
|
z9hang
|
ab486aa811
|
补充user_score_details Model及数据迁移文件
|
2014-06-17 15:59:34 +08:00 |
|
z9hang
|
da3aa7b291
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-17 15:57:40 +08:00 |
|
z9hang
|
50dbe3d04a
|
添加记录得分变化功能
|
2014-06-17 15:57:31 +08:00 |
|
nwb
|
726697a69b
|
BUG修改
|
2014-06-17 15:31:33 +08:00 |
|
nwb
|
0de6cc8a31
|
修改作业基础视图
|
2014-06-17 15:20:39 +08:00 |
|
nwb
|
ec72bb2904
|
编辑作业逻辑修改
|
2014-06-17 15:17:04 +08:00 |
|
yanxd
|
b76f1c2b12
|
管理员用户粉丝列表出错。
|
2014-06-17 15:16:17 +08:00 |
|
nwb
|
936c40b490
|
提交作业逻辑和视图修改
|
2014-06-17 15:06:31 +08:00 |
|
yanxd
|
2000f1ddf6
|
人物注册地址信息会保存两次的问题。
|
2014-06-17 14:42:08 +08:00 |
|
yanxd
|
2f724aa23e
|
xss 过滤memo content中的标签
|
2014-06-17 11:49:24 +08:00 |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
2014-06-17 11:32:41 +08:00 |
|
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 |
|
nwb
|
cdaa27b52b
|
文件上传去掉tag显示
|
2014-06-17 09:22:10 +08:00 |
|
z9hang
|
f9a17241da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-17 09:01:23 +08:00 |
|
z9hang
|
9e53ad67d0
|
去除个人分数显示的链接
|
2014-06-17 09:01:09 +08:00 |
senluo
|
cde34e42bc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-06-16 19:42:43 +08:00 |
|
z9hang
|
697a6034b2
|
新得分显示
|
2014-06-16 17:50:28 +08:00 |
|
nwb
|
99e5644c4e
|
去掉上传文件的标签编辑
|
2014-06-16 17:45:14 +08:00 |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
2014-06-16 17:14:05 +08:00 |
|
nwb
|
b4e78d2b0c
|
课程添加成员逻辑更改
|
2014-06-16 15:00:35 +08:00 |
|
nwb
|
2a4486bf0d
|
修改迁移文件
|
2014-06-16 14:42:48 +08:00 |
|
nwb
|
e698f3a6c6
|
修改新建课程成员时的唯一性判断
|
2014-06-16 11:34:56 +08:00 |
|
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
2014-06-16 10:38:38 +08:00 |
|
nwb
|
755e758596
|
优化课程资源文件动态和权限判断
|
2014-06-16 09:48:55 +08:00 |
|
yanxd
|
47e6c3eedd
|
home cache
|
2014-06-16 09:19:21 +08:00 |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-16 09:18:48 +08:00 |
|
yanxd
|
c5d892a214
|
footer
|
2014-06-16 08:47:42 +08:00 |
|
senluo
|
ac850dd6f6
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-06-13 17:48:25 +08:00 |
|
senluo
|
b702411a65
|
fix contest show lichun
|
2014-06-13 17:46:58 +08:00 |
|
yanxd
|
579f1d4d31
|
start align-center
|
2014-06-13 17:32:05 +08:00 |
|
z9hang
|
b727d023b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-13 16:58:49 +08:00 |
|
yanxd
|
955fece267
|
merge develop
|
2014-06-13 16:52:12 +08:00 |
|
yanxd
|
b356145d71
|
course logo
|
2014-06-13 16:46:57 +08:00 |
|
yanxd
|
3fd7104448
|
welcome index obj.includes, routes add school logo
|
2014-06-13 16:37:38 +08:00 |
|
nwb
|
b2756650cf
|
修正课程留言动态引起的首页错误
|
2014-06-13 16:18:03 +08:00 |
|
yanxd
|
07e4d40d44
|
cache obj
|
2014-06-13 16:13:32 +08:00 |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
2014-06-13 16:09:43 +08:00 |
|
yanxd
|
93d13c8867
|
system bin, 坑
|
2014-06-13 15:42:59 +08:00 |
|
yanxd
|
7456e37e8a
|
home
|
2014-06-13 12:04:15 +08:00 |
|
yanxd
|
eff2da732b
|
home
|
2014-06-13 12:02:29 +08:00 |
|
nwb
|
8a274981ce
|
修改课程动态
|
2014-06-13 11:49:28 +08:00 |
|
yanxd
|
ceef85719e
|
contest fix
|
2014-06-13 11:49:11 +08:00 |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
2014-06-13 10:59:43 +08:00 |
|
yanxd
|
362570e34b
|
contestnotification_edit function
|
2014-06-13 09:38:51 +08:00 |
|
nwb
|
054cfbcafc
|
修改课程搜索功能
|
2014-06-13 08:39:17 +08:00 |
|
z9hang
|
621346268f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-13 08:37:11 +08:00 |
|
yanxd
|
b58c5685ac
|
Merge branch 'szzh' into develop
|
2014-06-13 08:36:24 +08:00 |
|
yanxd
|
f8bfa83ae4
|
move cache
|
2014-06-13 08:35:37 +08:00 |
|
z9hang
|
e8d561b4ba
|
修正贴吧顶踩加分无效问题
|
2014-06-12 17:39:44 +08:00 |
|
wanglinchun
|
8618b73a8c
|
本次安卓校园竞赛获奖结果更新，首页正常显示
|
2014-06-12 16:58:01 +08:00 |
|
nwb
|
b178be984d
|
添加课程搜索处理
|
2014-06-12 16:55:56 +08:00 |
|
z9hang
|
f7fc4d06a2
|
添加贴吧帖子顶踩功能
|
2014-06-12 16:46:54 +08:00 |
|
sw
|
b7458abd9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 16:43:34 +08:00 |
|
sw
|
277aa81a60
|
修复占位列表界面显示的作业描述样式不正确的问题
|
2014-06-12 16:43:02 +08:00 |
|
z9hang
|
4fb96bacdc
|
修正更新用户等级方法，保证每个用户只有一条记录
|
2014-06-12 16:41:48 +08:00 |
|
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
2014-06-12 16:39:35 +08:00 |
|
z9hang
|
a42c79cea2
|
添加用户升级功能（用户达到一定条件时自动升级，未在前端体现）
|
2014-06-12 16:35:59 +08:00 |
|
nwb
|
c8900c279c
|
课程标签增加、删除
|
2014-06-12 16:22:35 +08:00 |
|
yanxd
|
858a7936b5
|
revert userscore catch exception, added cache to footer.
|
2014-06-12 16:19:46 +08:00 |
|
nwb
|
3933817570
|
1.修改课程配置界面
2.新增课程成员修改
3.删除课程成员修改
4.课程成员类型更改支持
|
2014-06-12 16:01:38 +08:00 |
|
sw
|
8075645591
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:48:58 +08:00 |
|
yanxd
|
cccb19e733
|
cnzz
|
2014-06-12 15:46:16 +08:00 |
|
sw
|
9bd8132359
|
修复作业无法留言、无法综评的BUG
|
2014-06-12 15:42:58 +08:00 |
|
wanglinchun
|
52e7be1b1d
|
修改首页中评奖结果的显示字体
|
2014-06-12 15:37:45 +08:00 |
|
sw
|
f4961cbc50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:27:17 +08:00 |
|
sw
|
a100193373
|
1.作业参与人员可以对作业进行修改，但不能进行删除
2.作业成员(发布人员和参与人员)不能对作业进行评分
3.修改进行作业删除、添加、修改、添加成员等方法的权限判断
|
2014-06-12 15:25:59 +08:00 |
|
yanxd
|
efdbf3e808
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:20:22 +08:00 |
|
yanxd
|
09edfc7c0c
|
cache test
|
2014-06-12 15:20:14 +08:00 |
|
z9hang
|
5a47c52d23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:13:05 +08:00 |
|
z9hang
|
ebbd4b0642
|
课程讨论区踩顶帖子
会员等级计算（占位实现自动升级）
技术得分计算
|
2014-06-12 15:12:55 +08:00 |
|
sw
|
8ed95f132a
|
1.修改、新建占位页面增加导航栏
2.作业的作者不能对作业进行评分
|
2014-06-12 15:05:39 +08:00 |
|
nwb
|
ae8fcca14f
|
1.课程接触视图修改
2.添加课程成员列表视图
|
2014-06-12 14:57:25 +08:00 |
|
sw
|
025b8971e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 14:44:13 +08:00 |
|
sw
|
d832a5eecf
|
rake db:migrate
|
2014-06-12 14:43:51 +08:00 |
|
nwb
|
165dbc3f78
|
修改words_controller与课程相关方法及视图
|
2014-06-12 11:34:47 +08:00 |
|
wanglinchun
|
15c88df72d
|
为发布竞赛通知添加权限
|
2014-06-12 11:17:09 +08:00 |
|
wanglinchun
|
d76eec27cc
|
为竞赛通知评论添加登录权限
|
2014-06-12 11:11:12 +08:00 |
|
wanglinchun
|
60bdff86a1
|
竞赛通知增加权限限制
|
2014-06-12 10:59:05 +08:00 |
|
nwb
|
517a29116f
|
修改message_controller与课程相关方法及视图
|
2014-06-12 10:53:34 +08:00 |
|
yanxd
|
e4ed8cf970
|
分数显示整数
|
2014-06-12 10:52:22 +08:00 |
|
nwb
|
863dec03d2
|
添加课程讨论区show视图
|
2014-06-12 10:03:01 +08:00 |
|
nwb
|
70901832a8
|
1.修改课程讨论区control index、show方法及路由
2.BoardsHelper添加课程相关方法
|
2014-06-12 09:44:22 +08:00 |
|
wanglinchun
|
bb06ee921a
|
sdf
|
2014-06-12 09:35:34 +08:00 |
|
nwb
|
814233d245
|
1.修改课程通知保存功能
|
2014-06-12 09:23:44 +08:00 |
|
nwb
|
97d920c195
|
修改新增课程通知视图
|
2014-06-12 09:20:39 +08:00 |
|
z9hang
|
a8670ba6fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 08:47:40 +08:00 |
|
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
2014-06-11 17:51:14 +08:00 |
|
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
2014-06-11 17:41:47 +08:00 |
|
sw
|
29fa624e9d
|
封装获取作业成员的方法
|
2014-06-11 17:41:06 +08:00 |
|
sw
|
19fc84afee
|
作业增加成员、删除成员增加权限控制
|
2014-06-11 17:34:57 +08:00 |
|
sw
|
43736ba8d6
|
兼容历史数据
|
2014-06-11 17:00:23 +08:00 |
|
sw
|
541ced18ec
|
作业显示界面增加导航栏
|
2014-06-11 16:53:07 +08:00 |
|
nwb
|
3165d97417
|
1.迁移课程新闻数据
2.添加课程新闻index视图
|
2014-06-11 16:46:13 +08:00 |
|
sw
|
a681aa76cb
|
1.修复进入互评界面的报错
2.互评界面增加参与人员显示
3.添加成员页面开发人员改为参与人员
|
2014-06-11 16:17:35 +08:00 |
|
nwb
|
7677e092e0
|
添加课程资源文件分类显示视图
|
2014-06-11 16:14:49 +08:00 |
|
sw
|
872b7efb84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-11 15:54:40 +08:00 |
|
sw
|
2abd8187d0
|
增加搜索用户功能
|
2014-06-11 15:54:17 +08:00 |
|
nwb
|
59051972e1
|
1.修改课程资源删除
2.修改课程资源上传后的界面刷新
|
2014-06-11 15:52:47 +08:00 |
|
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
2014-06-11 15:28:13 +08:00 |
|
nwb
|
149d7ef1f4
|
修改课程资源文件上传功能
|
2014-06-11 11:31:35 +08:00 |
|
nwb
|
cb2c5960fc
|
修改资源文件activity事件BUG
|
2014-06-11 11:13:59 +08:00 |
|
wanglinchun
|
734d246618
|
sdf
|
2014-06-11 11:13:10 +08:00 |
|
wanglinchun
|
877d8f8439
|
etr
|
2014-06-11 11:06:37 +08:00 |
|
nwb
|
b6c9415a4b
|
1.给各角色添加浏览课程资源文件权限
2.修改课程动态显示逻辑
|
2014-06-11 11:04:38 +08:00 |
|
yanxd
|
b364b8148f
|
document show html. separate attachment.
|
2014-06-11 09:25:27 +08:00 |
|
wanglinchun
|
5ef8626d71
|
完成了竞赛子站首页显示安卓竞赛结果的代码及布局设置
|
2014-06-11 09:11:05 +08:00 |
|
z9hang
|
e8b25aef06
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-10 17:47:26 +08:00 |
|
z9hang
|
7eb3c9f874
|
缺陷留言+1分、
更改缺陷状态+1分、
对留言回复+1分、
对帖子的回复+1分、
添加分数修正方法，分数为负时修正为0
|
2014-06-10 17:47:10 +08:00 |
|
yanxd
|
13a65821e2
|
坑
|
2014-06-10 17:33:40 +08:00 |
|
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
2014-06-10 17:33:31 +08:00 |
|
wanglinchun
|
a40db3dc4b
|
首页添加了竞赛所获奖项显示
|
2014-06-10 17:17:31 +08:00 |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
2014-06-10 17:03:02 +08:00 |
|
yanxd
|
73f5bab075
|
document css/
wiki h2 bug
|
2014-06-10 15:59:57 +08:00 |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
2014-06-10 15:44:37 +08:00 |
|
sw
|
cbb348dc0e
|
实现给作业增加用户页面相关js代码及css代码
|
2014-06-10 15:44:10 +08:00 |
|
sw
|
67c9fefba6
|
增加tab页切换的js
|
2014-06-10 14:27:55 +08:00 |
|
nwb
|
a20feafa4e
|
1.添加课程动态model
2.优化课程动态逻辑及权限处理
|
2014-06-10 11:49:28 +08:00 |
|
yanxd
|
541b22b84d
|
score statistics init
|
2014-06-10 10:42:41 +08:00 |
|
sw
|
787e043650
|
1.修改下载作业时的错误
2.修改判断是不是为当前课程学生、老师的方法
|
2014-06-10 09:56:00 +08:00 |
|
sw
|
26b933dddb
|
t
|
2014-06-10 08:59:31 +08:00 |
|
sw
|
e5fec207aa
|
1.修改判断当前用户是否为指定课程成员、学生、老师的方法
2.新建作业时获取当前项目学生方法
3.增加checkbox生成方法
|
2014-06-10 08:47:21 +08:00 |
|
z9hang
|
cae0893ea6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-09 17:38:01 +08:00 |
|
z9hang
|
ee030e6fb5
|
讨论区发帖协同得分+2
|
2014-06-09 17:37:48 +08:00 |
|
nwb
|
8768193e72
|
添加课程资源文件全部列表视图
|
2014-06-09 17:33:43 +08:00 |
|
wanglinchun
|
a5b6883994
|
修改编辑竞赛通知bug
|
2014-06-09 17:32:18 +08:00 |
|
wanglinchun
|
c7cecdecea
|
给竞赛通知评论添加取消按钮
|
2014-06-09 16:11:54 +08:00 |
|
wanglinchun
|
ca62bcd5c8
|
完成了取消竞赛通知按钮功能
|
2014-06-09 16:08:35 +08:00 |
|
sw
|
58bb6d269d
|
取消名字前面的时间
|
2014-06-09 15:41:02 +08:00 |
|
yanxd
|
ff6373badc
|
看用户列表出错
|
2014-06-09 15:07:08 +08:00 |
|
nwb
|
54e3fdba3f
|
添加课程资源文件new视图
|
2014-06-09 14:27:31 +08:00 |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
2014-06-09 14:23:31 +08:00 |
|
yanxd
|
5bc20cf6af
|
push code, add score.
|
2014-06-09 13:52:21 +08:00 |
|
z9hang
|
463508c1f3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-09 13:47:58 +08:00 |
|
z9hang
|
f383f501ec
|
修改权限代码:判断用户是否为项目的管理员、判断用户是否为课程的老师、学生由根据role_id判断改为根据其权限判断
|
2014-06-09 13:47:39 +08:00 |
|
wanglinchun
|
1393aebace
|
完成了按钮样式
|
2014-06-09 11:30:18 +08:00 |
|
sw
|
2827bd0c21
|
1.修改下载一个人作业所有文件的传递参数
2.减少下载后作业的打包次数
|
2014-06-09 11:28:30 +08:00 |
|
yanxd
|
4c7bcd50f5
|
contests delete routes error
|
2014-06-09 10:51:07 +08:00 |
|
yanxd
|
6bd71ce9f1
|
人物分数统计，行为得分，项目相关。提交代码pending
user_scores表结构有问题，重新构建表结构
bundle exec rake db:migrate:down VERSION=20140410021724
bundle exec rake db:migrate:up VERSION=20140410021724
|
2014-06-09 10:40:59 +08:00 |
|
nwb
|
54505340eb
|
1.修正新建课程错误
2.优化课程角色权限判断
|
2014-06-09 10:26:45 +08:00 |
|
z9hang
|
8e9b939038
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-09 10:09:00 +08:00 |
|
sw
|
bef37e5c0f
|
增加作业显示列表首先按评分排序，然后按时间排序
|
2014-06-09 10:07:44 +08:00 |
|
wanglinchun
|
53ded67d9d
|
竞赛通知删除功能ok
|
2014-06-07 11:46:01 +08:00 |
|
wanglinchun
|
467f8f54e1
|
sdf
|
2014-06-07 11:15:58 +08:00 |
|
yanxd
|
c3865ab319
|
notificationcomments
|
2014-06-07 10:45:57 +08:00 |
|
wanglinchun
|
45e12c4bef
|
xx
|
2014-06-07 10:02:00 +08:00 |
|
wanglinchun
|
545e5c5941
|
ert
|
2014-06-07 09:22:13 +08:00 |
|
wanglinchun
|
7f5fa8b9b8
|
dfd
|
2014-06-06 21:40:58 +08:00 |
|
yanxd
|
61d0532f14
|
user
|
2014-06-06 17:41:16 +08:00 |
|
z9hang
|
47535ce101
|
修改竞赛中的role_id==xxx代码
|
2014-06-06 17:40:48 +08:00 |
|
yanxd
|
dfde06248c
|
打分初步
|
2014-06-06 17:33:42 +08:00 |
|
wanglinchun
|
391d4df3d1
|
sdf
|
2014-06-06 16:33:00 +08:00 |
|
yanxd
|
8b176c0027
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-06 16:18:48 +08:00 |
|
yanxd
|
db61ecc255
|
合并user_score属性
|
2014-06-06 16:17:27 +08:00 |
|
wanglinchun
|
1c28edd5d4
|
修改竞赛通知相关文件
|
2014-06-06 16:03:47 +08:00 |
|
z9hang
|
cf5c7a6610
|
修复学生从个人主页课程标签页未参加课程状态下点击加入课程进入课程列表搜索课程失败bug
|
2014-06-06 14:01:03 +08:00 |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
2014-06-06 13:56:48 +08:00 |
|
wanglinchun
|
372de9932a
|
英文版竞赛子站完成
|
2014-06-06 11:24:05 +08:00 |
|
wanglinchun
|
42aba52111
|
竞赛子站英文版5
|
2014-06-06 10:46:56 +08:00 |
|
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
2014-06-06 10:37:06 +08:00 |
|
sw
|
8f94985186
|
1.添加作业时权限判断
2.增加作业成员tab页
|
2014-06-06 10:28:37 +08:00 |
|
z9hang
|
1c461dc8ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-06 10:08:11 +08:00 |
|
yanxd
|
174c5556a0
|
减少sql查询， logger ===> Rails.logger
|
2014-06-06 09:26:09 +08:00 |
|
yanxd
|
7b98d01d8a
|
Merge branch 'develop' into szzh
|
2014-06-06 08:51:52 +08:00 |
|
nwb
|
388d14f075
|
迁移课程原讨论区数据
|
2014-06-06 08:50:46 +08:00 |
|
z9hang
|
c5fc1a8709
|
作业留言问题修复
|
2014-06-06 08:42:04 +08:00 |
|
z9hang
|
09368442c6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-06 08:35:10 +08:00 |
|
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
2014-06-05 17:39:48 +08:00 |
|
yanxd
|
0d8b06ec87
|
e, bug
|
2014-06-05 17:32:26 +08:00 |
|
yanxd
|
57994edc06
|
load user in homework
|
2014-06-05 17:29:11 +08:00 |
|
yanxd
|
1c7923e5bd
|
sql
|
2014-06-05 16:53:41 +08:00 |
|
nwb
|
ebe771db88
|
创建课程修改
|
2014-06-05 16:41:05 +08:00 |
|
wanglinchun
|
ca01f5c9cc
|
rt
|
2014-06-05 16:27:33 +08:00 |
|
wanglinchun
|
92cd6f2fdd
|
sd
|
2014-06-05 16:24:48 +08:00 |
|
sw
|
8e2288a362
|
1.封装获取作业平均评分方法
2.优化作业列表界面效率
|
2014-06-05 15:57:40 +08:00 |
|
wanglinchun
|
00b1a40345
|
修改了竞赛通知及评论相关文件代码
|
2014-06-05 15:45:17 +08:00 |
|
nwb
|
c1f9f389b7
|
修改课程讨论区视图，从项目中分离
|
2014-06-05 15:42:49 +08:00 |
|
wanglinchun
|
0255a61d2f
|
dfg
|
2014-06-05 15:23:58 +08:00 |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
2014-06-05 15:20:09 +08:00 |
|
sw
|
999b856d84
|
优化打开作业列表界面效率
|
2014-06-05 15:14:51 +08:00 |
|
z9hang
|
cb03669085
|
作业留言问题修复
|
2014-06-05 15:00:38 +08:00 |
|
wanglinchun
|
f1555bf134
|
dfg
|
2014-06-05 14:58:24 +08:00 |
|
nwb
|
cd3c69af94
|
课程资源文件迁移，从项目中分离
|
2014-06-05 14:07:44 +08:00 |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
2014-06-05 14:00:18 +08:00 |
|
wanglinchun
|
f17c01010f
|
werew
|
2014-06-05 11:58:59 +08:00 |
|
nwb
|
6ff26d06ab
|
修改课程基础页面逻辑(base_courses.html.erb)
|
2014-06-05 11:55:46 +08:00 |
|
wanglinchun
|
982bf17ebc
|
dfd
|
2014-06-05 11:19:59 +08:00 |
|
wanglinchun
|
8b78929190
|
修改竞赛通知中评论的相关文件
|
2014-06-05 11:02:32 +08:00 |
|
nwb
|
de201ae8f6
|
添加课程管理员表，并从项目管理员表中迁移原有数据
|
2014-06-05 11:01:46 +08:00 |
|
sw
|
b0a88eb5ac
|
增加作业按评分排序
|
2014-06-05 10:47:22 +08:00 |
|
nwb
|
529cf4f4f8
|
修改重启课程
|
2014-06-05 10:40:14 +08:00 |
|
nwb
|
6a9037dde5
|
修改关闭课程逻辑
|
2014-06-05 10:33:32 +08:00 |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
2014-06-05 10:28:36 +08:00 |
|
yanxd
|
2e11d76652
|
lin
|
2014-06-04 21:26:57 +08:00 |
|
wanglinchun
|
ed84ec633f
|
竞赛通知
|
2014-06-04 20:57:53 +08:00 |
|
wanglinchun
|
ae70081288
|
eter
|
2014-06-04 20:29:15 +08:00 |
|
nwb
|
10397eec3e
|
更改课程图标显示逻辑，添加课程图标文件夹
|
2014-06-04 17:30:42 +08:00 |
|
sw
|
39ce95a950
|
美化作业显示界面
|
2014-06-04 17:22:42 +08:00 |
|
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
2014-06-04 17:06:28 +08:00 |
|
nwb
|
69e366d841
|
迁移课程作业数据
|
2014-06-04 16:58:26 +08:00 |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
2014-06-04 16:45:20 +08:00 |
|
sw
|
43b350e3d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 16:23:59 +08:00 |
|
sw
|
af68d15451
|
作业的增、删、改、查以及作业资料的下载增加权限控制
|
2014-06-04 16:23:43 +08:00 |
|
sw
|
78ac974a75
|
1.修改课程作业列表界面提交作业
2.修复获取当前用户在指定作业下提交作业方法不正确的问题
|
2014-06-04 16:01:33 +08:00 |
|
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
2014-06-04 15:47:09 +08:00 |
|
yanxd
|
8fb82bbdc4
|
register Mod
|
2014-06-04 14:20:26 +08:00 |
|
nwb
|
4404222437
|
0604
|
2014-06-04 14:13:26 +08:00 |
|
nwb
|
0f5c996278
|
新建课程逻辑修改
|
2014-06-04 14:09:37 +08:00 |
|
sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
2014-06-04 12:01:08 +08:00 |
|
nwb
|
c43bf84e42
|
课程所包含的子功能模块(enabled_modules)相关逻辑修改
|
2014-06-04 11:32:32 +08:00 |
|
wanglinchun
|
da26c70f6c
|
修改首页子站入口
|
2014-06-04 10:53:04 +08:00 |
|
wanglinchun
|
a38ffb9e9d
|
首页修改4
|
2014-06-04 10:43:32 +08:00 |
|
sw
|
2bbcff54d3
|
取消作业提交形式选择，统一为提交文件
|
2014-06-04 10:32:44 +08:00 |
|
wanglinchun
|
7abeabeadf
|
首页修改3
|
2014-06-04 10:31:02 +08:00 |
|
wanglinchun
|
4b54f2949d
|
首页修改2
|
2014-06-04 10:28:20 +08:00 |
|
sw
|
1889996d6f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 10:18:35 +08:00 |
|
z9hang
|
c3b7c7cbe8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 10:16:46 +08:00 |
|
sw
|
80afefcd28
|
修改可对文件进行增、删等操作
|
2014-06-04 10:12:07 +08:00 |
|
wanglinchun
|
ebcdd2cc9e
|
修改首页英文显示
|
2014-06-04 10:08:57 +08:00 |
|
yanxd
|
51bfb6cae8
|
user model save bug
|
2014-06-04 10:08:54 +08:00 |
|
sw
|
29ac5ff12a
|
如果当前用户已经提交过作业就不显示新增作业按钮
|
2014-06-04 09:55:38 +08:00 |
|
wanglinchun
|
b5be2d58ce
|
英文子站首页
|
2014-06-04 09:35:39 +08:00 |
|
z9hang
|
3690bf79f4
|
修复个人动态中留言人链接错误
|
2014-06-04 09:31:16 +08:00 |
|
nwb
|
d87b52bedd
|
课程成员迁移
|
2014-06-04 09:19:01 +08:00 |
|
sw
|
66c9de94a8
|
修复新增作业后页面不会跳转的问题
|
2014-06-04 09:11:06 +08:00 |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-04 08:51:46 +08:00 |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
2014-06-03 21:52:16 +08:00 |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
2014-06-03 18:30:53 +08:00 |
|
wanglinchun
|
a3fb48a4bb
|
0603
|
2014-06-03 18:24:55 +08:00 |
|
z9hang
|
3a80a80841
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-03 17:36:01 +08:00 |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-03 17:21:01 +08:00 |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
2014-06-03 16:58:32 +08:00 |
|
sw
|
5ef1332ded
|
实现修改、删除作业后页面跳转
|
2014-06-03 16:47:00 +08:00 |
|
yanxd
|
510b1c4233
|
merge gem
|
2014-06-03 16:45:35 +08:00 |
|
yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中，业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
2014-06-03 16:41:12 +08:00 |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
2014-06-03 16:21:00 +08:00 |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
2014-06-03 15:47:00 +08:00 |
|
wanglinchun
|
81a45fe977
|
dfs
|
2014-06-03 15:27:04 +08:00 |
|
yanxd
|
7d6311f8e4
|
Merge branch 'develop' into szzh
|
2014-06-03 11:20:27 +08:00 |
|
yanxd
|
789a8d1392
|
tag_name从ProjectInfo取用户抛错的问题
不查询网站信息（删东西
gemfile加pry判定
|
2014-06-03 11:19:20 +08:00 |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
2014-06-03 11:16:06 +08:00 |
|
nwb
|
9f948c971f
|
添加课程排序方法
|
2014-06-03 09:56:54 +08:00 |
|
nwb
|
e490f7979d
|
添加课程index界面
|
2014-06-03 09:39:33 +08:00 |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
2014-06-03 09:27:07 +08:00 |
|
sw
|
cc5eb3d0af
|
1. 修复作业无附件时会将作业删除的问题
2.修复作业无附件时不会显示作业的问题
3.去除多余页面显示
|
2014-06-03 09:03:56 +08:00 |
|
wanglinchun
|
09ea833dcb
|
竞赛通知修改2
|
2014-05-30 20:52:55 +08:00 |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
|
z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
2014-05-30 16:27:05 +08:00 |
|
yanxd
|
bced2476cd
|
在更新下
|
2014-05-30 16:05:42 +08:00 |
|
yanxd
|
d2b90b98cc
|
1, 调整了settting中的成员显示，去掉了冗余的计算逻辑，打开页面速度快多了
2, 管理员身份查看作业列表 ==> true
|
2014-05-30 15:52:34 +08:00 |
|
z9hang
|
4747375499
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-30 13:41:04 +08:00 |
ganyiang
|
9f16123bed
|
修复osp显示帖子页面，footer漂移的问题
|
2014-05-30 11:29:05 +08:00 |
|
yanxd
|
8c33cf0afb
|
Merge branch 'develop' into szzh
|
2014-05-30 10:59:29 +08:00 |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
2014-05-30 10:57:13 +08:00 |
|
yanxd
|
6c5e7eca49
|
TODO
|
2014-05-30 10:49:49 +08:00 |
|
nwb
|
e15bad7462
|
course新增列并更改相关逻辑
|
2014-05-30 10:48:06 +08:00 |
|
z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
2014-05-30 09:49:53 +08:00 |
|
ganyiang
|
b4c299bff8
|
修复osp中“热帖”下显示“没有帮助”的问题
|
2014-05-30 09:35:06 +08:00 |
|
yanxd
|
9194b32060
|
file/index上传文件功能里。 remote: true 文件是不能提交的！
|
2014-05-30 09:31:04 +08:00 |
|
sw
|
22688dd5da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-30 08:38:01 +08:00 |
|
ganyiang
|
44d24d038f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-30 08:30:10 +08:00 |
|
ganyiang
|
3c9279d285
|
修改标签错误
|
2014-05-30 08:29:50 +08:00 |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-30 08:28:07 +08:00 |
|
ganyiang
|
e8b33bfd8f
|
修复osp主页index界面态势列表显示标题过长的问题
|
2014-05-29 22:30:58 +08:00 |