cxt aaefd8b4aa Merge branch 'cxt_course' into develop ... Conflicts: app/views/users/_news_replies.html.erb		2016-09-02 15:24:55 +08:00
..
_course_form.html.erb	提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；	2016-07-07 15:08:34 +08:00
_course_news.html.erb	课程大纲	2016-07-01 11:11:53 +08:00
_course_news_detail.html.erb	列表显示修改	2016-04-29 13:42:58 +08:00
_course_news_list.html.erb	课程通知增加置顶	2015-11-12 16:52:42 +08:00
_course_news_new.html.erb	课程通知改成动态的模式	2015-12-24 09:57:32 +08:00
_course_show.html.erb	项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复	2016-09-02 15:22:09 +08:00
_edit_for_org_subfield.html.erb	组织栏目的通知增加查、改、删功能	2016-01-20 17:23:02 +08:00
_form.html.erb	项目界面缺失翻译调整	2015-04-10 16:59:45 +08:00
_news.html.erb	1.修改页面描述错误	2014-08-20 15:51:35 +08:00
_news_all_replies.html.erb	Merge branch 'cxt_course' into develop	2016-09-02 15:24:55 +08:00
_organization_show.html.erb	班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合	2016-07-20 17:00:18 +08:00
_project_form.html.erb	提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；	2016-07-07 15:08:34 +08:00
_project_news.html.erb	修改几个bug	2016-01-21 16:57:13 +08:00
_project_news_detail.html.erb	动态回复最多只加赞三条，点击展开更多时才加载余下的回复	2016-06-07 16:02:00 +08:00
_project_news_new.html.erb	修改几个bug	2016-01-21 16:57:13 +08:00
_project_show.html.erb	项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复	2016-09-02 15:22:09 +08:00
edit.html.erb	班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合	2016-07-20 17:00:18 +08:00
index.api.rsb	first commit	2013-08-01 10:33:49 +08:00
index.html.erb	将分享的js方法统一，分享文件、通知等均可复用	2016-01-21 14:33:31 +08:00
index.js.erb	列表显示修改	2016-04-29 13:42:58 +08:00
new.html.erb	去掉代码审查	2015-04-13 23:39:56 +08:00
show.html.erb	组织栏目的通知增加查、改、删功能	2016-01-20 17:23:02 +08:00