You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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
..
account	issue回复局部刷新	10 years ago
activities	…
activity_notifys	…
admin	Merge branch 'develop' into linchun	10 years ago
applied_project	…
apply_project_masters	…
at	.	10 years ago
attachments	历史版本样式更改	10 years ago
auth_sources	…
auto_completes	…
avatar	上传图片功能不可 用	10 years ago
bids	弹框蓝色边框与关闭键替换	10 years ago
blog_comments	0	10 years ago
blogs	0	10 years ago
boards	讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。	10 years ago
calendars	…
comments	修改kindeditor的工具栏	10 years ago
common	版本库通过修订好，导出对应的文件，导出对应内容	10 years ago
contestnotifications	…
contests	…
context_menus	…
courses	Merge branch 'develop' into ouyangxuhua	10 years ago
custom_fields	…
documents	…
enumerations	…
exercise	0	10 years ago
files	Merge branch 'develop' into ouyangxuhua	10 years ago
forums	文件上传button的路径去掉project参数。	10 years ago
gantts	…
groups	…
homework_attach	issue回复局部刷新	10 years ago
homework_common	作业动态添加子菜单：公开作品/取消公开	10 years ago
issue_categories	…
issue_relations	…
issue_statuses	…
issues	0	10 years ago
journals	1、issue回复添加新的编辑器	10 years ago
kaminari	搜索结果下一页样式不对	10 years ago
layouts	Merge branch 'develop' into ouyangxuhua	10 years ago
list	…
mailer	issue截止时间邮件通知	10 years ago
members	编辑课程成员后，更新老师数量和学生数量	10 years ago
memos	修改KE贴吧回复添加视频图片不能显示的BUG	10 years ago
messages	0	10 years ago
my	弹框蓝色边框与关闭键替换	10 years ago
news	解决回复框工具栏乱码、组织子域名等问题	10 years ago
newsold	…
no_uses	…
open_source_projects	…
org_courses	1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置	10 years ago
org_document_comments	Merge branch 'develop' into ouyangxuhua	10 years ago
org_member	成功添加某成员后，在搜索框中输入的该成员关键字就要自动清空	10 years ago
org_projects	1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置	10 years ago
org_subfields	更新组织栏目优先级，如果输入不合法，则不作改变	10 years ago
organizations	Merge branch 'develop' into ouyangxuhua	10 years ago
poll	学生查看问卷调查结果的提示	10 years ago
praise_tread	已点过赞的动态显示”已赞“	10 years ago
previews	…
projects	Merge branch 'develop' into ouyangxuhua	10 years ago
queries	…
relative_memos	…
reports	…
repositories	0	10 years ago
roles	…
school	学校信息修改样式更改	10 years ago
search	…
settings	…
shares	…
shield_activities	解决一些bug; 增加已设为首页标签	10 years ago
softapplications	…
stores	…
student_work	Merge branch 'yuanke' into develop	10 years ago
subfield_subdomain_dirs	1.解决一些bug;2.组织子目录功能实现	10 years ago
system_log	…
system_messages	…
tags	Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course	10 years ago
test	…
timelog	…
trackers	…
users	Merge branch 'develop' into ouyangxuhua	10 years ago
versions	…
watchers	增加以下功能：	10 years ago
web_footer_companies	…
welcome	完成管理员界面课程资源列表	10 years ago
wiki	…
wikis	…
words	个人留言的回复不能自动刷新	10 years ago
workflows	…
zipdown	…