 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 |
