 huang
|
635e6300a1
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
Conflicts:
app/helpers/users_helper.rb
app/views/users/_project_issue_detail.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
db/schema.rb
|
9 years ago |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
9 years ago |
 cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
9 years ago |
|
cxt
|
95170b0b2b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
guange
|
231df07c29
|
移除pry
|
9 years ago |
 ouyangxuhua
|
a451680cf8
|
发送文件时，记录放在表forwards中
|
9 years ago |
|
cxt
|
e6ed988c10
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
296d6efbf1
|
单文件作业不压缩
|
9 years ago |
|
cxt
|
070af9ad73
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e4bf35a1b8
|
个人留言的回复不能自动刷新
|
9 years ago |
|
huang
|
40fb140b6d
|
版本库提交记录diff信息
|
9 years ago |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
c91ef44570
|
组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码
|
9 years ago |
|
cxt
|
b6bf78a5df
|
当天发布的资源显示未发布、日期选择器用中文
|
9 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
9 years ago |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
9 years ago |
|
cxt
|
ba66425bef
|
学生打开分组作业列表报500
|
9 years ago |
|
ouyangxuhua
|
1216f49ac2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
|
9 years ago |
|
huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
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
|
9 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
|
9 years ago |
|
huang
|
212b37ef84
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
9 years ago |
|
ouyangxuhua
|
fa08935f68
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/projects/settings/_new_repositories.html.erb
|
9 years ago |
|
huang
|
534d93de77
|
弹框位置调整
|
9 years ago |
|
cxt
|
096320d04c
|
发布问卷时默认选中“允许学生查看调查结果”
|
9 years ago |
|
guange
|
b2551f904b
|
组织没有显示的问题
|
9 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
8b9bcb4719
|
导入题库的搜索不起作用
|
9 years ago |
|
guange
|
71778ba948
|
拷贝课程图标
|
9 years ago |
|
guange
|
724ff31751
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
9 years ago |
|
guange
|
eb9232a087
|
at controller 的json应该登录
|
9 years ago |
|
cxt
|
ee73191a19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1b5cdbe628
|
推荐的私有课程，点击“资源”返回403，点击“作业”也应该返回403
|
9 years ago |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
9 years ago |
 Tim
