 lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
2015-10-12 15:51:47 +08:00 |
 huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
2015-10-08 14:23:32 +08:00 |
 cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
2015-09-24 16:46:08 +08:00 |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
2015-09-24 16:30:14 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
 sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
2015-09-23 15:44:48 +08:00 |
|
lizanle
|
9443c139f0
|
update forum
|
2015-09-18 17:44:16 +08:00 |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
2015-09-17 20:20:20 +08:00 |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
2015-09-17 16:53:38 +08:00 |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
2015-09-17 16:07:41 +08:00 |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
2015-09-17 14:41:03 +08:00 |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
2015-09-15 10:31:59 +08:00 |
|
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
2015-09-11 09:45:28 +08:00 |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:37:53 +08:00 |
|
cxt
|
21565b74fe
|
冲突
|
2015-09-01 16:37:43 +08:00 |
 guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:45:49 +08:00 |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:34:31 +08:00 |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
2015-09-01 15:34:22 +08:00 |
|
sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
2015-09-01 15:28:03 +08:00 |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
2015-09-01 15:17:40 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
guange
|
8f426ca040
|
merge
|
2015-08-29 18:22:33 +08:00 |
|
sw
|
a23ec96508
|
学校首页报404
|
2015-08-29 10:07:36 +08:00 |
|
sw
|
51bf1cd678
|
作业搜索支持enter键
|
2015-08-29 09:53:16 +08:00 |
|
guange
|
e8fe397158
|
added
|
2015-08-28 17:20:39 +08:00 |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
2015-08-28 16:47:43 +08:00 |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
2015-08-28 12:04:49 +08:00 |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
2015-08-28 11:32:57 +08:00 |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
2015-08-28 10:00:48 +08:00 |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
2015-08-27 16:03:41 +08:00 |
|
guange
|
b9e08b22cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-26 20:37:49 +08:00 |
|
guange
|
631283ae79
|
remove grack
|
2015-08-26 20:37:43 +08:00 |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 17:31:37 +08:00 |
|
sw
|
049e27f15f
|
发布作业功能
|
2015-08-26 17:29:47 +08:00 |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
2015-08-26 16:33:21 +08:00 |
|
lizanle
|
ccfd69602c
|
服务协议
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
2015-08-24 23:53:28 +08:00 |
|
huang
|
4fd90464d9
|
Merge branch 'sw_new_course' into dev_hjq
|
2015-08-24 11:38:50 +08:00 |
|
huang
|
e129404b4c
|
解决图标点两次的问题
|
2015-08-24 11:11:45 +08:00 |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
2015-08-24 11:04:19 +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 |
|
guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-21 19:23:17 +08:00 |
|
sw
|
2a522f144e
|
编辑个人简介
|
2015-08-21 16:29:25 +08:00 |