 yutao
|
83bbb62149
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
6df40be30e
|
个人主页：如图“取消”改为“取消关注”
|
10 years ago |
 sw
|
10c0a85846
|
学生作品列表分班过滤宽度的问题
|
10 years ago |
 huang
|
c198a03a90
|
DTS测试工具
|
10 years ago |
|
sw
|
c66e74dc82
|
Merge branch 'szzh' into develop
|
10 years ago |
|
sw
|
8c82f6c6a7
|
编程作业新增测试取消测试按钮
|
10 years ago |
|
yutao
|
5ecf7f12af
|
喻涛
|
10 years ago |
|
sw
|
d0482fdb65
|
作品列表搜索报500
|
10 years ago |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
yutao
|
8e3bc28fa2
|
个人主页
|
10 years ago |
|
yutao
|
11ae8c82d4
|
个人主页
|
10 years ago |
|
sw
|
b6e123e476
|
右上角导航栏问题
|
10 years ago |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
10 years ago |
|
sw
|
66c1dfa77e
|
作品列表增加分班的过滤
|
10 years ago |
|
sw
|
f909fbb835
|
作品列表增加分班过滤
|
10 years ago |
|
sw
|
67c054e3af
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
huang
|
c9c3d2e3d8
|
修改讨论区行数过高压住字体
|
10 years ago |
|
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
10 years ago |
|
huang
|
b089b973ab
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
yutao
|
02d09c84b4
|
个人主页->留言
|
10 years ago |
|
huang
|
57f6f72c64
|
修改编辑器下面多余的黑色框框
|
10 years ago |
|
huang
|
fc61edf1fa
|
课程讨论区添加真实姓名
编辑器图片更新
|
10 years ago |
 zhangshenjerry
