socialforge/app/views
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua
Conflicts:
	app/views/users/_user_message_course.html.erb
2016-03-17 16:18:30 +08:00
..
account issue回复局部刷新 2016-01-22 17:27:21 +08:00
activities
activity_notifys
admin Merge branch 'develop' into linchun 2016-03-08 11:29:58 +08:00
applied_project
apply_project_masters
at . 2015-12-15 14:52:24 +08:00
attachments 修复资源库样式问题 2016-03-17 12:43:35 +08:00
auth_sources
auto_completes
avatar
bids 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
blog_comments 超级管理员有编辑和删除博客的权限 2016-03-16 10:00:21 +08:00
blogs Merge branch 'develop' into cxt_course 2016-03-17 15:27:52 +08:00
boards 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
calendars
comments 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
common 版本库通过修订好,导出对应的文件,导出对应内容 2016-02-25 11:06:10 +08:00
contestnotifications
contests
context_menus
courses Merge branch 'develop' into ouyangxuhua 2016-03-15 13:40:33 +08:00
custom_fields
documents
enumerations
exercise 0 2016-03-05 03:16:04 +08:00
files Merge branch 'develop' into ouyangxuhua 2016-03-17 16:18:30 +08:00
forums 文件上传button的路径去掉project参数。 2015-12-23 11:13:14 +08:00
gantts
groups
homework_attach issue回复局部刷新 2016-01-22 17:27:21 +08:00
homework_common 作业动态添加子菜单:公开作品/取消公开 2016-02-25 16:18:24 +08:00
issue_categories
issue_relations
issue_statuses
issues 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》 2016-03-16 16:03:53 +08:00
journals
kaminari 搜索结果下一页样式不对 2015-12-02 09:23:12 +08:00
layouts Merge branch 'develop' into ouyangxuhua 2016-03-17 16:18:30 +08:00
list
mailer issue截止时间邮件通知 2016-01-22 20:26:44 +08:00
members
memos 修改KE贴吧回复添加视频图片不能显示的BUG 2016-03-14 18:19:23 +08:00
messages Merge branch 'develop' into cxt_course 2016-03-17 15:27:52 +08:00
my 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
news 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
newsold
no_uses
open_source_projects
org_courses 1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
org_document_comments Merge branch 'develop' into ouyangxuhua 2016-03-17 16:18:30 +08:00
org_member 成功添加某成员后,在搜索框中输入的该成员关键字就要自动清空 2015-11-23 10:17:20 +08:00
org_projects 1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
org_subfields 更新组织栏目优先级,如果输入不合法,则不作改变 2016-03-10 09:06:07 +08:00
organizations 组织内的链接加上Setting.protocol 2016-03-17 10:52:19 +08:00
poll 学生查看问卷调查结果的提示 2016-02-20 17:43:15 +08:00
praise_tread 已点过赞的动态显示”已赞“ 2016-01-18 15:12:47 +08:00
previews
projects Merge branch 'develop' into ouyangxuhua 2016-03-17 16:18:30 +08:00
queries
relative_memos
reports
repositories 0 2016-03-11 14:39:17 +08:00
roles
school
search
settings
shares
shield_activities 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
softapplications
stores
student_work 作品列表:已禁用了匿评的作业就不要显示“匿评截止时间”了 2016-03-17 15:54:10 +08:00
subfield_subdomain_dirs 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
system_log
system_messages
tags Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-02-25 11:17:54 +08:00
test
timelog
trackers
users Merge branch 'develop' into ouyangxuhua 2016-03-17 16:18:30 +08:00
versions
watchers 增加以下功能: 2016-01-07 10:10:24 +08:00
web_footer_companies
welcome Merge branch 'develop' into FX-alan-search-404 2016-03-14 10:25:39 +08:00
wiki
wikis
words 个人留言的回复不能自动刷新 2016-02-23 15:22:44 +08:00
workflows
zipdown