 huang
|
7ee4ff69b3
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
 cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
10 years ago |
|
cxt
|
a4a29b0ee9
|
关联项目的文字样式调整
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
 ouyangxuhua
|
9c34cf6c3a
|
课程/项目帖子页面，齿轮菜单内容居中显示
|
10 years ago |
|
lizanle
|
ff88d1ed2c
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
 Tim
|
ecd1cd6041
|
资源库样式调整
|
10 years ago |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
10 years ago |
|
lizanle
|
e35d2daa0a
|
课程资源库
|
10 years ago |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
10 years ago |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
10 years ago |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
10 years ago |
|
lizanle
|
70f93741d6
|
issue图标问题
|
10 years ago |
|
cxt
|
dc0f004021
|
关联项目的提示信息
|
10 years ago |
|
cxt
|
bfde278340
|
学生作品列表的样式调整
|
10 years ago |
|
huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
10 years ago |
|
cxt
|
d4bde8e73c
|
调整学生作品列表的样式
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
Tim
|
d115a97f78
|
追加附件效果调整
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
cxt
|
fd51b02e16
|
添加修订附件
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
|
Tim
|
06ca4c8f4b
|
作品列表样式调整
|
10 years ago |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
10 years ago |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
10 years ago |
|
Tim
|
2d14b66336
|
作品列表样式调整
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
10 years ago |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
10 years ago |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
10 years ago |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
10 years ago |
|
cxt
|
acaac93da1
|
tijiao
|
10 years ago |
|
cxt
|
265fe08b2c
|
在线测验
|
10 years ago |
|
cxt
|
cc08e5e32e
|
保存测验信息
|
10 years ago |
|
cxt
|
034a92bb7b
|
新建测验页面
|
10 years ago |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
10 years ago |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
10 years ago |
|
lizanle
|
c20ff6980b
|
进度条不见了bug。
|
10 years ago |
|
lizanle
|
dcdffe5d04
|
上传文件的进度条不见了。
|
10 years ago |
|
cxt
|
0c43a703ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
4adc6deabf
|
配置课程页面的开课学期不可更改，弹框提醒用户。
|
10 years ago |
|
Tim
|
679ec44f8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/student_work/_evaluation_work.html.erb
|
10 years ago |
|
Tim
|
d9610d2694
|
作品列表提示标签
|
10 years ago |
|
cxt
|
7f63ceea76
|
作品信息确认框的附件可下载
|
10 years ago |
|
Tim
|
3b6e3f6ecf
|
作品列表修改
|
10 years ago |
|
Tim
|
060c40fa24
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
223b17d8fe
|
普通作品列表、系统评分作品列表、匿评作品列表格式修改
|
10 years ago |
|
cxt
|
35c60c3253
|
作品列表的作品信息样式调整
|
10 years ago |
|
cxt
|
1133b35169
|
作业tag的调整 作业截止时间精确到分
|
10 years ago |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
e06f08aa3b
|
作业状态的更改
|
10 years ago |
|
lizanle
|
3360a25a42
|
项目 主页 资源上传 不要翻页，直接弹出资源弹出框
|
10 years ago |
|
lizanle
|
27a2a2890f
|
大纲设置图标 鼠标放上去呈手型
图标一直显示
|
10 years ago |
|
lizanle
|
6b1c140258
|
更改宽度
|
10 years ago |
|
lizanle
|
9e1c675c66
|
根据大纲搜索结果适应高度
|
10 years ago |
|
lizanle
|
70003a8d9c
|
课程大纲功能 弹出框样式问题
|
10 years ago |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
10 years ago |
|
lizanle
|
b67afc2b95
|
大纲
|
10 years ago |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
|
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
10 years ago |
|
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
10 years ago |
|
cxt
|
274db8d080
|
作品列表页面的作业信息添加附件的显示
|
10 years ago |
|
Tim
|
b063be917b
|
附件图标更改；弹窗文字上padding减小
|
10 years ago |
|
cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
10 years ago |
|
cxt
|
4b6f8efc5a
|
作品列表添加作业信息
|
10 years ago |
|
huang
|
b3cd3c48d2
|
修改私有样式
|
10 years ago |
|
cxt
|
7dd6618345
|
非课程成员不能将帖子置顶和锁定
|
10 years ago |
|
cxt
|
26eda763fe
|
帖子锁定时动态的样式调整
|
10 years ago |
|
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
10 years ago |
|
Tim
|
4dddbe9dc7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_journalsformessage.html.erb
|
10 years ago |
|
Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
10 years ago |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
10 years ago |
|
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
10 years ago |
|
cxt
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
10 years ago |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
|
cxt
|
c6cca9f17e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
0f6ea47792
|
课程讨论区的列表显示
|
10 years ago |
|
Tim
|
f5ff94d888
|
资源库固定宽度、作品描述margin、搜索框文字居中
|
10 years ago |
|
lizanle
|
7d04ce80d4
|
tag为可以点击的时候 是 手型
|
10 years ago |
|
lizanle
|
56db8b4232
|
批量修改tag的bug
|
10 years ago |
 sw
