socialforge/app/views
huang 0bd34c2099 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
2016-04-29 16:15:10 +08:00
..
account issue回复局部刷新 2016-01-22 17:27:21 +08:00
activities
activity_notifys
admin Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new 2016-04-05 11:25:25 +08:00
applied_project
apply_project_masters
at 加上atall 2016-03-11 18:50:37 +08:00
attachments 作业附件的用户名省略号太早 2016-03-22 15:50:06 +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 讨论区局部优化 2016-03-25 14:29:58 +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 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
custom_fields
documents
enumerations
exercise 0 2016-03-05 03:16:04 +08:00
files 图片上传添加提示 2016-04-06 11:05:13 +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-03-17 17:34:29 +08:00
issue_categories
issue_relations
issue_statuses
issues 修复《issue具体页面样式》 2016-03-18 15:58:23 +08:00
journals
kaminari
layouts Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 16:15:10 +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
org_document_comments Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:00 +08:00
org_member
org_projects
org_subfields 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
organizations 组织二级目录添加列表 2016-04-29 10:53:04 +08:00
poll 学生查看问卷调查结果的提示 2016-02-20 17:43:15 +08:00
praise_tread 组织超链接问题 2016-03-18 14:44:39 +08:00
previews
projects 项目统计添加判断 2016-04-21 11:19:21 +08:00
queries
relative_memos
reports
repositories 统计 改成 代码统计 2016-04-21 10:42:06 +08:00
roles
school
search
settings
shares
shield_activities 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
softapplications
stores
student_work 去掉作业提交附件中用户名 2016-04-08 18:20:06 +08:00
sub_document_comments 二级目录帖子详细页面 2016-04-29 16:14:08 +08:00
sub_domains 二级目录帖子详细页面 2016-04-29 16:14:08 +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 项目讨论区锁定后不能回复 2016-04-07 15:20:25 +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