 cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-25 16:32:25 +08:00 |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
2015-09-25 16:29:47 +08:00 |
 lizanle
|
7ef48f3fa3
|
标签修改的问题
|
2015-09-25 12:31:52 +08:00 |
|
lizanle
|
3fe5adcaf8
|
统一修改tag 会 和边框有边距
|
2015-09-25 11:49:57 +08:00 |
 Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 10:43:42 +08:00 |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
2015-09-25 10:35:04 +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 |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
2015-09-23 09:23:31 +08:00 |
 sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-22 16:21:54 +08:00 |
|
lizanle
|
b4561fa68d
|
资源库标签 上方的tag重命名的话，所有的含有该tag的资源的那个标签页要重命名
|
2015-09-22 16:19:39 +08:00 |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
2015-09-22 15:54:50 +08:00 |
|
sw
|
2d48161928
|
新版作品列表界面
|
2015-09-22 15:03:03 +08:00 |
|
sw
|
281e97e468
|
课程内老师可以对作业进行编辑、删除、开启匿评
|
2015-09-18 12:00:04 +08:00 |
|
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
2015-09-18 11:05:21 +08:00 |
|
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
2015-09-17 16:31:32 +08:00 |
|
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
2015-09-17 16:04:16 +08:00 |
|
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
2015-09-17 10:32:41 +08:00 |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
2015-09-17 09:20:35 +08:00 |
|
sw
|
fa00285529
|
css文件更新
|
2015-09-16 15:30:08 +08:00 |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
2015-09-02 18:06:05 +08:00 |
 suntao
|
4259540f53
|
作业列表宽度调整
|
2015-09-02 17:03:01 +08:00 |
|
suntao
|
b2b2537df8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:31:16 +08:00 |
|
suntao
|
ea4a005048
|
作业界面排版微调
|
2015-09-02 14:31:03 +08:00 |
|
sw
|
e55b61cb81
|
课程留言回复
|
2015-09-02 14:07:19 +08:00 |
|
suntao
|
c9d46f17f3
|
回复blockquote调整
|
2015-09-02 11:15:38 +08:00 |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
2015-09-02 10:51:46 +08:00 |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
2015-09-01 17:21:17 +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 |
|
suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2015-08-31 14:55:15 +08:00 |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
2015-08-31 14:52:56 +08:00 |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
2015-08-29 17:50:15 +08:00 |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
2015-08-29 16:52:10 +08:00 |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
2015-08-12 16:24:27 +08:00 |
|
sw
|
2e4babc2ae
|
修改demo代码，增加C++的示例代码
|
2015-08-04 17:52:57 +08:00 |
|
sw
|
9b5a1a5203
|
增加标准代码显示
|
2015-08-04 16:02:17 +08:00 |
|
sw
|
3f51368bb2
|
老师布置作业界面增加错误信息的提示
|
2015-08-04 15:25:05 +08:00 |
|
sw
|
f163cdac51
|
老师点击测试自动刷新，每组测试对标准代码的返回结果存储
|
2015-07-30 21:02:04 +08:00 |
|
sw
|
28509b7cdd
|
老师布置编程作业界面增加测试按钮
|
2015-07-30 17:27:42 +08:00 |
|
sw
|
7c818ce59a
|
admin界面增加学校列表显示，以及按名称过滤功能
|
2015-07-27 16:07:29 +08:00 |
|
sw
|
c0eea86132
|
增加错误信息的显示
|
2015-07-23 10:12:07 +08:00 |
|
sw
|
8c82f6c6a7
|
编程作业新增测试取消测试按钮
|
2015-07-18 16:34:24 +08:00 |
|
sw
|
f909fbb835
|
作品列表增加分班过滤
|
2015-07-15 16:01:03 +08:00 |
|
sw
|
2eff8cce6a
|
更新css文件
|
2015-07-08 16:38:34 +08:00 |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
2015-07-06 10:44:07 +08:00 |
|
sw
|
283e93c9e2
|
为启用匿评作业不现实匿评栏
|
2015-07-04 12:07:21 +08:00 |
 huang
|
162fcc7ff4
|
Merge branch 'szzh' into dev_hjq
|
2015-07-03 16:04:55 +08:00 |
|
sw
|
4eb9ce6f0f
|
css报错
|
2015-07-03 10:58:30 +08:00 |