|
66042a90f3
|
创新竞赛--竞赛通知：评论通知输入框显示超出边框
|
10 years ago |
|
yutao
|
5c011fd342
|
个人主页
|
10 years ago |
|
huang
|
8de307d198
|
项目资源库区分“项目内搜索”和“全站搜索”
|
10 years ago |
|
sw
|
2eff8cce6a
|
更新css文件
|
10 years ago |
|
sw
|
6af6fdd5a3
|
编程作业分配比例添加以及界面显示
|
10 years ago |
|
huang
|
7ebdf4a08d
|
issue列表增加优先级
修改issue列表界面
|
10 years ago |
|
zhangshenjerry
|
04f125c7a6
|
张申修改的bug
|
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 |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
10 years ago |
|
sw
|
642fa8dd5d
|
1、缺评、迟交扣分
2、匿评提示框、最终成绩计算提示框
3、修改作业
|
10 years ago |
|
huang
|
b16e19096f
|
添加新闻回复
|
10 years ago |
|
sw
|
1e12b68027
|
下载附件提示遮住按钮
|
10 years ago |
|
zhangshenjerry
|
54317af6d8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
zhangshenjerry
|
448cedc842
|
回复的收缩
|
10 years ago |
|
sw
|
59f6ef81cd
|
附件提示框固定位置
|
10 years ago |
|
sw
|
90c4a38cfc
|
公共贴吧头像显示问题
|
10 years ago |
|
sw
|
0f92a2e3cb
|
下载附件给出使用winrar解压的提示
|
10 years ago |
|
sw
|
0215d2224e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
5e29c6bf27
|
bug#2742:项目问题跟踪：新建问题时在描述中直接贴图，若图片长度够长，在个人动态中显示超出边框
|
10 years ago |
|
huang
|
5d0cd4520e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
cf0e1b3bd5
|
修改缺陷：上传名称较长的资源，文字被截断了
|
10 years ago |
|
yutao
|
e6a15a45c4
|
bug#2782:讨论区：若某一级回帖是视频，再二级回复该回复信息，显示时超出边框
|
10 years ago |
|
sw
|
ebeeb9cf28
|
开启匿评后学生提交作品提示，开启匿评时对老师的提示
界面css
|
10 years ago |
guange
|
38b97aa558
|
下载url有两处需要处理的
|
10 years ago |
|
guange
|
81187dea36
|
有带+号的作业无法打包下载的问题
|
10 years ago |
|
sw
|
e3c67fb17a
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
sw
|
857110d537
|
作品列表增加时间显示，相应界面调整
|
10 years ago |
|
sw
|
810561c31b
|
老师才可以查看缺评情况
|
10 years ago |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
sw
|
43363e8bcb
|
缺评情况功能
|
10 years ago |
|
sw
|
9a4e0d6be7
|
批阅结果附件显示长度
|
10 years ago |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
10 years ago |
|
guange
|
5bdad52e63
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
742506f52b
|
IE8不能提交作业
|
10 years ago |
|
sw
|
ab88156d2f
|
编程作业创建部分值获取
增加、删除编程作业测试结果
样式调整
|
10 years ago |
|
yutao
|
0f8061094d
|
bug#2854:在同一页面中同时打开新建帖子和回复帖子的编辑器，在新建帖子的编辑器中贴图，在第二个编辑器中却显示多个贴的图片
|
10 years ago |
|
sw
|
dd8e8e38ac
|
删除无用js
|
10 years ago |
|
sw
|
61eb3ecc62
|
1、新建作业上一步下一步改为页面刷新
2、下一步路由改为post
|
10 years ago |
|
yutao
|
9606ce1caa
|
bug#2846:编辑器点击打开表情，选择相关表情后，弹出的表情选择框没有自动关闭
|
10 years ago |
|
yutao
|
4e1cf3e16d
|
...
|
10 years ago |
|
sw
|
44e3daa0d2
|
1、老师新建作业，两类作业的选择
2、编程作业静态页面的添加
|
10 years ago |
|
sw
|
06009934d8
|
编辑新闻无法编辑成功
|
10 years ago |
|
yutao
|
0f96fd81c1
|
...
|
10 years ago |
|
yutao
|
b42d5e3667
|
...
|
10 years ago |
|
sw
|
c07f66776c
|
课程留言列表，拉长时显示不正确
|
10 years ago |
|
sw
|
6d8f0e728d
|
课程 作业、通知模块，新版编辑器相关BUG
|
10 years ago |
|
yutao
|
dbb6c9f54c
|
...
|
10 years ago |
|
sw
|
a5d7c50fe3
|
课程通知展开按钮
|
10 years ago |
|
sw
|
57804a118d
|
课程作业列表中展开按钮
|
10 years ago |
|
sw
|
94e8bd13ab
|
资源作者
|
10 years ago |
|
sw
|
1c808464d5
|
新版编辑器不可以拉宽
|
10 years ago |
|
sw
|
e1636d20d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
4c5d2d5055
|
poll列表界面样式调整，导出功能权限
|
10 years ago |
|
yutao
|
4ed4d3fa44
|
...
|
10 years ago |
|
yutao
|
63785564e8
|
解决图片上传不支持多编辑器的bug
|
10 years ago |
|
yutao
|
29edf5ece7
|
解决kindeditor多编辑器的bug
|
10 years ago |
|
sw
|
360c08bb8b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
79893c4917
|
作业提交时，根据验证结果相应空间focus
|
10 years ago |
|
yutao
|
b4732814e6
|
...
|
10 years ago |
|
sw
|
f7b3229065
|
当作品中没有附件时，下载报错
|
10 years ago |
|
sw
|
c31e370ad6
|
课程资源列表：选人我的课程、选入我的其他课程弹出框关闭按钮异常
|
10 years ago |
|
sw
|
bf653fa94f
|
课程作品列表搜索功能异常
|
10 years ago |
|
sw
|
7bab135ac7
|
1、上传资源时公开单选框样式
2、课程上传资源文件有下拉条
|
10 years ago |
|
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
09e014b5f7
|
匿评作品列表界面
|
10 years ago |
|
sw
|
1119840e25
|
作品列表界面
|
10 years ago |
|
yutao
|
37347664e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
sw
|
0ff088f96d
|
作品列表增加搜索按钮，取消搜索框手型显示
|
10 years ago |
|
huang
|
c39e0bf3db
|
项目成员邀请添加：
邀请等待
已邀请的成员列表
|
10 years ago |
|
sw
|
d6fb35544e
|
评分作品时提交按钮固定在提交栏的右下角
|
10 years ago |
|
sw
|
442c991500
|
打分滑条取消分数的title
|
10 years ago |
|
sw
|
6992a50f64
|
作品列表学号显示为灰色，取消连接；作品名称显示为绿色，学生姓名靠左对齐
|
10 years ago |
|
sw
|
a45240b602
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
sw
|
3ef46fd8f5
|
11
|
10 years ago |
|
guange
|
437287d93b
|
编辑器支持视频
|
10 years ago |
|
sw
|
82cb7fac50
|
作业上传附件，超过部分以...显示
|
10 years ago |
|
sw
|
61fbb17fd9
|
个人动态主页图片强制放大，失真
|
10 years ago |
|
sw
|
c161441796
|
课程通知如果没有超过限定长度不显示更多按钮
|
10 years ago |
|
sw
|
e6af34e9f8
|
学生列表显示
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
e4046851cf
|
1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
|
10 years ago |
|
sw
|
b5dc424714
|
bid超过20行才显示更多按钮
|
10 years ago |
|
sw
|
27314f8b54
|
Merge branch 'memcached_alan' into szzh
|
10 years ago |
|
sw
|
a9235bef2f
|
1、匿评作品列表，得分显示为我的评分
2、匿评作品列表，不是我的作品用户名显示为匿名，学号不显示
|
10 years ago |
|
sw
|
19bf8ef50d
|
作品修改功能
|
10 years ago |
 alan
