jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,522 Commits 98 Branches 0 Tags 0 B
Commit Graph

116 Commits

Author SHA1 Message Date
huang b39e00b5c7 项目讨论区--内容必填 
添加国际化
 2015-05-06 09:26:14 +08:00
huang 135c3d9b19 课程讨论区代码重构 
解决路由匹配和JS显示冲突
 2015-04-29 14:29:03 +08:00
sw f67bdae22a 课程讨论去引用、回帖不换行 2015-04-24 09:10:15 +08:00
sw 10bc470dcf 修改课程讨论区 2015-04-23 17:32:37 +08:00
sw 4224e11b52 课程讨论区标题换行 2015-04-23 16:34:09 +08:00
sw 427f26b058 header的login显示 2015-04-22 16:37:24 +08:00
huang 861469e39f 1、修改回复帖子和新建帖子标题冲突 
2、对齐新建框
3、版本库新建按钮样式
 2015-04-21 16:11:25 +08:00
huang 640f6a1ca7 邮件发送框距离 
去掉讨论区不必要的*
 2015-04-17 10:58:40 +08:00
huang 440eb8dc7f 1、修改项目成员一排显示 
2、项目动态显示强制换行
3、讨论区提示用语
 2015-04-16 19:08:16 +08:00
huang fb06571918 项目讨论区引用强制换行 2015-04-16 17:56:45 +08:00
huang 8803942a02 项目讨论区，引用样式调整 2015-04-16 11:35:38 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-16 10:26:03 +08:00
sw 1dc8190aa0 1、修改无跳转的href链接为javascript:void(0) 
2、增加课程资源库的界面
 2015-04-15 14:53:07 +08:00
sw e579157604 更新public.css 
课程讨论区文件按钮和editor靠的太近
 2015-04-15 14:29:35 +08:00
huang e0695fa51d 讨论区。描述、主题换行 2015-04-15 00:30:33 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
whimlex e148917865 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-10 17:00:10 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
sw 400d1a147d 课程新编辑器导致图片超出页面 2015-04-10 15:43:37 +08:00
sw 6b758375f8 1、搜索课程报500 
2、课程讨论区描述换行显示
 2015-04-10 15:01:33 +08:00
sw d08329631a 修复项目讨论区引用显示不正确 2015-04-08 18:10:39 +08:00
sw c5b55042d4 1、修复课程讨论区引用功能 
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
 2015-04-08 17:25:52 +08:00
huang 8b379711d9 1、修改附件列表排列和样式 
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
 2015-04-07 17:45:00 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 2015-04-07 13:47:39 +08:00
huang df43274565 新版项目界面（部分未完成，先合并） 
1、项目框架整理
2、各页面样式
 2015-04-07 12:48:47 +08:00
sw 500b54a466 讨论区回复引用是html代码 2015-04-03 15:39:24 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
sw 20e80944a5 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 17:43:56 +08:00
z9hang 9fcdaee0cc 课程讨论区回复后附件消失问题 2015-03-27 17:42:28 +08:00
sw 10515adc5c 课程通知和讨论区回复样式不对 2015-03-27 17:00:21 +08:00
sw b55ef84c9c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:55:37 +08:00
sw 7fa8ccad7c 课程通知和讨论区编辑、新建时宽度不对 2015-03-27 16:55:23 +08:00
z9hang a1e1e2dedf 课程讨论区，新建，编辑界面调整 2015-03-27 16:53:36 +08:00
sw dc4686d130 去掉跟踪功能 2015-03-27 16:45:47 +08:00
z9hang e10c747a5f 修改通知附件样式 2015-03-27 16:41:28 +08:00
z9hang cc2cce22cf 讨论区附件样式修改 2015-03-27 16:23:09 +08:00
sw b9031095d4 Merge branch 'szzh' into sw_new_course 
Conflicts:
	Gemfile
	app/controllers/courses_controller.rb
	app/views/attachments/_form.html.erb
	app/views/attachments/_form_course.html.erb
	app/views/files/_attachement_list.html.erb
	app/views/layouts/base.html.erb
	app/views/layouts/base_projects.html.erb
	config/locales/zh.yml
	public/javascripts/attachments.js
 2015-03-27 14:13:49 +08:00
sw c68349803e 1、课程讨论区、通知提示信息样式 
2、整理js
 2015-03-27 13:42:15 +08:00
z9hang 35eb7e80af 讨论区留言分页 2015-03-26 16:17:33 +08:00
z9hang 8ef9779b46 修正课程讨论区样式。修正项目讨论区被影响的样式 2015-03-26 15:55:07 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +08:00
huang 216bc57004 1、进入项目子讨论区之后的页面 
2、修改火狐浏览器“展开信息”异常
 2015-03-17 17:21:49 +08:00
sw 4e2fe44d10 修改js验证事件，由失去焦点事件改为文本改变事件 2014-12-19 11:23:16 +08:00
sw dc9f5d0730 修该讨论区帖子时，如描述为空，跳转到edit页面改为js报错 2014-12-18 16:02:33 +08:00
sw 0f9a82637e #1716 课程讨论区-发布新贴点2次才能成功 2014-12-18 15:58:33 +08:00
sw 89e5eda397 1.修改课程项目编辑讨论区帖子时按钮样式 
2.修复修改课程项目编辑讨论区帖子时第一次点击确定失败
 2014-11-25 10:52:07 +08:00
alan 14ca7bcf9c 修改bug<项目--讨论区：不登录状态下讨论区的帖子是不能进行回复等操作的，建议直接跳转到登录窗口或给出相关提示信息> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-01 16:57:20 +08:00
sw cf9f33fce7 取消回复帖子时对主题的js验证 2014-10-27 14:29:49 +08:00
sw e220f100d6 #1163项目、课程讨论区新建帖子增加js验证 2014-10-27 14:20:59 +08:00
z9hang 164297e30f 回复帖子要点两次提交问题 2014-10-21 16:34:46 +08:00