txz
|
0d04f996c5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
cxt
|
035b47d2b7
|
issue页面的调整
|
9 years ago |
guange
|
606599047d
|
详情页出错
|
9 years ago |
guange
|
23ec67b2eb
|
详情页出错
|
9 years ago |
guange
|
afd779f292
|
使用cookies存储openid
|
9 years ago |
guange
|
80d5424ff3
|
详情页出错
|
9 years ago |
guange
|
619b07b5c2
|
服务器上调试openid成功
|
9 years ago |
txz
|
50c6b565e7
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
txz
|
11651fc866
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
bb5a527f9e
|
配置新菜单
|
9 years ago |
txz
|
b2a892bd22
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
417484f3ad
|
加入调试标志
|
9 years ago |
txz
|
48e26fce62
|
冲突解决
|
9 years ago |
txz
|
8c7de04dbf
|
项目问答详情页面
|
9 years ago |
guange
|
36f3e3a46c
|
改为angularjs实现
|
9 years ago |
guange
|
58c1b27600
|
加入openid传参
|
10 years ago |
guange
|
e1f1c6fbc0
|
openid参数
|
10 years ago |
guange
|
1926f0ba53
|
修改openid路由
|
10 years ago |
guange
|
9c93b3f9a6
|
修改openid调用位置
|
10 years ago |
guange
|
7d4de36521
|
修改openid调用位置
|
10 years ago |
guange
|
5839959f0a
|
修改openid调用位置
|
10 years ago |
cxt
|
9da89ef5e2
|
课程通知的回复
|
10 years ago |
cxt
|
d47f887fd1
|
issue回复的修改
|
10 years ago |
cxt
|
bc5e455f0f
|
解决冲突
|
10 years ago |
cxt
|
790b452a9b
|
issue回复
|
10 years ago |
txz
|
d45604c4a0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
txz
|
3b70970651
|
问题跟踪详情页面修改
|
10 years ago |
cxt
|
cc2fe6108a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
cxt
|
5e697e5367
|
作业的回复
|
10 years ago |
txz
|
0d24de7198
|
详情页面回复
|
10 years ago |
cxt
|
7dccb0d963
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
cxt
|
88c39512b9
|
journal的修改
|
10 years ago |
txz
|
58e5fe85c3
|
issue 详情页面
|
10 years ago |
txz
|
4902361b3f
|
冲突解决
|
10 years ago |
txz
|
596bf641ac
|
最新动态各详情页面
|
10 years ago |
cxt
|
b3b0488bf5
|
动态点击更多
|
10 years ago |
Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
10 years ago |
Yiang Gan
|
392c5708f2
|
作业详情页面
|
10 years ago |
Tim
|
77e11fe0fe
|
微信最新动态修改
|
10 years ago |
Yiang Gan
|
4de598873f
|
动态和作业的api
|
10 years ago |
ouyangxuhua
|
9e599da365
|
组织动态,点击展开更多没有反应问题解决
|
10 years ago |
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
10 years ago |
ouyangxuhua
|
1a1d5b4c49
|
解决:发送功能在中文输入的情况下,会出现输入框内容增多的问题
|
10 years ago |
Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
10 years ago |
Tim
|
a9fd79ec63
|
微信动态筛选
|
10 years ago |
guange
|
d5124e128e
|
添加调试功能
|
10 years ago |
guange
|
60931dde6a
|
添加获取openid的功能
|
10 years ago |
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
10 years ago |
Tim
|
4f7d698076
|
wechat init
|
10 years ago |
yuanke
|
e62ee2eade
|
修改评测问题
|
10 years ago |
yuanke
|
63ae921c40
|
return 放错位置了
|
10 years ago |
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
yuanke
|
3c1be19702
|
修改编程提示语句
|
10 years ago |
yuanke
|
1f9d2ceffb
|
修改下编程的提示
|
10 years ago |
yuanke
|
0fd164d2bb
|
修改编程的几个提示语句
|
10 years ago |
yuanke
|
3af257eb77
|
评测服务器有问题时得提示
|
10 years ago |
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
10 years ago |
yuanke
|
c6361406b5
|
代码评测超时优化
|
10 years ago |
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序,带过滤条件,如tag类型、搜索条件等
|
10 years ago |
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织;组织名称长度限制;组织栏目添加帖子加上栏目名称;编辑组织时,如果组织名称没变,就不需要提示;学生回复老师的作业留言,打开后,显示该学生作业;新增、编辑组织文章,需要验证标题
|
10 years ago |
guange
|
7804a1e9ec
|
url更改
|
10 years ago |
guange
|
908b3dfdbd
|
利用reactjs前后端分离
|
10 years ago |
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
10 years ago |
guange
|
6ae4cd0767
|
merge
|
10 years ago |
guange
|
59923dfb03
|
merge
|
10 years ago |
guange
|
b356c6cd1f
|
答案提交加入超时处理
|
10 years ago |
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
10 years ago |
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
10 years ago |
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
10 years ago |
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
10 years ago |
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
10 years ago |
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
10 years ago |
luoquan
|
1900a824e8
|
0
|
10 years ago |
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业,设置评分等按钮点击没反应的问题修复;更新项目/课程的活动,相应地更新组织的活动的更新时间
|
10 years ago |
yuanke
|
5dcd3b6826
|
解决KE工具栏一行与两行显示不一致的情况
|
10 years ago |
cxt
|
91d000c8f3
|
编程作业:编程测试集的弹框中,多行却只显示一行
|
10 years ago |
guange
|
509d4a3df7
|
绑定提交改为ajax
|
10 years ago |
guange
|
445bae6de9
|
patch mysql5.7的create table
|
10 years ago |
cxt
|
072300331b
|
编程测试集的输入输出添加序号
|
10 years ago |
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
10 years ago |
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
10 years ago |
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
10 years ago |
ouyangxuhua
|
5df44ba44f
|
1.ke回复框能自动增加高度;2.组织页面右上角链接修改
|
10 years ago |
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后,编辑时不能增加附件“的问题
|
10 years ago |
guange
|
ac121ce585
|
组织文章无法编辑问题
|
10 years ago |
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
10 years ago |
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
10 years ago |
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
10 years ago |
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度;2.https://www.trustie.net/manual/feedback链接到帮助中心;3.编辑框显示更多选项
|
10 years ago |
ouyangxuhua
|
c857fb734b
|
快捷回复中,设置回复框的高度和宽度
|
10 years ago |
ouyangxuhua
|
89a919163c
|
一旦组织私有,就disabled掉允许游客下载选项
|
10 years ago |
cxt
|
f632a3d4fb
|
编程弹框固定位置
|
10 years ago |
cxt
|
8f1bffd28b
|
留言不能为空
|
10 years ago |
cxt
|
bb67a8f77d
|
若测试集够长,点击增加测试集,此时应该自动定位到测试集输入框
|
10 years ago |
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
10 years ago |
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一,分享文件、通知等均可复用
|
10 years ago |
cxt
|
247924af26
|
动态内容显示不全
|
10 years ago |
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
10 years ago |
Tim
|
c7edf0d73b
|
弹框样式修改
|
10 years ago |
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
10 years ago |
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
huang
|
c936304314
|
课程默认收起
|
10 years ago |
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
10 years ago |
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度;2.编辑博客首页转到博客首页
|
10 years ago |
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 |
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
|
还原JQuery版本
|
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 |
sw
|
7ad3c2d578
|
修改项目配置js
增加项目配置相关子界面
|
10 years ago |
sw
|
837fe88545
|
还原冲突,增加项目配置切换js
|
10 years ago |
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
10 years ago |
whimlex
|
5936d8d8e9
|
评论显示
|
10 years ago |
whimlex
|
874dcc2b89
|
附件上传国际化调整
|
10 years ago |
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
10 years ago |
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段(判断种类)
|
10 years ago |
huang
|
45fa01c773
|
修改缺陷不能显示的bug
|
10 years ago |
guange
|
0325554d24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
10 years ago |
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
11 years ago |
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
11 years ago |
sw
|
663c9aad60
|
1、课程通知列表出现html代码
2、整理课程通知部分js
3、还原编辑器js代码
|
11 years ago |
guange
|
89af4b451b
|
#2100 IE8中,课程--老师发布作业/学生提交作业,上传附件提交不了
|
11 years ago |
sw
|
ba4894239c
|
1、部分浏览器下新建课程页面密码默认填写,课时默认填写为登录名
2、修改课程密码显示取消明码显示
|
11 years ago |
sw
|
3bedddd190
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
11 years ago |
huang
|
df43274565
|
新版项目界面(部分未完成,先合并)
1、项目框架整理
2、各页面样式
|
11 years ago |
whimlex
|
7b09fd0489
|
作业的时间选择器选择时间后不能自动关闭
|
11 years ago |
sw
|
b971147aa8
|
1、添加通知会alert
2、添加通知描述样式
3、通知添加评论样式
|
11 years ago |
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
11 years ago |
sw
|
046536230c
|
增加课程配置界面、成员的基本信息以及相关js
|
11 years ago |
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
11 years ago |
sw
|
7b70369438
|
上传文件样式调整
|
11 years ago |
z9hang
|
41e372c16a
|
上传资源按钮样式调整
|
11 years ago |
sw
|
2ca2f90830
|
上传文件js问题
|
11 years ago |
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
11 years ago |
sw
|
c68349803e
|
1、课程讨论区、通知提示信息样式
2、整理js
|
11 years ago |
sw
|
519c119543
|
修改上传文件样式
|
11 years ago |
sw
|
9a2f572cf4
|
是否启用匿评功能异常
|
11 years ago |
sw
|
cb1fce32fe
|
配置课程
|
11 years ago |
sw
|
8f90fed8be
|
新建课程界面完成
|
11 years ago |
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
11 years ago |
sw
|
ab3a3a8573
|
学生收索功能
|
11 years ago |
whimlex
|
05d17361e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
11 years ago |
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充;部分国际化
|
11 years ago |
sw
|
7b379456ed
|
课程作业描述很长时才显示更多按钮
|
11 years ago |
sw
|
6c5cf50bf0
|
去掉弹框js
|
11 years ago |
sw
|
27e7bc21b5
|
当课程简介内容很少时(点击显示更多没有反应),取消显示更多按钮的显示
|
11 years ago |
guange
|
4b636d8be6
|
#1801 打包上传分个数下载完成
|
11 years ago |
guange
|
bdf419438e
|
merge
|
11 years ago |
z9hang
|
8190d0cecc
|
修改留言页面样式
|
11 years ago |
z9hang
|
be46142b3c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
|
11 years ago |
z9hang
|
19eaa012b7
|
讨论区样式调整
|
11 years ago |
sw
|
2ef10e89ac
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
sw
|
273e82f620
|
修改poll的show界面的样式
|
11 years ago |
sw
|
7970bd6df0
|
1、增加作业截至时间的js显示
2、截止时间到了之后的显示
|
11 years ago |
z9hang
|
a2ec9c661a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
sw
|
f3fefe50f1
|
1、增加flash显示样式
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
|
11 years ago |
guange
|
1126d9b9a9
|
#2082 IE8浏览器--任意模块上传附件:上传附件后,“未上传文件”字样并未随着附件的上传变成“已上传X个文件”
|
11 years ago |
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
11 years ago |
z9hang
|
d44bbe9de1
|
课程通知界面新建通知修改
|
11 years ago |
sw
|
5139ac30dc
|
修改老师新建作业界面
|
11 years ago |
z9hang
|
bcfdac37a7
|
课程资源中的图片点击下载有弹框改为预览图片
|
11 years ago |
z9hang
|
27a4e462de
|
jpeg图片预览
|
11 years ago |
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
whimlex
|
34579e395f
|
附件上传bug修改;意见反馈收拉一致
|
11 years ago |
z9hang
|
1cd2984c05
|
#2066 网站中的图片附件链接,能否点击后直接在浏览器中显示,而不是下载?
|
11 years ago |
whimlex
|
5924cd6432
|
commit
|
11 years ago |
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
11 years ago |
whimlex
|
3837e1fcf5
|
申请加入:附件上传
|
11 years ago |
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
11 years ago |
sw
|
b9ed34f86e
|
1、右边内容区域、增加js:最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
11 years ago |
sw
|
64b0646281
|
base_course基本完成
|
11 years ago |
sw
|
16872597b6
|
实现课程搜索
|
11 years ago |
z9hang
|
943258aebe
|
#2025 项目--资源库:上传资源时,分类资源为“课件”或“研究报告”,成功上传后,都是源代码
|
11 years ago |
sw
|
d2c7861706
|
1、添加缺少图片
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
|
11 years ago |
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
guange
|
38c3b40ca1
|
#1701 修复在编辑作业时,删附件会导致名称编辑内容丢失
|
11 years ago |
guange
|
31351bc9e8
|
#1095 在issue主题下,输1个字符可以进行搜索,500错误解决
|
11 years ago |
lizanle
|
7ee58d1d44
|
项目动态重写,并去掉首页缓存
|
11 years ago |
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
lizanle
|
4461a66c7a
|
添加刷新函数
|
11 years ago |
lizanle
|
c82722c220
|
日期选择js
|
11 years ago |
sw
|
a1f21f3ebb
|
1、修改一次添加一个题目
2、新增题目时,新建题目获取焦点
3、新增题目后页面事件改变
|
11 years ago |
alan
|
63c9804da8
|
添加course_group表单到数据库中,并建立对应于members和courses之间的关联,
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
ace5b514c6
|
修改bug<测试版--注册登录:成功激活注册的用户后,登录返回资料修改的页面,姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
90e4387395
|
修复登录
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
949867c50b
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
12de248e87
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
z9hang
|
e297bb2687
|
修改匿评
|
11 years ago |
z9hang
|
cd1be67b8c
|
学生可多次评分、评分完毕不在提示评分成功
|
11 years ago |
z9hang
|
cc71682e40
|
评分前添加无法修改提示
|
11 years ago |
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
sw
|
e2897b3d1a
|
修改匿评弹出框样式
|
11 years ago |
gonglexin
|
4f3b1a670d
|
去掉 titlebar 的颜色
|
11 years ago |
z9hang
|
0723643ca6
|
#1410新建贴吧:输入贴吧描述为非汉字类型,编辑框不会自动换行
|
11 years ago |
alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
z9hang
|
3d860af48b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/contest.html.erb
app/views/welcome/index.html.erb
public/javascripts/attachments.js
|
11 years ago |
z9hang
|
269e1cf497
|
1、空数据库情况下3个主页布局修改。2、上传附件成功提交后公开自动变成私有的bug
|
11 years ago |
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
gonglexin
|
6e0c916246
|
#1026 上传出现网络问题时给出提示
|
11 years ago |
sw
|
1361801723
|
上传文件描述最长限定254个字符
|
11 years ago |
linhk
|
879e93beb9
|
项目、竞赛、课程首页的微信部分样式修改并添加js跟随滚动处理
|
11 years ago |
z9hang
|
38c5c86a39
|
日期选择器不能用问题
|
11 years ago |
nwb
|
095cb7fc32
|
加强对chrome浏览器文件上传的支持
|
11 years ago |