|
98f38b0a5b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
10 years ago |
|
yutao
|
4494e5cd64
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
065c196edc
|
...
|
10 years ago |
|
sw
|
70f14f851d
|
根据作业不同类型、不同阶段、当前用户身份对作品列表进行过滤，以及相关界面功能的过滤
部分界面样式调整
|
10 years ago |
|
yutao
|
709c026910
|
...
|
10 years ago |
|
huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
10 years ago |
|
sw
|
3f9855f25c
|
老师删除作业功能
|
10 years ago |
|
sw
|
8c6ea88504
|
1、作品列表TAB切换
2、作品界面作业详细信息
3、到处Excel名称
|
10 years ago |
|
sw
|
ee0a9093d3
|
学生作品附件列表显示以及间距调整
|
10 years ago |
|
sw
|
b182feb988
|
作业全部附件打包下周无法下载
|
10 years ago |
|
sw
|
a1e28bcd9e
|
增加按学生login、学号、真实姓名排序
|
10 years ago |
|
alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
4783bad924
|
1、打分后作品的各项得分数据刷新
2、作品列表样式调整
|
10 years ago |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
10 years ago |
|
sw
|
2bb59ffd79
|
1、作品评论回复以及相关界面刷新
2、调整回复框宽度
|
10 years ago |
|
huang
|
95f3d89afa
|
项目新闻添加编辑器：显示页面、列表页面新样式显示
|
10 years ago |
|
sw
|
1fe7c70955
|
1、评价作品增加批阅结果的删除与显示
2、修改课程的昵称下拉框无法正常显示
|
10 years ago |
|
sw
|
1ae8c7d234
|
作业评分、上传评阅结果，以及上传结果的显示样式
|
10 years ago |
|
huang
|
a6da2b4a01
|
项目添加新的编辑器
显示页面显示样式调整
|
10 years ago |
|
sw
|
f3597d9aa5
|
开启/关闭匿评弹框提示
|
10 years ago |
|
huang
|
052d293f82
|
新建项目时候：
如果我的项目中有重名的项目不允许新建
|
10 years ago |
|
sw
|
95a48b7da0
|
1、作品show界面详细内容填充
2、更新public.css
3、增加作品附件显示
|
10 years ago |
|
alan
|
1c9b9dff79
|
修改《编辑器还原》《提示信息的添加》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
c18d1d9585
|
修改《匿名发布新帖》《编辑时出现跳转错误》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
8c72df74d6
|
1、增加返回顶部功能
2、点击作品名称，弹出详细信息
3、作品列表信息生成
|
10 years ago |
|
alan
|
a0ca31780e
|
修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
689ec5cdfc
|
课程通知列表更多功能bug
|
10 years ago |
|
sw
|
faeb06aae8
|
1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
|
10 years ago |
|
sw
|
56723d106f
|
新建作品功能，以及相关js验证
|
10 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
alan
|
f1f871ffda
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
4a588506a4
|
增加编辑器
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
10 years ago |
|
huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
10 years ago |
|
sw
|
296d4a678c
|
新建作业js验证以及页面操作js效果添加
|
10 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
10 years ago |
|
huang
|
fa563b60d5
|
项目issue添加周报功能
|
10 years ago |
|
sw
|
3b3ca0024d
|
css错误修改
|
10 years ago |
|
sw
|
09b3ba8a6a
|
更新css文件，新建作业静态页面
|
10 years ago |
|
alan
|
ab9d74f364
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
052868a6b4
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
6c6ae38f7a
|
课程主页私有样式
|
10 years ago |
|
guange
|
e3633e702c
|
firefox样式问题
|
10 years ago |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
10 years ago |
|
guange
|
1226f74750
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
10 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
10 years ago |
|
sw
|
a44cba2e6a
|
Merge branch 'develop' into guange_dev
|
10 years ago |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
10 years ago |
|
sw
|
659ff254e1
|
background背景图片拉伸
|
10 years ago |
|
guange
|
66e2bc5ef2
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
588d96a0c0
|
头像上传只允许图片
|
10 years ago |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
99e3d09e83
|
IE浏览器中li前面有个点
|
10 years ago |
|
guange
|
907d89e1cc
|
merge
|
10 years ago |
|
yutao
|
233c68e965
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
68cf5fa55e
|
修复:当1个页面存在多个上传控件时的各种bug
|
10 years ago |
|
huang
|
7db9e2eb7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2fb5871058
|
缺陷显示新界面
|
10 years ago |
|
guange
|
e5a9d87ce1
|
新建贴吧如果放个图片就会撑坏版面
|
10 years ago |
|
alan
|
372bf71ca5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
a77a572a4d
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
10 years ago |
|
sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
10 years ago |
|
sw
|
3dc1b2642a
|
发布竞赛日期选择图标有问题
|
10 years ago |
|
sw
|
c241fc00e9
|
测试版--课程--课程作业：如图作业附件显示与图标重叠
|
10 years ago |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
10 years ago |
|
huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
725a6e4238
|
解决发布竞赛日历问题
|
10 years ago |
|
alan
|
0708279c5e
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
8a52225f4d
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
f9d9ffe4d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
963a21283f
|
1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
|
10 years ago |
|
guange
|
52217efcb6
|
issue中图片超出边框
|
10 years ago |
|
guange
|
d88b5dbbed
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
69afe8809e
|
经测试，转到rspec各方面成熟一点。
|
10 years ago |
|
huang
|
d60639f557
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
aef91be36c
|
修复新建缺陷样式冲突
|
10 years ago |
|
alan
|
0af8c1cc38
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
bd77ad9ac1
|
展开。收起
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
10 years ago |
|
guange
|
9f4d7fc033
|
merge
|
10 years ago |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
10 years ago |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
