 cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
 huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
guange
|
d2c7d12cd9
|
merge
|
10 years ago |
|
guange
|
8ea9430318
|
at链接问题修改
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
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 |
 ouyangxuhua
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
76b95fbf93
|
课程和项目的课程简介默认可显示20行
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
10 years ago |
|
huang
|
5060ec26bb
|
项目讨论区
|
10 years ago |
|
guange
|
fd746c25f3
|
文件下载改为base64传输
|
10 years ago |
|
guange
|
22d8fc9abd
|
作业附件乱码优化
|
10 years ago |
|
cxt
|
e86f9f9aeb
|
去掉通知页面的字符限制
|
10 years ago |
|
huang
|
ea51b24a4e
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
d0e139650f
|
issue回复的at出错
|
10 years ago |
|
huang
|
a080306f75
|
解决课程动态中，点击按钮，提交多次的问题
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
3b25616f0c
|
编辑作品时可编辑分组成员
|
10 years ago |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
10 years ago |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
10 years ago |
|
lizanle
|
4bc68081ee
|
editor修改
|
10 years ago |
|
lizanle
|
8d58b045f1
|
文件链接却弹出图片框 bug
|
10 years ago |
|
lizanle
|
b13ae8f599
|
issue
|
10 years ago |
|
lizanle
|
68aceaa7df
|
issue下载
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
cxt
|
af0e592d8a
|
匿评日期的设置
|
10 years ago |
|
cxt
|
d7b690e53a
|
匿评设置时匿评关闭日期可以等于匿评开启日期
|
10 years ago |
|
cxt
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
lizanle
|
d1423ebc7e
|
ke高度小修改。
|
10 years ago |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
f880ccd749
|
分组作业
|
10 years ago |
|
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
10 years ago |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
10 years ago |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
10 years ago |
|
lizanle
|
8f4c915c57
|
博客的非空验证bug
|
10 years ago |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
10 years ago |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
lizanle
|
7c1e9f0042
|
MathJax这些资源不能少。少了会在一些浏览器上出bug
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
94831443a5
|
MathJax的js
|
10 years ago |
|
lizanle
|
56613b6358
|
增加项目的显示
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
506709b474
|
个人资源库，课程 资源文件上传
1.单个上传
2.给出明确的提示
3.按钮联动
|
10 years ago |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
10 years ago |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
10 years ago |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
10 years ago |
|
lizanle
|
db0978c657
|
编辑的时候报500
|
10 years ago |
|
cxt
|
463262e838
|
提交作品时立马弹框
|
10 years ago |
|
huang
|
d2b56e2811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
5e9cc27c11
|
发布作业时的发布日期若未选择则默认为当天
|
10 years ago |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
|
cxt
|
9be1fe63b4
|
默认发布日期的格式
|
10 years ago |
|
huang
|
4608190529
|
增加点击选择历史版本记录
|
10 years ago |
|
lizanle
|
6ae28a1bef
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
de0ca8d3d8
|
课程相关的ke 内容提交bug
|
10 years ago |
|
lizanle
|
43d9c5636a
|
课程发布通知的在ie11下的bug
|
10 years ago |
|
huang
|
98ee22a3b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
f1092d5072
|
去掉上传文件的时候文件名后的 可选的描述
|
10 years ago |
|
huang
|
a4209bc9f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
3360a25a42
|
项目 主页 资源上传 不要翻页，直接弹出资源弹出框
|
10 years ago |
|
huang
|
edf9b4a6b5
|
修改样式
|
10 years ago |
|
cxt
|
25e1eb75ab
|
课程内发布作业失败
|
10 years ago |
|
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
10 years ago |
|
lizanle
|
4d7ca63a12
|
添加一个参数控制
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
|
10 years ago |
|
lizanle
|
b67afc2b95
|
大纲
|
10 years ago |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
|
huang
|
87b1790f04
|
未完成功能JS提示
|
10 years ago |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
34a8d0890c
|
相政新界面
|
10 years ago |
|
lizanle
|
69bc26033e
|
防止url删减报错
url博客内容长度限制改为20000
|
10 years ago |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
 Tim
|
17afc1a9fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
515dad66e2
|
课程资源库附件单独JS实现
|
10 years ago |
|
Tim
|
1dd0954a94
|
意见反馈宽度调整
|
10 years ago |
|
huang
|
588bc2ed98
|
页面显示公开/私有
|
10 years ago |
|
cxt
|
a16dc09afa
|
讨论区帖子图片可点击
|
10 years ago |
|
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
10 years ago |
|
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
10 years ago |
|
guange
|
bdecea83ca
|
js中edit报错
|
10 years ago |
|
cxt
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
10 years ago |
|
lizanle
|
c8357a6364
|
批量修改tag
|
10 years ago |
|
lizanle
|
56db8b4232
|
批量修改tag的bug
|
10 years ago |
 sw
|
7cba1e5f76
|
课程内发布作业按钮无反应
|
10 years ago |
|
sw
|
515e2be4f8
|
课程内的作业列表匿评设置确定按钮无效
|
10 years ago |
|
huang
|
da4b00e56c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
61061573a7
|
去掉版本库git操作指南
|
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
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
10 years ago |
|
cxt
|
955d87a98c
|
新增测试集的编辑框自适应高度
|
10 years ago |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
10 years ago |
|
sw
|
591324854b
|
项目缺陷点击留言，下面留言框获得焦点
|
10 years ago |
|
lizanle
|
c3d829a68f
|
名称检查
|
10 years ago |
|
lizanle
|
e0c338b497
|
限制字符长度
|
10 years ago |
|
lizanle
|
c8cbab2d50
|
火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同
|
10 years ago |
|
sw
|
6c62b44b59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
5f1b4b1b24
|
导入作业后编辑按钮、弹出框确定按钮不可用
|
10 years ago |
|
huang
|
8886bda790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
44c097dbaf
|
1、issue回复添加新的编辑器
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
|
10 years ago |
|
lizanle
|
924183b1cc
|
js合并错误
|
10 years ago |
|
guange
|
08eecbd5ec
|
merge
|
10 years ago |
|
guange
|
a42152553b
|
添加语言提示
|
10 years ago |
|
guange
|
0b4c8b05f1
|
JAVA语言支持
|
10 years ago |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
sw
|
f9f51557dd
|
增加关闭反馈功能
|
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 |
|
lizanle
|
b9ff46f8d0
|
帖子的编辑与删除
|
10 years ago |
|
sw
|
ad6fbf6c9b
|
点击作品名称、姓名、学号、时间列都可以展开作品
|
10 years ago |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
10 years ago |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
10 years ago |
|
huang
|
5b671c5109
|
issue 引用模式修改
issue相关代码优化
|
10 years ago |
|
sw
|
193eb0cb6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
afb1a8f53f
|
回复框发送按钮的样式调整
|
10 years ago |
|
sw
|
b5af66ffc2
|
取消匿评时间的js判断
|
10 years ago |
|
cxt
|
576adfac34
|
回复框中出现html代码的修复
|
10 years ago |
|
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 |
