 sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
9d2b58738e
|
分班过滤功能
|
10 years ago |
|
sw
|
90536efa1e
|
课程内姓名学号邮箱过滤，各种排序 改为js刷新页面
|
10 years ago |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
10 years ago |
 cxt
|
9be7e633ae
|
动态回复框的样式调整
|
10 years ago |
guange
|
8ab08ea30f
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
guange
|
b6240127a9
|
对编程框进行代码着色
|
10 years ago |
|
sw
|
2a8cf2885a
|
布置作业时选择语言显示不正确
|
10 years ago |
|
sw
|
ccd19021ae
|
课程动态回复之后，编辑器变宽
|
10 years ago |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
10 years ago |
|
cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
10 years ago |
|
guange
|
bebc602efc
|
merge
|
10 years ago |
 lizanle
|
9443c139f0
|
update forum
|
10 years ago |
 huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
cacb3e043a
|
动态回复框的焦点前焦点后样式调整
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
ad610cb0b2
|
测试集输入输出框的自适应高度
|
10 years ago |
|
sw
|
859fe01c52
|
1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
|
10 years ago |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
10 years ago |
|
sw
|
cc7a752623
|
到处附件、缺评、匿评、成绩列表
|
10 years ago |
|
sw
|
47cdf1231d
|
匿评评分，成绩提示框的显示
|
10 years ago |
 Tim
|
3d5f93b938
|
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
app/views/users/_user_activities.html.erb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
|
Tim
|
77a8c18a77
|
1.关于我们样式修改；
2.登录界面格式调整；
3.个人动态回复样式调整；
|
10 years ago |
|
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
sw
|
cd96fd99a8
|
快速创建项目
|
10 years ago |
|
cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
10 years ago |
|
sw
|
f79b2cda94
|
提交作品关联项目功能
|
10 years ago |
|
sw
|
8f3889e2c5
|
编程作品提交框自动增高
|
10 years ago |
|
sw
|
b6452bb652
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ecf2ac5e19
|
课程内发布作业增加提示
|
10 years ago |
|
lizanle
|
c701eefb42
|
暂时不添加 我要回复
|
10 years ago |
|
lizanle
|
b99663a773
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
9f871ababb
|
添加 我要回复
|
10 years ago |
|
sw
|
37f235c2ab
|
导入编程作业
|
10 years ago |
|
sw
|
96405d7c0c
|
取消之后编程按钮无效
|
10 years ago |
|
guange
|
ca8f943a97
|
js函数重构
|
10 years ago |
|
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
10 years ago |
|
sw
|
f4c19c0fb0
|
1、homework.js on改为live
2、导入作业之后，编程功能按钮消失
|
10 years ago |
|
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
10 years ago |
|
lizanle
|
cc6fe754d4
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
10 years ago |
|
sw
|
e30abd2a81
|
提交、修改作品界面宽度
|
10 years ago |
|
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
401b0bc7e3
|
textarea自动拉伸高度优化，编辑普通作业作品功能完成
|
10 years ago |
|
sw
|
b1463f0864
|
学生提交匿评作业作品功能实现
|
10 years ago |
|
lizanle
|
24dce81b31
|
高度参数用一个
|
10 years ago |
|
lizanle
|
c393a0ea01
|
个人中心 留言界面 编辑框 ie浏览器下报错
|
10 years ago |
|
lizanle
|
b2afe18ccd
|
个人中心 留言界面 编辑框自适应高度
|
10 years ago |
|
lizanle
|
4ad139e6fd
|
添加一点注释
|
10 years ago |
|
lizanle
|
1dd4700eb2
|
个人中心留言功能 编辑框自适应高度
|
10 years ago |
|
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知，讨论区，留言都可以自动的长高，缩短
|
10 years ago |
|
sw
|
137a0b16a0
|
1、文件的样式图片
2、点击编程弹框时，测试输入获取焦点
|
10 years ago |
|
guange
|
52c2719a46
|
去掉老式的编程作业提交
|
10 years ago |
|
lizanle
|
23e60bf007
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
de822daf44
|
个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
|
10 years ago |
|
guange
|
9e9f373a76
|
发布作业优化
|
10 years ago |
|
guange
|
04dffb2f89
|
模拟回答界面调整
|
10 years ago |
|
guange
|
216bc7f70f
|
动态中作业的提交状态修改
|
10 years ago |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
10 years ago |
|
guange
|
bacb5f859b
|
merge
|
10 years ago |
|
guange
|
a69cee4b26
|
老师测试功能
|
10 years ago |
|
sw
|
ee60905eda
|
回复之后回复框消失
|
10 years ago |
|
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
10 years ago |
|
lizanle
|
0e68bbc5bd
|
调整回复框高度
|
10 years ago |
|
lizanle
|
5135f749a4
|
调整回复框高度
|
10 years ago |
|
lizanle
|
f05270a519
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
6fdd3a8e86
|
调整回复框高度
|
10 years ago |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
10 years ago |
|
huang
|
a05a3074dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
0bb0a97fd5
|
个人主页新增留言回复按钮无作用
|
10 years ago |
|
sw
|
59b42e2b33
|
还原ＪＱｕｅｒｙ版本
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
sw
|
62360175d1
|
课程通知回复时，所有回复框都会提交
|
10 years ago |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
10 years ago |
 ouyangxuhua
