socialforge/app/views/organizations
huang e8afcf9157 Merge branch 'hjq_beidou' into develop
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/organizations/_org_subfield_rightM2.html.erb
2016-05-13 16:56:02 +08:00
..
_join_course_menu.html.erb Merge branch 'cxt_course' into develop 2016-04-14 12:33:11 +08:00
_join_project_menu.html.erb Merge branch 'cxt_course' into develop 2016-04-14 12:33:11 +08:00
_link_subfield_more.html.erb more添加链接 2016-05-06 10:55:24 +08:00
_new_org_avatar_form.html.erb 组织模块动态及配置 2015-11-05 17:57:07 +08:00
_org_activities.html.erb 鼠标经过用户头像显示用户信息后,持续显示用户信息半秒钟,以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
_org_content.html.erb 完成模块8配置 2016-04-26 11:01:12 +08:00
_org_course_create.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_org_course_homework.html.erb 点击作业动态优秀排行中学生链接,在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
_org_course_message.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_org_course_news.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_org_course_poll.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_org_left_subfield_list.html.erb 科大名师,和名师列表添加标题 2016-05-13 16:30:45 +08:00
_org_logined_header.html.erb 北斗登录效果调整 2016-04-26 10:02:16 +08:00
_org_member_list.html.erb 组织超链接问题 2016-03-18 14:44:39 +08:00
_org_members.html.erb 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
_org_new_course_act_list.html.erb 课程列表显示内容统一 2016-04-01 11:38:20 +08:00
_org_new_course_create.html.erb 创建时间统一date 2016-03-29 19:04:51 +08:00
_org_new_course_homework.html.erb 添加图片链接和用户名链接 2016-03-31 17:51:23 +08:00
_org_new_course_message.html.erb 添加图片链接和用户名链接 2016-03-31 17:51:23 +08:00
_org_new_course_news.html.erb 添加图片链接和用户名链接 2016-03-31 17:51:23 +08:00
_org_new_course_pic.html.erb 组织动态添加poll、 2016-04-01 11:48:13 +08:00
_org_new_course_poll.html.erb 创建时间统一date 2016-03-29 19:04:51 +08:00
_org_new_forum.html.erb 完成所有图片自动适应转换 2016-03-30 19:02:41 +08:00
_org_new_forum_list.html.erb 精华样式问题 2016-04-01 18:38:05 +08:00
_org_new_forum_pic.html.erb 组织发送动态的显示 2016-04-01 17:23:15 +08:00
_org_new_forum_reply.html.erb 组织新界面修改 2016-03-30 17:22:23 +08:00
_org_new_project_act_list.html.erb 列表样式问题 2016-04-01 10:20:31 +08:00
_org_new_project_create.html.erb 北斗资源库板块 2016-03-29 16:45:14 +08:00
_org_new_project_issues.html.erb 组织新界面修改 2016-03-30 17:22:23 +08:00
_org_new_project_message.html.erb 完成所有图片自动适应转换 2016-03-30 19:02:41 +08:00
_org_new_project_pic.html.erb 添加图片链接和用户名链接 2016-03-31 17:51:23 +08:00
_org_new_resource.html.erb 组织资源的统计与权限 2016-03-29 20:09:47 +08:00
_org_project_activities.html.erb 组织动态添加项目动态 2015-11-14 14:57:49 +08:00
_org_project_issue.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_org_subdomain.html.erb 二级域名隐藏可见局部刷新 2016-05-05 18:21:54 +08:00
_org_subfield_leftD.html.erb more添加链接 2016-05-06 10:55:24 +08:00
_org_subfield_leftD_default.html.erb 空内容的提示语 2016-05-06 17:34:45 +08:00
_org_subfield_leftM1.html.erb 内容和查看更多重复问题 2016-05-12 16:00:23 +08:00
_org_subfield_leftM1_default.html.erb 完成左中板块内容空白的配置 2016-05-05 10:36:17 +08:00
_org_subfield_leftM2.html.erb 标题多行控制 2016-05-05 10:36:18 +08:00
_org_subfield_leftM2_default.html.erb 模式二为空的时候显示情况 2016-05-05 10:20:31 +08:00
_org_subfield_leftMD.html.erb 组织编辑问题 2016-05-10 10:18:47 +08:00
_org_subfield_leftMD_default.html.erb 模式4没有内容的显示情况 2016-05-04 19:12:53 +08:00
_org_subfield_leftT.html.erb 板块一没有图片的显示情况 2016-05-04 18:50:25 +08:00
_org_subfield_leftT_default.html.erb 板块一没有图片的显示情况 2016-05-04 18:50:25 +08:00
_org_subfield_message.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_org_subfield_news.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_org_subfield_rightD.html.erb 名师榜样式调整 2016-05-13 14:08:34 +08:00
_org_subfield_rightM.html.erb 左二和右二文字隐藏时的更多显示 2016-05-10 10:30:28 +08:00
_org_subfield_rightM2.html.erb Merge branch 'hjq_beidou' into develop 2016-05-13 16:56:02 +08:00
_org_subfield_rightT.html.erb course->课程动态 2016-05-06 22:57:05 +08:00
_org_subfield_rightT_default.html.erb 默认的内容显示问题 2016-05-06 15:36:58 +08:00
_org_teachers_list.html.erb 添加用户连接 2016-05-13 15:10:34 +08:00
_project_create.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_project_message.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_setting_excellent_teachers.html.erb 名师榜新增一个后就不能再新增 2016-05-13 10:50:34 +08:00
_show_home_page.html.erb 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
_show_org_document.html.erb 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
_show_students.html.erb 教师列表 2016-05-09 18:10:22 +08:00
_show_teachers.html.erb 名师列表搜索功能 2016-05-12 15:02:23 +08:00
_subfield_list.html.erb 名师默认创建 2016-05-13 11:11:09 +08:00
_subfield_sub_domains_list.html.erb 鼠标经过显示标题 2016-05-06 21:32:37 +08:00
agree_apply_subdomain.js.erb 修改一些bug 2016-01-08 19:33:58 +08:00
apply_subdomain.js.erb 1.解决“组织动态中的作业动态,评分设置弹框不能关闭 ”的问题; 2016-01-05 16:46:06 +08:00
autocomplete_search.js.erb 组织模块功能实现 2015-11-12 09:32:00 +08:00
cancel_homepage.js.erb 1.更改首页内容,不显示作者等信息,增加取消首页、编辑首页、删除首页等功能; 2015-11-30 16:04:43 +08:00
check_uniq.js.erb 组织功能实现及缺陷修改 2015-11-12 20:57:41 +08:00
check_uniq_domain.js.erb 增加域名唯一性判断 2016-01-18 10:43:22 +08:00
create.js.erb 建立组织、成员表及模型控制器; 2015-11-03 11:19:38 +08:00
destroy.js.erb 在管理员界面中,添加组织的编辑和删除功能。 2015-12-02 17:34:21 +08:00
edit.html.erb 修改编辑组织标题 2015-12-07 13:03:21 +08:00
hide_org_subfield.js.erb setting中后台编辑 2016-03-31 16:19:59 +08:00
join_course_menu.js.erb 解决组织模块的一些bug 2015-12-18 14:30:25 +08:00
join_courses.js.erb 解决组织模块的一些bug 2015-12-18 14:30:25 +08:00
join_project_menu.js.erb 解决组织模块的一些bug 2015-12-18 14:30:25 +08:00
join_projects.js.erb 解决组织模块的一些bug 2015-12-18 14:30:25 +08:00
members.html.erb 组织功能实现及缺陷修改 2015-11-12 20:57:41 +08:00
more_org_courses.js.erb 将课程动态加入组织动态中 2015-11-18 16:05:08 +08:00
more_org_projects.js.erb 增加项目的显示 2015-11-14 10:45:49 +08:00
new.html.erb 组织显示模式暂时隐藏 2016-03-29 09:35:07 +08:00
org_resources_subfield.js.erb 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
org_subfield_message_edit.html.erb 帖子发送到组织资源栏目,同时增加增删查改功能 2015-12-30 15:46:01 +08:00
org_subfield_rightT_default.html.erb Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-27 15:18:50 +08:00
reject_apply_subdomain.js.erb 组织栏目子目录 2016-01-13 09:34:33 +08:00
reset_excellent_teacher.js.erb 完成设置名师功能 2016-05-13 09:53:22 +08:00
search_courses.js.erb 增加组织加入课程功能 2015-11-26 16:29:50 +08:00
search_projects.js.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-27 09:50:17 +08:00
set_excellent_teacher.js.erb 完成设置名师功能 2016-05-13 09:53:22 +08:00
set_homepage.js.erb 组织文章设为首页后,跳转至首页 2015-12-11 16:58:00 +08:00
setting.html.erb 名师榜新增一个后就不能再新增 2016-05-13 10:50:34 +08:00
show.html.erb 名师列表搜索功能 2016-05-12 15:02:23 +08:00
show.js.erb 1.将项目动态数据迁移至组织动态; 2015-11-16 15:02:57 +08:00
show_org_subfield.js.erb setting中后台编辑 2016-03-31 16:19:59 +08:00
teacher_search.js.erb 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
teachers.html.erb 教师列表颜色 2016-05-13 16:47:56 +08:00
teachers.js.erb 名师列表局部搜索 2016-05-13 14:52:33 +08:00