socialforge/app/views
cxt 6eb518c465 Merge branch 'cxt_course' into develop
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
2016-08-26 16:23:07 +08:00
..
account Merge branch 'develop' into cs_optimize_txz 2016-07-18 14:32:17 +08:00
activities
activity_notifys
admin 单位审查消息及其BUG修复 2016-08-05 16:14:26 +08:00
applied_project 报告人员加入项目不用提醒 2016-08-05 16:35:22 +08:00
apply_project_masters
at at所有人 2016-08-24 17:46:18 +08:00
attachments 修复:文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +08:00
auth_sources
auto_completes
avatar 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
bids 提交与取消按钮之间增加间距;新建问卷"选项D"文字折行;日历图标样式调整,问题跟踪日历前input宽度缩减; 2016-07-07 15:08:34 +08:00
blog_comments 回复他人的博客首页不应跳到自己的博客首页 2016-07-26 17:45:59 +08:00
blogs Merge branch 'cs_optimize_txz' into cxt_course 2016-07-29 19:37:15 +08:00
boards Merge branch 'cxt_course' into develop 2016-08-26 16:23:07 +08:00
calendars
comments 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复, 二级回复代码的整合 2016-07-20 17:00:18 +08:00
common
contestnotifications
contests
context_menus
courses 班级主页设置班级为公开私有时刷新资源库页面 2016-08-26 15:11:57 +08:00
custom_fields
documents
enumerations
exercise 测验描述超出边框 2016-08-11 09:46:41 +08:00
files Merge branch 'dev_shcool' into develop 2016-08-24 14:53:31 +08:00
forums 个人主页,课程,项目样式更新 2016-07-06 15:43:48 +08:00
gantts
groups
homework_attach
homework_common “我的作业”中编辑作业不跳转到“题库”,而是返回到“我的作业” 2016-08-05 18:41:32 +08:00
issue_categories
issue_relations
issue_statuses
issues Merge branch 'rep_quality' into dev_shcool 2016-07-29 20:52:18 +08:00
journals
kaminari
layouts Merge branch 'cxt_course' into develop 2016-08-26 16:23:07 +08:00
list
mailer 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
members 申请加入项目消息刷新,同时更新其它管理员的消息状态 2016-08-02 13:03:33 +08:00
memos 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
messages Merge branch 'develop' into cxt_course 2016-07-21 14:31:43 +08:00
my Merge branch 'cxt_course' into develop 2016-08-26 16:23:07 +08:00
news Merge branch 'develop' into cxt_course 2016-07-21 14:31:43 +08:00
newsold
no_uses
open_source_projects
org_courses
org_document_comments 项目缺陷的二级回复 2016-07-21 10:30:48 +08:00
org_member 修改删除组织成员跨域的BUG 2016-06-27 15:47:06 +08:00
org_projects
org_subfields 新建贴吧跳入该贴吧帖子列表,组织栏目配置默认选择第一个栏目类型 2016-06-17 14:40:00 +08:00
organizations Merge branch 'cxt_course' into develop 2016-08-26 16:23:07 +08:00
poll 新版班级主页 2016-07-22 15:32:37 +08:00
praise_tread
previews
projects 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
pull_requests 留言和已关闭流程修改 2016-08-13 16:53:56 +08:00
quality_analysis modified sonar list form of language 2016-08-24 17:35:04 +08:00
queries
relative_memos
reports
repositories delete some language of quality_analysis 2016-08-24 17:28:55 +08:00
roles
school
search
settings
shares
shield_activities
shield_wechat_messages
softapplications
ssos sso同步登录功能完成 2016-05-05 14:06:47 +08:00
stores
student_work 作品列表页面中分组作业关联项目的综合评分应与项目首页的评分一致 2016-08-25 15:43:11 +08:00
sub_document_comments 二级目录未登录时回复提示 2016-06-06 14:29:33 +08:00
sub_domains 组织管理员模式,二级目录局部刷新 2016-05-31 13:47:05 +08:00
subfield_subdomain_dirs
syllabuses Merge branch 'rep_quality' into cxt_course 2016-07-29 14:36:18 +08:00
system_log
system_messages
tags 查看标签页面显示bug 2016-07-01 19:28:55 +08:00
test 课程大纲 2016-07-01 11:11:53 +08:00
timelog
trackers
users Merge branch 'cxt_course' into develop 2016-08-26 16:23:07 +08:00
versions Merge branch 'develop' into cs_optimize_txz 2016-07-18 14:32:17 +08:00
watchers
web_footer_companies
wechats . 2016-08-13 11:37:37 +08:00
welcome Merge branch 'daiao_dev' into cxt_course 2016-07-05 16:49:50 +08:00
wiki wiki编辑页面更新 2016-07-06 15:59:49 +08:00
wikis
words 课程大纲的二级回复 2016-07-29 21:48:10 +08:00
workflows
zipdown