socialforge/app/views
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
2016-07-29 22:03:45 +08:00
..
account Merge branch 'develop' into cs_optimize_txz 2016-07-18 14:32:17 +08:00
activities
activity_notifys
admin Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 22:03:45 +08:00
applied_project 局部刷新 2016-07-29 21:37:35 +08:00
apply_project_masters
at
attachments issue用户添加链接,issue链接颜色修改 2016-07-27 14:47:13 +08:00
auth_sources
auto_completes
avatar
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 git pull后重新commit 2016-07-28 15:11:04 +08:00
calendars
comments 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复, 二级回复代码的整合 2016-07-20 17:00:18 +08:00
common
contestnotifications
contests
context_menus
courses 加入班级的弹框 2016-07-29 19:19:58 +08:00
custom_fields
documents
enumerations
exercise Merge branch 'develop' into daiao_dev 2016-07-25 10:03:50 +08:00
files 修改课程下,课件名称,显示尽可能全 2016-07-26 14:48:36 +08:00
forums 个人主页,课程,项目样式更新 2016-07-06 15:43:48 +08:00
gantts
groups
homework_attach
homework_common 样式调整 2016-07-22 18:20:11 +08:00
issue_categories
issue_relations
issue_statuses
issues Merge branch 'cs_optimize_txz' into cxt_course 2016-07-29 19:37:15 +08:00
journals
kaminari
layouts Merge branch 'cxt_course' into develop 2016-07-29 21:54:33 +08:00
list
mailer 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
members 同意加入消息发送,及添加成员 2016-07-29 15:58:24 +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 单位名称列表功能 2016-07-29 16:11:26 +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 'develop' into daiao_dev 2016-07-25 10:03:50 +08:00
poll 新版班级主页 2016-07-22 15:32:37 +08:00
praise_tread
previews
projects 局部刷新 2016-07-29 19:42:21 +08:00
quality_analysis resolve edit problem of jenkins job 2016-07-20 10:09:55 +08:00
queries
relative_memos
reports
repositories 代码分析结果入口放置在版本库 2016-07-29 17:46:24 +08:00
roles
school
search
settings 先把隐藏课程信息的功能去掉 2016-04-28 10:39:11 +08:00
shares
shield_activities
shield_wechat_messages
softapplications
ssos sso同步登录功能完成 2016-05-05 14:06:47 +08:00
stores
student_work 未提交的作品去掉提示 2016-07-27 14:14:29 +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-07-29 21:54:33 +08:00
versions Merge branch 'develop' into cs_optimize_txz 2016-07-18 14:32:17 +08:00
watchers
web_footer_companies
wechats 微信项目相关功能开发,班级角色功能等 2016-07-28 14:49:45 +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