 ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
9 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
|
9 years ago |
 cxt
|
4de81605a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
9 years ago |
|
huang
|
e8e9688644
|
项目资源数目迁移
|
9 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
|
9 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
9 years ago |
|
cxt
|
f174101297
|
数据迁移
|
9 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
8079254089
|
首页增加访问统计
|
9 years ago |
 luoquan
|
1900a824e8
|
0
|
9 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
9 years ago |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
9 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
9 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
9 years ago |
|
huang
|
d3fd445108
|
数据迁移
|
9 years ago |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
9 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
9 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
 Tim
|
1deb611ba2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
ef05867e6e
|
自动生成文件
|
9 years ago |
|
cxt
|
0090c89dd1
|
数据迁移
|
9 years ago |
|
huang
|
4f2937e1a2
|
英雄榜
|
9 years ago |
|
huang
|
0a18f365ab
|
新的迁移
|
9 years ago |
|
huang
|
094af07a2f
|
数据迁移
|
9 years ago |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
9 years ago |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
9 years ago |
|
huang
|
bafa151c0d
|
0
|
9 years ago |
|
huang
|
3f56fa3405
|
0
|
9 years ago |
|
huang
|
f381784a3c
|
数据迁移
|
9 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
9 years ago |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
9 years ago |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
9 years ago |
|
Tim
|
f51d16c538
|
资源库样式调整
|
9 years ago |
guange
|
a59f65a455
|
wechat
|
9 years ago |
|
guange
|
15d5fe127e
|
merge
|
9 years ago |
|
guange
|
a83cb2a1fa
|
merge
|
9 years ago |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
9 years ago |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
9 years ago |
|
guange
|
296d6efbf1
|
单文件作业不压缩
|
9 years ago |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
72c3fa1166
|
某个学生分数异常
|
9 years ago |
|
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
9 years ago |
|
ouyangxuhua
|
3eb7c62b85
|
组织子域名迁移
|
9 years ago |
|
ouyangxuhua
|
16efcafe77
|
注释迁移
|
9 years ago |
|
ouyangxuhua
|
035b22d6dd
|
Merge branch 'ouyangxuhua' into develop
|
9 years ago |
|
ouyangxuhua
|
2a26fd4e75
|
修改组织子域名的问题
|
9 years ago |
|
ouyangxuhua
|
d818e1774b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
huang
|
69ae7e3845
|
解决附件无法更新问题
|
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
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
9 years ago |
|
cxt
|
3369183fb7
|
课程表的数据迁移
|
9 years ago |
|
Tim
|
89eff0f920
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
Tim
|
e223ac77d0
|
自动生成文件
|
9 years ago |
|
cxt
|
096320d04c
|
发布问卷时默认选中“允许学生查看调查结果”
|
9 years ago |
|
huang
|
aa22a253ba
|
“发送至”弹框飘动问题
|
9 years ago |
|
cxt
|
cc7d75a046
|
Merge branch 'szzh' into develop
|
9 years ago |
|
guange
|
7f8f3fa152
|
被rubymine坑了，这两个文件没加进去
|
9 years ago |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
9 years ago |
|
Tim
|
f3bcb3ca47
|
导入题库弹框位置调整
|
9 years ago |
|
guange
|
28035dfc47
|
子域名处理
|
9 years ago |
|
guange
|
bb0ff4a14c
|
elasticsearch在开发环境下的补丁,默认不开启
|
9 years ago |
|
Tim
|
55fddbcabe
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
674a8e0035
|
单词折行问题
|
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
|
c942c843b9
|
导入作业增加引用次数
|
9 years ago |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
9 years ago |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
9 years ago |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
9 years ago |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
9 years ago |
|
huang
|
dfb8a3afbf
|
数据迁移
|
9 years ago |
|
cxt
|
bbdced9bc1
|
留言页面的样式修改
|
9 years ago |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
9 years ago |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
huang
|
2947ff8997
|
精品课程数据迁移
|
9 years ago |
|
cxt
|
f7be78efc7
|
关联项目的更新时间包含项目的提交时间
|
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
|
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 |
|
Tim
|
a3c30ee965
|
issue上传附件样式修改
|
9 years ago |
|
guange
|
08e193ea3c
|
添加微信用户表
|
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 |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
9 years ago |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
9 years ago |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
9 years ago |
|
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
guange
|
5f6a3cac04
|
wechat init
|
9 years ago |
|
guange
|
62c2085d61
|
merge
|
9 years ago |
|
huang
|
ed26242f94
|
版本库提交次数迁移
|
9 years ago |
|
guange
|
b68eab23ea
|
merge
|
9 years ago |
|
guange
|
587d347178
|
added wechat
|
9 years ago |
|
huang
|
64f972770f
|
添加board和attachment数据迁移
|
9 years ago |
|
huang
|
157502d450
|
精品课程
|
9 years ago |
|
huang
|
20d550e755
|
提交次数默认值为空的数据处理
|
9 years ago |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
9 years ago |
|
Tim
|
13e289dfb5
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
|
9 years ago |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
Tim
|
4493261797
|
自动生成文件
|
9 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
9 years ago |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
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
|
a68392fd24
|
issue统计数据更新
提交次数加入新表
|
9 years ago |
|
huang
|
e808f0bc61
|
提交新迁移
|
9 years ago |
|
cxt
|
90acb7816f
|
数据迁移
|
9 years ago |
|
cxt
|
f7a88a63e0
|
更新项目缺陷动态的更新时间
|
9 years ago |
|
Tim
|
3d73a3c243
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
9 years ago |
|
Tim
|
d495f58408
|
切换分支文件
|
9 years ago |
|
Tim
|
88895ff262
|
英文文本强制折行修复
|
9 years ago |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
9 years ago |
|
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
9 years ago |
|
huang
|
cf7130a398
|
0
|
9 years ago |
|
huang
|
a0ceb9b11c
|
添加缺陷回复统计
项目版本库提交次数统计
|
9 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
9 years ago |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
9 years ago |
|
huang
|
a74e5f9d30
|
添加项目动态数迁移
|
9 years ago |
|
huang
|
8758235364
|
issue创建和删除的时候，issues_count+1
|
9 years ago |
|
huang
|
1239a8b5af
|
统计数据迁移
|
9 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
9 years ago |
|
huang
|
f3b732460c
|
添加项目统计字段
|
9 years ago |
|
cxt
|
7c376ed60b
|
数据迁移
|
10 years ago |
|
huang
|
580e4d7327
|
迁移问题
|
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
|
d574521b48
|
样式更新
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
huang
|
fd2197a73d
|
项目资源库历史数据迁移
搜索功能添加Version类型判断
|
10 years ago |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
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
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
huang
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
10 years ago |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
|
huang
|
11444f43f0
|
解决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 |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
lizanle
|
b059ab2428
|
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
|
e9cedf0eb9
|
删除冗余的迁移文件
|
10 years ago |
