Commit Graph

81 Commits

Author SHA1 Message Date
huang 2fe1100da6 去掉课程使者帖子中时间 2016-03-18 12:34:41 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
cxt 4f3055c990 讨论区改为问答区,且放开课程的“问答区”,就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
huang 75214f0211 新课导语修改:导语的时候显示trustie信息 2016-02-20 16:45:45 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
huang e2fc88e3d1 课程讨论区样式混乱的问题 2016-01-21 16:14:39 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
2016-01-21 16:10:29 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
2016-01-20 17:05:28 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-20 09:27:29 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
cxt 0ffce929f4 项目讨论区的动态点赞 2016-01-14 15:22:37 +08:00
cxt bf6f46174e 课程讨论区回复的点赞 2016-01-14 10:07:46 +08:00
cxt b73aab1cf6 课程讨论区的点赞 2016-01-13 16:32:05 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
2016-01-08 18:09:21 +08:00
cxt a0afe6ccbf 动态显示附件并统一附件样式 2016-01-08 16:05:36 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
ouyangxuhua 80668d6a47 增加以下功能:
鼠标经过用户头像时,显示用户的详细信息,并且可以添加/取消关注,可以私信/留言。
2016-01-07 10:10:24 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
cxt 7e76a32480 项目/课程讨论区的动态增加设置菜单 2015-12-31 15:36:42 +08:00
cxt 2f4b29085c 首页动态中的表格超出边框 2015-10-26 15:26:05 +08:00
cxt e2990fb55c 控制动态描述的高度为20行,可展开和收起。 2015-10-22 17:42:02 +08:00
cxt 26eda763fe 帖子锁定时动态的样式调整 2015-10-16 16:31:31 +08:00
Tim 4dddbe9dc7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/users/_course_journalsformessage.html.erb
2015-10-16 10:58:28 +08:00
Tim 49b994b3fe 个人动态、系统消息动态、课程动态格式调整 2015-10-16 10:54:22 +08:00
cxt 770f2f14bd 个人动态、课程动态、讨论区、单个帖子页面的图片可点击 2015-10-16 10:18:51 +08:00
cxt 0a43f462f5 帖子动态添加置顶显示 2015-10-15 16:44:49 +08:00
cxt 20ff1430fc 动态回复默认显示3个,“收起回复”、“展开更多”后去掉回复数 2015-10-14 14:19:59 +08:00
cxt 0f6ea47792 课程讨论区的列表显示 2015-10-09 14:39:40 +08:00
cxt dea03a4d9f 首页动态描述和回复的图片大小的调整和可点击 2015-09-29 10:26:22 +08:00
cxt 6a3089bb9b 动态的回复图片超出边框 2015-09-28 10:51:24 +08:00
cxt afb1a8f53f 回复框发送按钮的样式调整 2015-09-23 09:59:23 +08:00
cxt 3e58264a28 个人首页动态的列表li的项目符号不显示的问题修复 2015-09-22 16:27:27 +08:00
cxt facd12640a 个人动态的回复为0时不显示“回复(0)” 2015-09-21 16:54:23 +08:00
cxt 9be7e633ae 动态回复框的样式调整 2015-09-21 16:20:29 +08:00
sw bbc14dbe5c 课程论坛回复框上信息错误 2015-09-19 11:52:02 +08:00
sw fdaa573249 动态页面自动增高后编辑框超出阴影区域 2015-09-19 11:37:31 +08:00
cxt 098be99b84 动态回复框的样式调整 2015-09-19 11:18:41 +08:00
cxt cacb3e043a 动态回复框的焦点前焦点后样式调整 2015-09-18 16:34:37 +08:00
cxt 154cd7de6f 子域名的更改 2015-09-18 14:31:19 +08:00
Tim 0930815086 回复头像模糊效果 2015-09-17 10:25:26 +08:00
Tim 5b6ac4564a 回复框头像路径改变 2015-09-17 08:46:43 +08:00
Tim 3d5f93b938 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_activities.html.erb
	public/stylesheets/new_user.css
2015-09-16 16:13:40 +08:00