socialforge/app/views
ouyangxuhua 25e32f09e1 Merge branch 'develop' into ouyang
Conflicts:
	app/views/words/create_reply.js.erb
2016-02-01 10:14:04 +08:00
..
account issue回复局部刷新 2016-01-22 17:27:21 +08:00
activities
activity_notifys
admin 最近登录报500 2016-01-25 10:16:33 +08:00
applied_project
apply_project_masters
at . 2015-12-15 14:52:24 +08:00
attachments Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
auth_sources
auto_completes
avatar
bids 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
blog_comments 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
blogs 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
boards 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
calendars
comments 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
common
contestnotifications
contests
context_menus
courses Merge branch 'develop' into ouyang 2016-02-01 10:14:04 +08:00
custom_fields
documents
enumerations
exercise 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
files Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +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 Merge branch 'develop' into ouyang 2016-02-01 10:14:04 +08:00
issue_categories
issue_relations
issue_statuses
issues 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
journals
kaminari 搜索结果下一页样式不对 2015-12-02 09:23:12 +08:00
layouts Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
list
mailer issue截止时间邮件通知 2016-01-22 20:26:44 +08:00
members 编辑课程成员后,更新老师数量和学生数量 2015-11-02 17:19:38 +08:00
memos 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
messages 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
my 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
news 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
newsold
no_uses
open_source_projects
org_courses 1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
org_document_comments 修改kindeditor的工具栏 2016-01-29 16:55:07 +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 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
organizations Merge branch 'develop' into ouyang 2016-02-01 10:14:04 +08:00
poll 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
praise_tread 已点过赞的动态显示”已赞“ 2016-01-18 15:12:47 +08:00
previews
projects 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
queries
relative_memos
reports
repositories 版本库显示调整 2015-12-22 10:59:09 +08:00
roles
school
search
settings
shares
shield_activities 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
softapplications
stores
student_work Merge branch 'develop' into ouyang 2016-02-01 10:14:04 +08:00
subfield_subdomain_dirs 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
system_log
system_messages
tags 1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag,增加“双击可编辑”的tips 2016-01-27 15:50:31 +08:00
test
timelog
trackers
users Merge branch 'develop' into ouyang 2016-02-01 10:14:04 +08:00
versions
watchers 增加以下功能: 2016-01-07 10:10:24 +08:00
web_footer_companies
welcome issue回复局部刷新 2016-01-22 17:27:21 +08:00
wiki
wikis
words Merge branch 'develop' into ouyang 2016-02-01 10:14:04 +08:00
workflows
zipdown