|
d1bb76cfcb
|
调整学生匿评界面提交按钮样式
|
10 years ago |
|
sw
|
9edfa49bcb
|
项目内上传图片按钮
|
10 years ago |
|
Tim
|
4c5b59ebc8
|
作业动态图标替换
|
10 years ago |
|
sw
|
b22669e36f
|
课程上传图片按钮
|
10 years ago |
|
sw
|
22b9c6a866
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
10 years ago |
|
cxt
|
038bcdb80e
|
课程动态的作业编辑菜单样式调整
|
10 years ago |
|
cxt
|
e298f738ed
|
调整课程动态的过滤列表样式
|
10 years ago |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
|
lizanle
|
7ef48f3fa3
|
标签修改的问题
|
10 years ago |
|
lizanle
|
3fe5adcaf8
|
统一修改tag 会 和边框有边距
|
10 years ago |
|
Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
10 years ago |
|
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
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
10 years ago |
|
sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
b4561fa68d
|
资源库标签 上方的tag重命名的话，所有的含有该tag的资源的那个标签页要重命名
|
10 years ago |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
sw
|
2d48161928
|
新版作品列表界面
|
10 years ago |
|
sw
|
281e97e468
|
课程内老师可以对作业进行编辑、删除、开启匿评
|
10 years ago |
|
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
10 years ago |
|
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
10 years ago |
|
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
10 years ago |
|
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
10 years ago |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
10 years ago |
|
sw
|
fa00285529
|
css文件更新
|
10 years ago |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
10 years ago |
suntao
|
4259540f53
|
作业列表宽度调整
|
10 years ago |
|
suntao
|
b2b2537df8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
ea4a005048
|
作业界面排版微调
|
10 years ago |
|
sw
|
e55b61cb81
|
课程留言回复
|
10 years ago |
|
suntao
|
c9d46f17f3
|
回复blockquote调整
|
10 years ago |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
10 years ago |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
10 years ago |
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
10 years ago |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
10 years ago |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
10 years ago |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
sw
|
2e4babc2ae
|
修改demo代码，增加C++的示例代码
|
10 years ago |
|
sw
|
9b5a1a5203
|
增加标准代码显示
|
10 years ago |
|
sw
|
3f51368bb2
|
老师布置作业界面增加错误信息的提示
|
10 years ago |
|
sw
|
f163cdac51
|
老师点击测试自动刷新，每组测试对标准代码的返回结果存储
|
10 years ago |
|
sw
|
28509b7cdd
|
老师布置编程作业界面增加测试按钮
|
10 years ago |
|
sw
|
7c818ce59a
|
admin界面增加学校列表显示，以及按名称过滤功能
|
10 years ago |
|
sw
|
c0eea86132
|
增加错误信息的显示
|
10 years ago |
|
sw
|
8c82f6c6a7
|
编程作业新增测试取消测试按钮
|
10 years ago |
|
sw
|
f909fbb835
|
作品列表增加分班过滤
|
10 years ago |
|
sw
|
2eff8cce6a
|
更新css文件
|
10 years ago |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
10 years ago |
|
sw
|
283e93c9e2
|
为启用匿评作业不现实匿评栏
|
10 years ago |
|
huang
|
162fcc7ff4
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
4eb9ce6f0f
|
css报错
|
10 years ago |
|
sw
|
d2b76e92f2
|
展开后成绩得分框显示位置
|
10 years ago |
