 sw
|
ffe40b399d
|
个人动态表重构
|
2015-08-25 17:54:29 +08:00 |
|
sw
|
44419eff04
|
rake db
|
2015-08-25 15:39:50 +08:00 |
 lizanle
|
256ccedfe8
|
schema
|
2015-08-25 15:16:24 +08:00 |
 cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
2015-08-24 18:01:51 +08:00 |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
2015-08-24 10:39:52 +08:00 |
|
sw
|
535145f8f2
|
11
|
2015-08-21 16:35:52 +08:00 |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
|
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
2015-08-21 14:37:19 +08:00 |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
|
cxt
|
4c87071765
|
个人动态
|
2015-08-20 17:24:34 +08:00 |
 huang
|
a15ab2c72e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-08-20 14:07:11 +08:00 |
|
sw
|
b52f607b68
|
用户动态 = 参与课程动态 + 参与课程动态
表创建以及相关关系的搭建
|
2015-08-20 11:19:26 +08:00 |
|
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
2015-08-20 09:25:48 +08:00 |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
2015-08-19 17:29:05 +08:00 |
|
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
2015-08-19 11:06:39 +08:00 |
|
cxt
|
27ff5471ec
|
超级管理员新增功能页面的分页、添加超链接，添加查询条件。
|
2015-08-18 14:40:12 +08:00 |
|
sw
|
c97ec1a370
|
111
|
2015-08-15 19:47:50 +08:00 |
|
sw
|
0ba9cfe5dd
|
提升迁移文件效率
|
2015-08-15 19:47:24 +08:00 |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
2015-08-15 17:10:02 +08:00 |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-08-15 17:09:10 +08:00 |
|
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
|
sw
|
5d000ea431
|
增加系统评分
|
2015-08-15 17:02:54 +08:00 |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
2015-08-15 16:54:51 +08:00 |
|
sw
|
35d6c76a8e
|
部分课程资源创建时间不正确
|
2015-08-14 13:55:46 +08:00 |
|
huang
|
a5c941f48c
|
课程发布通知消息提示
|
2015-08-14 10:19:59 +08:00 |
|
huang
|
b958340ab6
|
Merge branch 'szzh' into dev_hjq
|
2015-08-14 08:55:41 +08:00 |
|
sw
|
053587bd53
|
课程动态增加课程创建信息的动态
|
2015-08-11 17:11:10 +08:00 |
|
sw
|
ce76308864
|
课程动态，历史数据的迁移
|
2015-08-11 17:02:52 +08:00 |
|
huang
|
998fe24e49
|
建立forge_messages表
建立user、project关联
|
2015-08-11 16:52:04 +08:00 |
|
sw
|
465af5e2d3
|
增加课程动态，以及课程内相关活动时动态的添加
|
2015-08-11 15:54:05 +08:00 |
|
cxt
|
a872692984
|
为activities表添加created_at字段，并导入数据
|
2015-08-11 14:49:32 +08:00 |
|
sw
|
f5cfd7258d
|
修改编程作业时，对已通过测试、未通过测试显示的初始化，以及修改时的结果的存储
|
2015-08-01 14:27:32 +08:00 |
|
sw
|
9da18bcad4
|
老师测试结果的返回
|
2015-07-31 13:58:27 +08:00 |
|
sw
|
41cba6db6a
|
增加每组测试的编译错误信息的存储
|
2015-07-30 21:10:05 +08:00 |
|
sw
|
5e885d9417
|
老师布置编程作业界面增加测试，以及测试结果的存储
|
2015-07-30 17:38:01 +08:00 |
|
lizanle
|
b22f9b221b
|
db_schema.rb
|
2015-07-28 11:34:50 +08:00 |
|
lizanle
|
e74ca78b0e
|
日志级别在debug环境下 调整为debug
|
2015-07-27 10:03:45 +08:00 |
|
cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
2015-07-24 09:07:58 +08:00 |
|
sw
|
66924560c4
|
编程作业上线
|
2015-07-22 16:06:31 +08:00 |
|
sw
|
baccd28493
|
迁移文件出错
|
2015-07-22 10:48:46 +08:00 |
|
sw
|
5bd1cdc4eb
|
编程作业结果增加错误信息的存储
|
2015-07-22 10:06:55 +08:00 |
|
cxt
|
3b6d6596c0
|
3218 3219缺陷的修复
|
2015-07-21 11:59:15 +08:00 |
|
huang
|
5926b2fe81
|
dts测试
|
2015-07-19 20:39:53 +08:00 |
|
huang
|
c198a03a90
|
DTS测试工具
|
2015-07-19 20:08:57 +08:00 |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |
 yutao
|
8d858cccfc
|
个人主页
|
2015-07-17 13:40:53 +08:00 |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
2015-07-16 10:26:09 +08:00 |
|
sw
|
536a9d7b6b
|
修改表名
|
2015-07-15 15:28:44 +08:00 |
|
sw
|
0b66097bfb
|
增加每份编程作品的测试结果的记录
|
2015-07-15 15:21:26 +08:00 |
|
yutao
|
00c50d8114
|
个人主页->访客
|
2015-07-14 15:16:15 +08:00 |