|
8403d5365c
|
修改项目新闻提示
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
guange
|
85ee2b86cd
|
.
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
sw
|
3f61a908d1
|
部分界面样式调整
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
sw
|
049e27f15f
|
发布作业功能
|
10 years ago |
|
sw
|
ccfa93be66
|
老师布置作业界面
|
10 years ago |
|
sw
|
757da1ec0a
|
调整编辑资料样式
|
10 years ago |
|
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
10 years ago |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
10 years ago |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
10 years ago |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
10 years ago |
|
sw
|
86b151979b
|
js相关
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
sw
|
2a522f144e
|
编辑个人简介
|
10 years ago |
|
sw
|
8ef6225084
|
个人主页，添加、取消关注及相关效果
|
10 years ago |
|
sw
|
73854cc35c
|
右侧静态页面如果没有内容时增加默认最小高度
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
sw
|
d8da74a0d4
|
更新css，增加个人主页公共部分的动态效果
|
10 years ago |
|
sw
|
752fe93d72
|
已登录用户header完成
|
10 years ago |
|
lizanle
|
421f86cdaf
|
资源库
|
10 years ago |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
10 years ago |
|
sw
|
16aea5ef42
|
迟交扣分0-50分
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
|
sw
|
cbbc93acbd
|
当标准代码内容改变时，自动还原所有的测试信息
|
10 years ago |
|
huang
|
b42d8c6d2c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
a74409fa04
|
回复子留言不成功
|
10 years ago |
|
sw
|
a52c906217
|
用户留言界面插件问题
|
10 years ago |
|
huang
|
93ef63d60d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/layouts/base_users_new.html.erb
|
10 years ago |
|
sw
|
f163cdac51
|
老师点击测试自动刷新，每组测试对标准代码的返回结果存储
|
10 years ago |
|
sw
|
3e5af49281
|
点击测试时增加事件的发送
|
10 years ago |
|
sw
|
5e885d9417
|
老师布置编程作业界面增加测试，以及测试结果的存储
|
10 years ago |
|
sw
|
28509b7cdd
|
老师布置编程作业界面增加测试按钮
|
10 years ago |
|
sw
|
32122796f9
|
1、我的课程、我的项目留言js问题
2、编辑资料无法提交
3、访问他人项目不显示加入项目按钮
|
10 years ago |
|
sw
|
7628a53cdc
|
留言回复
|
10 years ago |
|
sw
|
e4e99df113
|
个人主页留言界面显示以及留言的删除
|
10 years ago |
|
huang
|
55f8484654
|
项目留言提交JS问题修复
|
10 years ago |
|
sw
|
8ef0d0f8a6
|
1、个人主页，布局右侧显示不够左侧长度时自动补充
2、个人主页js、css提取出来
3、css错误整理
|
10 years ago |
|
sw
|
8c82f6c6a7
|
编程作业新增测试取消测试按钮
|
10 years ago |
|
sw
|
d0482fdb65
|
作品列表搜索报500
|
10 years ago |
|
sw
|
b6e123e476
|
右上角导航栏问题
|
10 years ago |
|
sw
|
66c1dfa77e
|
作品列表增加分班的过滤
|
10 years ago |
|
sw
|
6af6fdd5a3
|
编程作业分配比例添加以及界面显示
|
10 years ago |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
10 years ago |
|
sw
|
642fa8dd5d
|
1、缺评、迟交扣分
2、匿评提示框、最终成绩计算提示框
3、修改作业
|
10 years ago |
|
sw
|
59f6ef81cd
|
附件提示框固定位置
|
10 years ago |
|
sw
|
0f92a2e3cb
|
下载附件给出使用winrar解压的提示
|
10 years ago |
|
sw
|
ebeeb9cf28
|
开启匿评后学生提交作品提示，开启匿评时对老师的提示
界面css
|
10 years ago |
|
guange
|
38b97aa558
|
下载url有两处需要处理的
|
10 years ago |
|
guange
|
81187dea36
|
有带+号的作业无法打包下载的问题
|
10 years ago |
|
sw
|
810561c31b
|
老师才可以查看缺评情况
|
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 |
|
sw
|
dd8e8e38ac
|
删除无用js
|
10 years ago |
|
sw
|
61eb3ecc62
|
1、新建作业上一步下一步改为页面刷新
2、下一步路由改为post
|
10 years ago |
|
sw
|
44e3daa0d2
|
1、老师新建作业，两类作业的选择
2、编程作业静态页面的添加
|
10 years ago |
|
sw
|
06009934d8
|
编辑新闻无法编辑成功
|
10 years ago |
|
sw
|
a5d7c50fe3
|
课程通知展开按钮
|
10 years ago |
|
sw
|
57804a118d
|
课程作业列表中展开按钮
|
10 years ago |
|
sw
|
79893c4917
|
作业提交时，根据验证结果相应空间focus
|
10 years ago |
|
sw
|
f7b3229065
|
当作品中没有附件时，下载报错
|
10 years ago |
|
sw
|
c31e370ad6
|
课程资源列表：选人我的课程、选入我的其他课程弹出框关闭按钮异常
|
10 years ago |
|
sw
|
bf653fa94f
|
课程作品列表搜索功能异常
|
10 years ago |
|
sw
|
0ff088f96d
|
作品列表增加搜索按钮，取消搜索框手型显示
|
10 years ago |
|
sw
|
442c991500
|
打分滑条取消分数的title
|
10 years ago |
|
sw
|
c161441796
|
课程通知如果没有超过限定长度不显示更多按钮
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
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
|
8c6ea88504
|
1、作品列表TAB切换
2、作品界面作业详细信息
3、到处Excel名称
|
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 |
|
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 |
|
huang
|
95f3d89afa
|
项目新闻添加编辑器：显示页面、列表页面新样式显示
|
10 years ago |
|
sw
|
1fe7c70955
|
1、评价作品增加批阅结果的删除与显示
2、修改课程的昵称下拉框无法正常显示
|
10 years ago |
|
sw
|
f3597d9aa5
|
开启/关闭匿评弹框提示
|
10 years ago |
|
huang
|
052d293f82
|
新建项目时候：
如果我的项目中有重名的项目不允许新建
|
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
|
4a588506a4
|
增加编辑器
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
10 years ago |
|
sw
|
296d4a678c
|
新建作业js验证以及页面操作js效果添加
|
10 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
10 years ago |
|
alan
|
052868a6b4
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
10 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
10 years ago |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
10 years ago |
|
guange
|
588d96a0c0
|
头像上传只允许图片
|
10 years ago |
|
yutao
|
68cf5fa55e
|
修复:当1个页面存在多个上传控件时的各种bug
|
10 years ago |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
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
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
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
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
10 years ago |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
10 years ago |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
10 years ago |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
10 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
10 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
10 years ago |
|
alanlong9278
|
f638dd6810
|
课程讨论区
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
3f88a67eef
|
编辑器支持直接粘贴QQ截屏
|
10 years ago |
whimlex
|
3c72af69ea
|
版本库刷新页面时“git操作指南”展开收起保持一致
|
10 years ago |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
10 years ago |
|
sw
|
2e26e27298
|
版本库收起后之保存在cookie中，刷新页面后仍保持收起状态
|
10 years ago |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
10 years ago |
|
whimlex
|
f3fb0115e4
|
版本库git操作文档默认展开，样式调整
|
10 years ago |
|
whimlex
|
40fdda0ee2
|
版本库git帮助文档的显示与隐藏
|
10 years ago |
|
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
10 years ago |
|
whimlex
|
85e1262769
|
意见反馈
|
10 years ago |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
10 years ago |
|
whimlex
|
b61d76d94e
|
意见反馈
|
10 years ago |
|
whimlex
|
b3e0490b90
|
意见反馈
|
10 years ago |
|
whimlex
|
5d0d9de6e8
|
意见反馈各主页内保持一致
|
10 years ago |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
10 years ago |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
10 years ago |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
10 years ago |
|
sw
|
3d8ec17bb1
|
修改学生作业得分列表弹出框样式
|
10 years ago |
|
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
10 years ago |
|
huang
|
692500af2e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
93e3247685
|
项目名称不能为空提示
|
10 years ago |
|
alanlong9278
|
0668af4f89
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/bids/_bid_homework_show.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
10 years ago |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
10 years ago |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
10 years ago |
|
whimlex
|
e9cf61e0f4
|
缺陷状态根据完成度调整
|
10 years ago |
 z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
10 years ago |
|
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
10 years ago |
|
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
10 years ago |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
10 years ago |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
whimlex
|
9c07976751
|
展开和收起更多信息图片样式修改；跟踪者样式修改
|
10 years ago |
|
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
10 years ago |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
10 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
10 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
10 years ago |
|
alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
|
sw
|
8c122a35f7
|
项目类型切换到其他类型后，再切回开发组，更多按钮不可用
|
10 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
10 years ago |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
10 years ago |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
10 years ago |
|
sw
|
01f56a761f
|
完成配置---模块
|
10 years ago |
