linhk
|
044bba4d0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:44:00 +08:00 |
|
linhk
|
0028c11426
|
退出项目功能
|
2014-08-08 16:43:34 +08:00 |
 z9hang
|
87f6f81279
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 15:09:48 +08:00 |
|
z9hang
|
f8c6b66119
|
修改密码处导航丢失问题
|
2014-08-08 15:09:32 +08:00 |
|
z9hang
|
683cd9f918
|
个人积分修改
|
2014-08-08 13:47:02 +08:00 |
|
linhk
|
387d482059
|
解决用户注册无地区、身份可注册成功
|
2014-08-07 15:58:00 +08:00 |
|
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
2014-08-07 12:02:55 +08:00 |
|
z9hang
|
96fa28f70d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:36:08 +08:00 |
 sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:31:39 +08:00 |
|
z9hang
|
56a06c4a04
|
修复git说明页面导航丢失问题
修改个人得分
|
2014-08-07 11:28:58 +08:00 |
|
z9hang
|
eacc0fdf53
|
修复编辑作业提交时的bug
修改个人得分
|
2014-08-07 10:45:56 +08:00 |
|
sw
|
34af8053cc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-07 09:23:28 +08:00 |
|
z9hang
|
c6271e2aa9
|
修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务
|
2014-08-06 16:02:26 +08:00 |
|
sw
|
a4199e4c54
|
修改错误代码
|
2014-08-06 15:39:06 +08:00 |
|
z9hang
|
0eca547ec5
|
修复两个导航栏丢失问题、版本库=》查看差别，没有对应的文件或修订版本时报错问题
|
2014-08-06 15:03:43 +08:00 |
|
linhk
|
23c9d5381e
|
注册界面失败填写信息继续保留
修改注册见面企业提交失败姓、名内容错误Bug
|
2014-08-06 14:41:22 +08:00 |
|
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
2014-08-06 11:46:38 +08:00 |
|
z9hang
|
1ca6447478
|
修复项目缺陷、新闻、讨论区等页面无法查看bug
|
2014-08-05 17:31:05 +08:00 |
|
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 |
|
z9hang
|
426ea23d6e
|
回复帖子内容为空时报错问题
|
2014-08-04 17:30:29 +08:00 |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
2014-08-04 15:01:39 +08:00 |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
2014-08-04 12:23:20 +08:00 |
|
sw
|
c5a7497910
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 17:36:50 +08:00 |
|
z9hang
|
acb41158e7
|
错误提示页面导航栏添加
登陆时自动忽略登陆名前后空格
|
2014-08-01 16:01:16 +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 |
|
sw
|
d5ac443f90
|
修复竞赛列表搜索结果不正确的BUG
|
2014-07-31 17:02:30 +08:00 |
|
sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
2014-07-31 14:39:18 +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
|
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 |
 yanxd
|
281c48c0b3
|
.
|
2014-07-30 10:18:49 +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
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
2014-07-29 17:35:22 +08:00 |
 nwb
|
81b77bc870
|
文件删除修改
|
2014-07-29 16:14:49 +08:00 |
|
sw
|
e7503237f1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-29 11:16:14 +08:00 |