Commit Graph

27 Commits

Author SHA1 Message Date
huang ce5b2d9996 项目讨论区回复按钮 2015-04-16 17:29:04 +08:00
huang e34a00f66e 讨论区列表样式冲突 2015-04-16 11:17:44 +08:00
huang dc81db1d8b 处理讨论区、缺陷列表样式显示异常 2015-04-16 11:07:37 +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
huang e0695fa51d 讨论区。描述、主题换行 2015-04-15 00:30:33 +08:00
whimlex 2a35e771c2 项目界面国际化及样式调整;标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
huang 8b379711d9 1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区:“编辑” “引用”, “回复”
4、讨论区与课程分离
2015-04-07 17:45:00 +08:00
huang df43274565 新版项目界面(部分未完成,先合并)
1、项目框架整理
2、各页面样式
2015-04-07 12:48:47 +08:00
whimlex 6e0de61458 项目讨论区回复修改 2015-04-03 16:13:31 +08:00
huang 1cdf397bc0 修改关注、申请方法中样式 2015-03-18 20:04:59 +08:00
huang 4111e2a940 1、讨论区新子界面
2、项目右侧优化
2015-03-17 17:02:32 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +08:00
sw 3f3bb62678 非项目成员添加新闻、添加讨论区按钮不可见 2015-03-07 14:43:54 +08:00
huang b043d07d61 修改发布新贴显示问题 2015-03-07 11:02:12 +08:00
huang beac15475d 新项目及用户反馈框的修改!! 2015-03-06 14:55:21 +08:00
sw 23907c5c01 修改课程讨论区按钮样式 2014-11-25 16:02:11 +08:00
alan ace5b514c6 修改bug<测试版--注册登录:成功激活注册的用户后,登录返回资料修改的页面,姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
2014-11-25 14:17:04 +08:00
zhuhao b222b7a8ed 资源库讨论区发帖按钮样式调整 2014-11-24 09:21:48 +08:00
sw e220f100d6 #1163项目、课程讨论区新建帖子增加js验证 2014-10-27 14:20:59 +08:00
sw 7a710a4a8f 去除掉部分无用预览按钮 2014-10-13 09:40:49 +08:00
alan dea1a299af 修改competition的view文件,将其中不规范的代码进行修改,并将其中所有的link_to
修改成"link_to ‘welcome’ home_path,  {option}" 的形式;
统一route风格
match 'path', :to => 'controller#action'
如果 path = controller#action 则 match 'path'
Example:
match 'welcome/course', :to => 'welcome#course' 变成 match 'welcome/cource'


Signed-off-by: alan <547533434@qq.com>
2014-09-12 16:45:03 +08:00
sw fbb19480f5 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
z9hang e1672fd0e0 讨论区帖子数统计错误问题 2014-08-27 10:20:08 +08:00
chenmin 554d744929 修复项目和课程讨论区所有帖子显示页面各帖子内容没对齐的bug; 2014-08-22 09:18:45 +08:00
chenmin e44ece80f6 项目讨论区贴子主题超出边界bug处理 2014-08-15 14:45:04 +08:00
sw 5838b3e47d 不选择新闻时,取消"添加新闻"按钮的显示。不选择问题跟踪时,取消“新建问题”和“自定义查询”按钮的显示,不选择讨论区时,取消“发布新帖”按钮的显示 2014-07-18 10:54:22 +08:00
nwb 863dec03d2 添加课程讨论区show视图 2014-06-12 10:03:01 +08:00