 ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
10 years ago |
 Tim
|
fa70e8a714
|
代码错误
|
10 years ago |
 cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
10 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
|
10 years ago |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
10 years ago |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
10 years ago |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
10 years ago |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
10 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
10 years ago |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
10 years ago |
guange
|
d8ef2f0965
|
个人留言中的at启用
|
10 years ago |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
10 years ago |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
10 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
dda64245b3
|
解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。
|
10 years ago |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
10 years ago |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
10 years ago |
|
cxt
|
b6e13340e5
|
个人留言的删除功能
|
10 years ago |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
10 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
|
10 years ago |
|
cxt
|
4465e93dae
|
最近登录报500
|
10 years ago |
|
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
8a2a1d2bc9
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
3de8687440
|
留言页面的动态内容不生成链接，留言回复的样式更改
|
10 years ago |
 huang
|
19bb545993
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
16cb4add09
|
issue局部刷新属性问题
|
10 years ago |
|
ouyangxuhua
|
26f8500671
|
博客回复后，该博客的更新时间为当前时间
|
10 years ago |
|
ouyangxuhua
|
2d07801f52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
dbed8379d3
|
新建组织允许游客下载选项功能修复
|
10 years ago |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
10 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
b5bfa6d824
|
1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。
|
10 years ago |
|
ouyangxuhua
|
b6219c149a
|
解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除；
|
10 years ago |
|
ouyangxuhua
|
b5159d54c8
|
博客按更新时间排序
|
10 years ago |
|
huang
|
edd198e91f
|
issue刷新
|
10 years ago |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
10 years ago |
|
ouyangxuhua
|
b6460633d2
|
个人博客按更新时间倒排
|
10 years ago |
|
ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
10 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
|
10 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
10 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
10 years ago |
|
huang
|
7de48f143e
|
issue状态修改
|
10 years ago |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
10 years ago |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
10 years ago |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
10 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
10 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
10 years ago |
|
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
10 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
|
10 years ago |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
10 years ago |
|
cxt
|
e293805488
|
点击在线问卷时若未登录则直接跳到登录页面
|
10 years ago |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
10 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
|
10 years ago |
|
cxt
|
c5935a6a46
|
博客动态添加点赞
|
10 years ago |
|
cxt
|
9cabb0248a
|
已点过赞的动态显示”已赞“
|
10 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
10 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
|
10 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
|
10 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
10 years ago |
|
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
10 years ago |
|
cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
|
cxt
|
eb63ac59f2
|
作品提交不成功
|
10 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
huang
|
49d456bf21
|
修改数据统计信息
|
10 years ago |
|
huang
|
5fe4e9e813
|
创建项目的时候创建项目得分记录
|
10 years ago |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
10 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 |