|
fa70e8a714
|
代码错误
|
9 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
9 years ago |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
9 years ago |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
9 years ago |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
9 years ago |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
9 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
9 years ago |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
9 years ago |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
9 years ago |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
9 years ago |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
9 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
dda64245b3
|
解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。
|
9 years ago |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
9 years ago |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
9 years ago |
|
cxt
|
b6e13340e5
|
个人留言的删除功能
|
9 years ago |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
9 years ago |
|
Tim
|
a2afec77e3
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
Conflicts:
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
9 years ago |
|
cxt
|
4465e93dae
|
最近登录报500
|
9 years ago |
|
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
8a2a1d2bc9
|
Merge branch 'szzh' into develop
|
9 years ago |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
9 years ago |
|
cxt
|
3de8687440
|
留言页面的动态内容不生成链接，留言回复的样式更改
|
9 years ago |
|
huang
|
19bb545993
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
16cb4add09
|
issue局部刷新属性问题
|
9 years ago |
|
ouyangxuhua
|
26f8500671
|
博客回复后，该博客的更新时间为当前时间
|
9 years ago |
|
ouyangxuhua
|
2d07801f52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
dbed8379d3
|
新建组织允许游客下载选项功能修复
|
9 years ago |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
9 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
b5bfa6d824
|
1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。
|
9 years ago |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
9 years ago |
|
ouyangxuhua
|
b5159d54c8
|
博客按更新时间排序
|
9 years ago |
|
huang
|
edd198e91f
|
issue刷新
|
9 years ago |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
9 years ago |
|
ouyangxuhua
|
b6460633d2
|
个人博客按更新时间倒排
|
9 years ago |
|
ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
9 years ago |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
9 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
9 years ago |
|
huang
|
7de48f143e
|
issue状态修改
|
9 years ago |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
9 years ago |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
9 years ago |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
9 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
9 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
9 years ago |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
9 years ago |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
9 years ago |
|
cxt
|
e293805488
|
点击在线问卷时若未登录则直接跳到登录页面
|
9 years ago |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
9 years ago |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
cxt
|
c5935a6a46
|
博客动态添加点赞
|
9 years ago |
|
cxt
|
9cabb0248a
|
已点过赞的动态显示”已赞“
|
9 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
9 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
cxt
|
c49a290d56
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
9 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
9 years ago |
|
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
9 years ago |
|
cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
9 years ago |
|
cxt
|
eb63ac59f2
|
作品提交不成功
|
9 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
9 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
9 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
9 years ago |
|
huang
|
49d456bf21
|
修改数据统计信息
|
9 years ago |
|
huang
|
5fe4e9e813
|
创建项目的时候创建项目得分记录
|
9 years ago |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
9 years ago |
|
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
10 years ago |
|
cxt
|
bf6f46174e
|
课程讨论区回复的点赞
|
10 years ago |
|
cxt
|
093574ebef
|
首页课程讨论区动态的点赞
|
10 years ago |
|
cxt
|
5c1ff1f6f7
|
关联项目时不显示已删除的项目
|
10 years ago |
|
guange
|
d935532f8d
|
课程讨论区at功能
|
10 years ago |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
10 years ago |
|
huang
|
4b26e77478
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/models/issue.rb
app/models/message.rb
app/models/news.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
10 years ago |
|
huang
|
7697dadbea
|
版本库统计次数刷新版本库的时候自动更新
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
|
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
64088f5a21
|
项目数据存入数据库（统计数据直接从数据库获取）
|
10 years ago |
|
Tim
|
46217fb85d
|
切换分支后新出现文件
|
10 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
8ead573872
|
组织设置url
|
10 years ago |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
10 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
|
huang
|
83881766b2
|
提交总数接口获取修改
|
10 years ago |
|
huang
|
28c3dca099
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
66c3cee3f8
|
课程关联组织列表
|
10 years ago |
|
huang
|
c719fd96a3
|
0
|
10 years ago |
|
cxt
|
a3370b693c
|
课程关联组织列表为空
|
10 years ago |
|
huang
|
f9bc1efd7c
|
issue编辑的时候ajax刷新附件
|
10 years ago |
|
huang
|
3df542ff6a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
64889fd14a
|
项目资源提供新分页
|
10 years ago |
|
ouyangxuhua
|
5d819625c0
|
快捷菜单上传文件使用最新的上传方式
|
10 years ago |
|
ouyangxuhua
|
3a62db6475
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
ouyangxuhua
|
ceeec3af12
|
修改一些bug
|
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 |
|
huang
|
762ebb150b
|
解决课程资源重复分页问题
|
10 years ago |
|
cxt
|
90f6f07f19
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
0ab500986a
|
发送搜索功能
|
10 years ago |
|
huang
|
57af22e3af
|
项目资源库tag增、删、改ajax
|
10 years ago |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
10 years ago |
|
ouyangxuhua
|
c500fc13db
|
解决组织动态中，第二页重复显示第一页动态的问题
|
10 years ago |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
10 years ago |
|
cxt
|
2aea4da310
|
导出的测验成绩列表添加”班级“
|
10 years ago |
|
guange
|
067f3be598
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
5ebfbc901a
|
at排序按照拼音来
|
10 years ago |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
10 years ago |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
10 years ago |
|
cxt
|
2b75c1e11a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
151c08ac5c
|
复制学期
|
10 years ago |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
10 years ago |
|
huang
|
8f7d5c8a35
|
项目资源库，上传资源类型，创建资源
|
10 years ago |
|
huang
|
972f2bfea8
|
完成项目资源库tag云的查询统计
|
10 years ago |
|
huang
|
d0a8b4bc18
|
项目资源云搜索
|
10 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
huang
|
c4718f992c
|
项目资源搜索
|
10 years ago |
|
Tim
|
17800e8cf2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
huang
|
0d6ad9ffac
|
修改课程删除后可以显示的问题
|
10 years ago |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
|
ouyangxuhua
|
8dd34f91c3
|
课程/项目配置关联组织，仅关联用户的组织
|
10 years ago |
|
huang
|
9e87e63b82
|
系统消息去掉附件
|
10 years ago |
|
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
7f751cfc63
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
11444f43f0
|
解决issue多附件，删除一个附件后，提交弹出白色框框的问题
|
10 years ago |
|
cxt
|
f0216cf604
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
10 years ago |
|
huang
|
0541294c33
|
为解决完：
1、user_message_system附件显示问题
2、issue回复添加附件问题
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
c3b7662cac
|
issue按更新时间排序
|
10 years ago |
|
lizanle
|
fccbbe6e2b
|
不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源，那么该资源的更新时间会变化
|
10 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
lizanle
|
57ef7a2d4a
|
发送资源默认为私有的。
|
10 years ago |
|
lizanle
|
2c7ef034cb
|
资源库更改
|
10 years ago |
|
cxt
|
2c5a4f8a13
|
发布和编辑作业时的启用匿评改为禁用匿评，默认不选中
|
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 |
|
Tim
|
e876cb09d9
|
自动出现的controller文件
|
10 years ago |
|
lizanle
|
b132e8483c
|
个人资源库搜索不到组织资源
|
10 years ago |
|
ouyangxuhua
|
68a6f3f7f2
|
1.组织管理员有删除帖子的权限；2.删除帖子后更新org_activities表
|
10 years ago |
|
ouyangxuhua
|
29c720a8a4
|
1.权限管理问题
|
10 years ago |
|
lizanle
|
0ef0045941
|
发送功能要添加copy_from
|
10 years ago |
|
ouyangxuhua
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
lizanle
|
b7eda83def
|
历史资源功能
|
10 years ago |
|
cxt
|
a74cba5190
|
编程作业的迟交扣分有问题
|
10 years ago |
|
cxt
|
e948c94300
|
在线测验的填空题未断网时报网络异常
|
10 years ago |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
10 years ago |
|
ouyangxuhua
|
d1ebc35e43
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
1d0e6e1c5c
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
lizanle
|
659f322ca2
|
send resource to org
|
10 years ago |
|
lizanle
|
1103e7eab4
|
find org where type is Resource
|
10 years ago |
|
ouyangxuhua
|
d203285cc1
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
|
10 years ago |
|
ouyangxuhua
|
15cff47c92
|
1.转发帖子时，当组织没有资源栏目时，给出提示；
2.组织文章的附件显示在组织动态/组织文章列表中；
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
huang
|
5618fe067a
|
项目分页，点击加载
|
10 years ago |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
5d2c760a8e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
605ec52f8a
|
测验答题失败时提示网络异常
|
10 years ago |
|
ouyangxuhua
|
77e0f0cd08
|
转发帖子新建帖子，并更新相关表
|
10 years ago |
|
huang
|
d6e765cf4a
|
修正讨论区删除跳转
|
10 years ago |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
10 years ago |
|
lizanle
|
174f7c1972
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
app/views/issues/_list.html.erb
|
10 years ago |
|
lizanle
|
5ce9a5109d
|
issue存在重复
|
10 years ago |
|
lizanle
|
e35d2daa0a
|
课程资源库
|
10 years ago |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
805d785140
|
解决点击转发项目/课程帖子没有反应的问题
|
10 years ago |
|
cxt
|
b991dc1edd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
4cd4d7b6dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
e3b395960c
|
base64的+号要处理一下
|
10 years ago |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
10 years ago |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
10 years ago |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
0b42430e2d
|
课程通知动态无法回复
|
10 years ago |
|
cxt
|
82fa0f0aaf
|
公开的课程不勾选“学生列表公开”，但非课程成员却可以通过url访问该课程学生列表
|
10 years ago |
|
ouyangxuhua
|
c81f2f738a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
app/controllers/org_document_comments_controller.rb
app/views/org_document_comments/_attachment.html.erb
|
10 years ago |
|
ouyangxuhua
|
59f42bb54f
|
1.将添加附加功能加入到组织列表中的新建组织文章；
2.解决编辑文章附件不能上传的问题。
|
10 years ago |
|
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
10 years ago |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
10 years ago |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
10 years ago |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
10 years ago |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
|
guange
|
22d8fc9abd
|
作业附件乱码优化
|
10 years ago |
|
cxt
|
1a042fd822
|
组织首页的加载更多动态重复加载
|
10 years ago |
|
huang
|
4111cb53dc
|
解决fork部分项目404问题
|
10 years ago |
 houxiang
|
240a859f2d
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
houxiang
|
21461fb583
|
修正了以前的方法调用 by 侯翔
|
10 years ago |
|
huang
|
471e5f5370
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
houxiang
|
3e57237969
|
修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔
|
10 years ago |
|
lizanle
|
4630576146
|
issue的创建成功不需要提示sucess
|
10 years ago |
|
cxt
|
65022f03cb
|
作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
|
10 years ago |
|
cxt
|
902570173d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
714dfdc2d5
|
解决组织资源栏目点击上传资源没反应的问题
|
10 years ago |
|
cxt
|
108448cf4d
|
课程讨论区的加载更多
|
10 years ago |
|
lizanle
|
0ed7d84914
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
084844941f
|
个人单位修改。
聚焦就搜索所有的学校
|
10 years ago |
|
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
10 years ago |
|
cxt
|
ba4c93e4c4
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
b65e84d166
|
未答测验的学生在测验截止时间到了后算作零分
|
10 years ago |
|
lizanle
|
5d47afdc43
|
issue 删除回复的权限问题
|
10 years ago |
|
guange
|
d703f75c98
|
merge
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
huang
|
5259831224
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
houxiang
|
fc2eae4c62
|
add something by hx
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
