huang
|
44549e091d
|
message_all表中添加type索引
|
10 years ago |
huang
|
e77a891bc6
|
消息查询语句优化,添加索引
|
10 years ago |
guange
|
6ae4cd0767
|
merge
|
10 years ago |
huang
|
79767f4bae
|
用户行为记录
|
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 |
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
10 years ago |
huang
|
e8e9688644
|
项目资源数目迁移
|
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 |
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
10 years ago |
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
huang
|
8079254089
|
首页增加访问统计
|
10 years ago |
luoquan
|
1900a824e8
|
0
|
10 years ago |
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品,代码会跳到上一个作品的详情
|
10 years ago |
ouyangxuhua
|
a51ca428be
|
组织中,增加调整栏目显示顺序的功能
|
10 years ago |
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
10 years ago |
huang
|
d3fd445108
|
数据迁移
|
10 years ago |
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
10 years ago |
huang
|
0a18f365ab
|
新的迁移
|
10 years ago |
huang
|
094af07a2f
|
数据迁移
|
10 years ago |
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
10 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
|
10 years ago |
huang
|
bafa151c0d
|
0
|
10 years ago |
huang
|
f381784a3c
|
数据迁移
|
10 years ago |
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
10 years ago |
guange
|
15d5fe127e
|
merge
|
10 years ago |
guange
|
a83cb2a1fa
|
merge
|
10 years ago |
cxt
|
c93b4d109a
|
作业动态添加子菜单:公开作品/取消公开
|
10 years ago |
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
cxt
|
72c3fa1166
|
某个学生分数异常
|
10 years ago |
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误;2.增加转发表
|
10 years ago |
ouyangxuhua
|
3eb7c62b85
|
组织子域名迁移
|
10 years ago |
ouyangxuhua
|
16efcafe77
|
注释迁移
|
10 years ago |
ouyangxuhua
|
035b22d6dd
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
ouyangxuhua
|
2a26fd4e75
|
修改组织子域名的问题
|
10 years ago |
ouyangxuhua
|
d818e1774b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
huang
|
69ae7e3845
|
解决附件无法更新问题
|
10 years ago |
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
10 years ago |
ouyangxuhua
|
c91ef44570
|
组织子域名:所有子域名保存到secdomains表,将组织表中的子域名迁移到secdomains表中,并修改相应的代码
|
10 years ago |
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
10 years ago |
cxt
|
3369183fb7
|
课程表的数据迁移
|
10 years ago |
guange
|
7f8f3fa152
|
被rubymine坑了,这两个文件没加进去
|
10 years ago |
cxt
|
c942c843b9
|
导入作业增加引用次数
|
10 years ago |
cxt
|
19003f27fc
|
课程添加is_copy属性
|
10 years ago |
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
10 years ago |
huang
|
dfb8a3afbf
|
数据迁移
|
10 years ago |
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
10 years ago |
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
huang
|
2947ff8997
|
精品课程数据迁移
|
10 years ago |
cxt
|
f7be78efc7
|
关联项目的更新时间包含项目的提交时间
|
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
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
10 years ago |
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
10 years ago |
guange
|
08e193ea3c
|
添加微信用户表
|
10 years ago |
huang
|
b93b86b9a0
|
创建课程发送board
|
10 years ago |
huang
|
ef0a2a54c5
|
精品课程推荐
|
10 years ago |
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
guange
|
5f6a3cac04
|
wechat init
|
10 years ago |
huang
|
ed26242f94
|
版本库提交次数迁移
|
10 years ago |
huang
|
64f972770f
|
添加board和attachment数据迁移
|
10 years ago |
huang
|
157502d450
|
精品课程
|
10 years ago |
huang
|
20d550e755
|
提交次数默认值为空的数据处理
|
10 years ago |
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
huang
|
f3402e4fa4
|
项目得分新计算
|
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
|
a68392fd24
|
issue统计数据更新
提交次数加入新表
|
10 years ago |
huang
|
e808f0bc61
|
提交新迁移
|
10 years ago |
cxt
|
90acb7816f
|
数据迁移
|
10 years ago |
cxt
|
f7a88a63e0
|
更新项目缺陷动态的更新时间
|
10 years ago |
Tim
|
d495f58408
|
切换分支文件
|
10 years ago |
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
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
|
a0ceb9b11c
|
添加缺陷回复统计
项目版本库提交次数统计
|
10 years ago |
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
10 years ago |
huang
|
a74e5f9d30
|
添加项目动态数迁移
|
10 years ago |
huang
|
8758235364
|
issue创建和删除的时候,issues_count+1
|
10 years ago |
huang
|
1239a8b5af
|
统计数据迁移
|
10 years ago |
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
10 years ago |
huang
|
f3b732460c
|
添加项目统计字段
|
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
|
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 |
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 |
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 |
ouyangxuhua
|
d1ebc35e43
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
10 years ago |
lizanle
|
90c63192e6
|
历史资源模型修改
|
10 years ago |
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
ouyangxuhua
|
77e0f0cd08
|
转发帖子新建帖子,并更新相关表
|
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 |
cxt
|
e86778a9c7
|
删除不存在的留言动态
|
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 |
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
10 years ago |
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
10 years ago |
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
10 years ago |
huang
|
747493993b
|
上线测试
|
10 years ago |
lizanle
|
793a98ade1
|
forge_activities那个运行批量删除回复动态脚本改动
|
10 years ago |
lizanle
|
bba40de36d
|
journal不应该算入ForgeActivity,历史数据应该删除
|
10 years ago |
guange
|
d703f75c98
|
merge
|
10 years ago |
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
guange
|
fc63dfcb7b
|
消息通知
|
10 years ago |
huang
|
721a007779
|
删除 由于course、project一张表而引起的历史数据异常问题
|
10 years ago |
huang
|
41bb37d6d4
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
解决冲突
|
10 years ago |
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
10 years ago |
cxt
|
699d0e22dd
|
删除多余学生的测验数据
|
10 years ago |
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
huang
|
be940ee3aa
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
ouyangxuhua
|
2f7260cba2
|
1.在栏目表中增加field_type(类型)字段;
2.在组织配置-》栏目,增加栏目类型。
|
10 years ago |
ouyangxuhua
|
09f0d0201e
|
组织增加栏目发帖功能
|
10 years ago |
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
huang
|
916d99be82
|
课程删除功能
|
10 years ago |
huang
|
42f5b86d95
|
添加字段删除课程
|
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
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
huang
|
c1747ab217
|
fork重名,提交
|
10 years ago |
huang
|
89b8f7783d
|
添加forked_form的id
|
10 years ago |
cxt
|
fd51b02e16
|
添加修订附件
|
10 years ago |
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容,不显示作者等信息,增加取消首页、编辑首页、删除首页等功能;
2.增加editor_of_documents表,记录文章编辑的作者、时间等,并显示首页的最后编辑人;
3.在首页编辑文章后,应返回首页。
|
10 years ago |
huang
|
39b87aaaac
|
为student_work表添加索引
为homework_comments添加索引
大幅提高查询速度
|
10 years ago |
huang
|
b130b52a23
|
修改迁移
|
10 years ago |
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
10 years ago |
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
huang
|
8c83bbfff3
|
课程英雄榜数据
|
10 years ago |
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
10 years ago |
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序(英雄榜)
部分页面(未完成)
|
10 years ago |
ouyangxuhua
|
ccfbc1e0bd
|
1.组织翻页增加type参数;
2.删除组织表中冗余的项目动态和课程动态。
|
10 years ago |
huang
|
fd03e62957
|
添加字段迁移
|
10 years ago |
huang
|
1df8c94b98
|
解决字符过长不能保存成功的问题
|
10 years ago |
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
ouyangxuhua
|
5ac65d86b1
|
将org_document_comment中的title改成text类型
|
10 years ago |
ouyangxuhua
|
e01a7c2627
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
huang
|
3deebf2006
|
show
|
10 years ago |
ouyangxuhua
|
40a44c3568
|
增加文章二级回复功能
|
10 years ago |
ouyangxuhua
|
4d4b163f17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
ouyangxuhua
|
d71d9730bd
|
修改迁移文件的bug
|
10 years ago |
huang
|
7dc16775dc
|
添加字段迁移
|
10 years ago |
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
ouyangxuhua
|
f6251b758b
|
1.迁移课程动态数据至组织动态
2.“项目动态迁移至组织动态”迁移文件增加事物
|
10 years ago |
huang
|
282c7f5bd2
|
修改添加题目相关
|
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
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
10 years ago |
cxt
|
167d001b3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
cxt
|
5400b907e6
|
学生测验列表
|
10 years ago |
ouyangxuhua
|
10dedcb7be
|
增加组织成员加入时间
|
10 years ago |
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态;
2.在组织动态中,按时间倒排显示组织动态;
3.增加我的组织中搜索功能。
|
10 years ago |
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
sw
|
466f3c4cc3
|
数据库修改以及一对一,一对多,多对多等关系的确立
|
10 years ago |
sw
|
bbf087fa67
|
数据库的修改以及model数据关系的确定
|
10 years ago |
sw
|
5a153637b7
|
增加在线测试迁移问卷
|
10 years ago |
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
10 years ago |
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
10 years ago |
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
cxt
|
ee7b21de72
|
禁用匿评功能
|
10 years ago |
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器;
编写创建组织页面。
|
10 years ago |
ouyangxuhua
|
636063c6ca
|
添加组织表和组织成员表
|
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
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
lizanle
|
2a76461cd1
|
简单博客功能
|
10 years ago |
huang
|
147cdf3018
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
cxt
|
d049a00655
|
删除课程动态中未发布问卷的动态
|
10 years ago |
cxt
|
90ee4bbe60
|
删除空的课程动态
|
10 years ago |
cxt
|
dbbdae1be2
|
附件迁移文件的修改
|
10 years ago |
cxt
|
0b565b1be0
|
私有课程的课件迁移
|
10 years ago |
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
10 years ago |
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
10 years ago |
huang
|
73898953d9
|
project表添加字段,记录project对应gitlba中project id
|
10 years ago |
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
10 years ago |
sw
|
11736eb266
|
迁移文件有问题
|
10 years ago |
cxt
|
452766bade
|
课程通知的动态排序时间调整
|
10 years ago |
sw
|
774b00f2d4
|
数据迁移错误
|
10 years ago |