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

1042 Commits

Author SHA1 Message Date
huang b80251a247 链接空白处改成不能点击 
修复项目标题过长，布局变形
 2015-04-16 15:16:15 +08:00
huang 3c563eaecb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 14:34:21 +08:00
huang bb7904b32f 引入JS文件 2015-04-16 14:34:08 +08:00
whimlex 19dd5a9879 项目邀请功能和项目更多功能点击事件 2015-04-16 14:25:02 +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 bd800a53e4 项目简介显示 2015-04-16 10:00:36 +08:00
whimlex 7ce8ae0261 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 09:54:27 +08:00
whimlex 9c07976751 展开和收起更多信息图片样式修改；跟踪者样式修改 2015-04-16 09:54:10 +08:00
huang bc6ff57de2 修改开发组、朋友圈、研发组切换js 2015-04-16 09:30:06 +08:00
whimlex 04698c3e53 项目描述展开信息和收起信息 2015-04-16 04:53:09 +08:00
whimlex d23ac832ca 项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
whimlex ba0535e127 完成新建缺陷页面 2015-04-15 16:34:34 +08:00
sw 1dc8190aa0 1、修改无跳转的href链接为javascript:void(0) 
2、增加课程资源库的界面
 2015-04-15 14:53:07 +08:00
alanlong9278 b704555628 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/controllers/discuss_demos_controller.rb
	app/models/user.rb
	app/views/bids/_bid_homework_show.html.erb
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/poll/publish_poll.js.erb
	app/views/poll/republish_poll.js.erb
	public/javascripts/application.js

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-15 12:36:19 +08:00
alanlong9278 a51ba0c104 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-04-15 12:30:37 +08:00
sw 61df6e144d 修复学生作业列表QQ浏览器显示超出边框 2015-04-15 10:06:52 +08:00
huang b3689377a3 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 11:48:15 +08:00
huang b98a67f50d 完成项目配置-成员模块 2015-04-14 11:47:47 +08:00
sw 8c122a35f7 项目类型切换到其他类型后，再切回开发组，更多按钮不可用 2015-04-14 10:46:31 +08:00
sw fadca9128f 完成项目朋友圈、开发组、科研组直接的切换功能 2015-04-14 10:17:42 +08:00
sw 7b60998952 修改点击课程名称，url连接错误 2015-04-11 15:34:08 +08:00
huang 33abbaffe1 修改isuue显示界面 
附件显示形式
国际化
部分样式调整
 2015-04-10 17:49:16 +08:00
sw ece4a67f97 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-10 16:35:20 +08:00
sw 600003e48c 公共贴吧中使用新编辑器上传大图片，图片超出界面 2015-04-10 15:54:17 +08:00
sw 400d1a147d 课程新编辑器导致图片超出页面 2015-04-10 15:43:37 +08:00
sw ea0bd7e0dd 1、技术支持只有白羽 
2、修改鼠标悬浮在白羽上有下划线
 2015-04-10 15:22:03 +08:00
sw 596bc213ca 1、课程导航懒点击课程跳到动态页面 
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
 2015-04-10 15:15:49 +08:00
whimlex 1fae44b201 用户主页国际化修改 2015-04-10 13:21:36 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
sw b8760c6403 个人描述最长为200 2015-04-09 16:01:26 +08:00
sw 4fbbd7ceb7 公共贴吧，描述显示问题 2015-04-09 14:41:17 +08:00
sw 4b83296a97 课程作业列表开启、关闭匿评 2015-04-09 11:38:13 +08:00
sw a737342a66 完成个人信息下拉、首页下标的隐藏非项目信息的定制 2015-04-09 11:00:39 +08:00
huang b415575e0e 修改新缺陷列表 
完成部分项目配置
 2015-04-09 08:43:51 +08:00
sw d192a564b4 课程作业列表、课程动态页面描述出现html标签 2015-04-08 14:32:42 +08:00
huang bf36da8dcb 修改醒目新闻新建页面 
退出项目样式
 2015-04-08 09:57:48 +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
whimlex aa64b47d74 资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整 2015-04-03 11:30:48 +08:00
sw a84af9d138 课程私有资源不显示在没有权限查看的用户上 2015-03-30 17:44:40 +08:00
sw e7da022564 课程界面默认图片路径修改 2015-03-30 10:11:11 +08:00
sw 72d683bdb7 加入课程与退出课程js刷新 2015-03-27 19:50:01 +08:00
sw fcc4275a36 Merge branch 'sw_new_course' into szzh 2015-03-27 17:44:29 +08:00
whimlex 54908423bc 课程--作业附件显示问题;问题跟踪附件显示问题 2015-03-27 17:00:23 +08:00
whimlex 3d2fc8e5ef IE8 2015-03-27 15:21:48 +08:00
whimlex 762c83b26c commit 2015-03-27 15:17:18 +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 83dfcdcc02 学生可以发帖 2015-03-27 11:57:49 +08:00
z9hang bdaf574266 修改发布新帖，发布课程通知链接 2015-03-27 11:55:18 +08:00
whimlex 7fd77f0354 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-27 11:21:55 +08:00
whimlex 89a001ad9d IE8浏览器及以下低版本浏览器提示 2015-03-27 11:20:15 +08:00
sw cba678a357 课程是否启用匿评 
课程作业列表样式
加入与退出课程按钮样式
 2015-03-26 19:01:22 +08:00
sw 8f90fed8be 新建课程界面完成 2015-03-26 16:01:25 +08:00
lizanle 05cf90062f 论坛的描述如果有图片的话，图片会显示。使排版出现问题 2015-03-26 15:45:43 +08:00
lizanle cd976f9515 如果论坛的description上传了图片，那么这个图片会显示，使得论坛的界面被图片占据。 2015-03-26 15:44:39 +08:00
lizanle d1d40e1867 添加一个输入框的id，在论坛模块里，自动生成的id会和编辑器kindeditor生成的id冲突：都叫memo_content 2015-03-26 15:38:23 +08:00
sw 53eef164c9 新建课程时layout修改 2015-03-26 15:12:14 +08:00
whimlex 82fb9325c5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/_point_browser.html.erb
 2015-03-26 10:47:03 +08:00
whimlex 4de0255ce6 邀请邮件国际化；js冲突 2015-03-26 10:45:14 +08:00
huang eac6f814a8 解决浏览器提示关闭按钮与邮件邀请界面冲突 2015-03-26 10:41:54 +08:00
sw 27e7bc21b5 当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示 2015-03-25 14:09:44 +08:00
huang 792a87dcaf 修改提示框引起的首页行距过高的问题 2015-03-25 13:52:48 +08:00
huang 75567585d2 浏览器版本过低提示样式调整！ 2015-03-25 11:02:20 +08:00
sw 61d7d65b55 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/courses/_courses_jours.html.erb
 2015-03-25 10:28:50 +08:00
sw bcf9d5919c 1、处理部分a标签调用js函数时会刷新页面的BUG 
2、修改弹出框样式，制作弹出框demo
 2015-03-25 10:21:33 +08:00
huang 525a6394ca 1、公共贴吧邮件提醒 
2、浏览器版本过低提醒（样式需要再调试）
 2015-03-25 10:20:08 +08:00
z9hang 13245282d4 修正讨论区帖子数量显示不正确问题 2015-03-24 17:21:41 +08:00
huang f1b8d74a07 修改加入项目字体大小、宽度 2015-03-21 14:17:29 +08:00
whimlex d73d842e31 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 15:59:53 +08:00
whimlex 34579e395f 附件上传bug修改；意见反馈收拉一致 2015-03-20 15:59:30 +08:00
huang cea43cb045 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 15:03:24 +08:00
huang 69eb7fbd77 关注、加入项目样式，处理样式冲突 2015-03-20 15:02:20 +08:00
sw b6b479f6f9 1、增加开启关闭匿评时弹框 
2、增加js调用是等待的样式
 2015-03-20 11:37:56 +08:00
whimlex 6995ead66c 项目ID 2015-03-19 17:28:12 +08:00
whimlex b400c9bb11 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-19 17:22:25 +08:00
whimlex b95852dfcd 附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改 2015-03-19 17:21:11 +08:00
dingxu 79588489e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-19 16:25:38 +08:00
dingxu 440855c0e6 修改项目tag样式 2015-03-19 16:25:18 +08:00
sw 7541a83b16 改课程首页用新建问卷 2015-03-19 15:04:44 +08:00
sw 90df8056c8 1、修改分页控件中省略号颜色 
2、更新样式文件
3、修改课程首页用新建问卷换行
 2015-03-19 14:58:42 +08:00
sw b9ed34f86e 1、右边内容区域、增加js：最短为左侧长度 
2、修改课程首页动态显示
3、修改course.css文件
 2015-03-19 11:42:52 +08:00
lizanle 0424fc55db 项目资源数显示错误 2015-03-19 11:26:31 +08:00
lizanle 966f93012d Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-19 11:16:11 +08:00
lizanle c209bccba0 项目资源数显示错误 2015-03-19 11:15:58 +08:00
alan cf3d836cf3 删除邮件发送时出现《"亲爱的Trustie用户，您好！"》 
Signed-off-by: alan <547533434@qq.com>
 2015-03-19 09:37:37 +08:00
sw d92ac2d909 1、课程跳到其他页面后没有分块 
2、修改course_show界面
 2015-03-18 18:03:17 +08:00
sw 423849ca84 加入课程、退出课程、配置、关闭、复制等按钮 2015-03-18 17:14:26 +08:00
sw 1c30b8c81c 1、增加获取某个课程动态数的方法 
2、修改首页配置、关闭、复制课程等按钮的样式
 2015-03-18 16:34:25 +08:00
sw 8f5d8c86a3 新版样式header调整 2015-03-18 16:16:18 +08:00
sw 64b0646281 base_course基本完成 2015-03-18 15:18:06 +08:00
sw e7cce1fd28 修改项目html错误 2015-03-18 11:42:06 +08:00
sw 642cf80bf8 调整课程主页分块显示 2015-03-18 10:47:30 +08:00
sw 278854156a 调整课程信息样式 2015-03-18 10:15:10 +08:00
sw 16872597b6 实现课程搜索 2015-03-17 18:02:46 +08:00
sw ec1ff6dfc3 1、修改课程界面未登录时，先显示注册，再显示登录 
2、增加课程相关的css引用
3、增加top、left、content的静态页面
 2015-03-17 17:34:43 +08:00
sw 4d60a6dabc 1、修改版权 
2、增加footer
 2015-03-17 17:04:18 +08:00
huang 4111e2a940 1、讨论区新子界面 
2、项目右侧优化
 2015-03-17 17:02:32 +08:00
sw 4c482e1fac 完成新的用户反馈界面 2015-03-17 16:19:31 +08:00
sw d2c7861706 1、添加缺少图片 
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
 2015-03-17 15:57:09 +08:00
sw e4c0c840bf 1、完成课程模块导航栏样式调整 
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
 2015-03-17 15:30:15 +08:00
sw 747a109638 1、添加CSS文件 
2、调整首页HTML
3、去掉base_header中没用的erb语句
 2015-03-16 11:51:12 +08:00
sw 3b0a229c43 1.修改意见反馈框默认关闭 
2、FIle--->资源库
 2015-03-13 18:01:16 +08:00
sw e4895731ae Merge branch 'develop' into szzh 2015-03-13 17:48:12 +08:00
sw ca7c970094 修改意见反馈框位置 2015-03-13 17:27:24 +08:00
huang cc5a22f2c6 修改新建按钮样式 2015-03-13 16:16:38 +08:00
huang a010c800d6 修改权限库为空情况下403问题 
修改项目标题样式
确认发送国际化
添加小图标
 2015-03-13 15:37:54 +08:00
huang 47e1427ead 左侧工具栏添加功能：左侧统计数目为零的手不显示 2015-03-12 19:29:44 +08:00
huang 77bf3be20d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_users.html.erb
 2015-03-12 16:49:42 +08:00
huang b809e8844c 修改项目中添加标签按钮显示异常 2015-03-12 16:42:18 +08:00
sw d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:32:31 +08:00
huang 4bfc72dc28 用新表统计动态 
修改关注样式
 2015-03-12 15:56:03 +08:00
sw 717be2b045 修改部分用户的用户首页报错 2015-03-12 10:29:19 +08:00
sw 69eecf49d1 还原冲突 2015-03-12 09:52:57 +08:00
whimlex 65ee3fdc74 项目主页国际化，项目主页JS冲突解决 2015-03-12 09:47:42 +08:00
huang c773e0fd39 JS冲突，去掉多余标点 2015-03-12 08:42:39 +08:00
huang 29655838f0 项目超过的部分用“展示更多信息”拉开 2015-03-11 23:50:37 +08:00
huang c36db9fd63 项目左侧按钮实现配置-模块进行显示/隐藏管理 2015-03-11 22:42:42 +08:00
whimlex 11da65c9ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-03-11 17:27:02 +08:00
whimlex 57c8575470 新版项目模块国际化，目前完成各项目主页，项目动态，项目评分 2015-03-11 17:23:38 +08:00
huang 3ee9ac2b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-11 16:44:54 +08:00
huang 8f0af4c00d 修改了未登陆情况下通过URL访问不允访问的 2015-03-11 16:42:02 +08:00
sw 52dfb0b0ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 15:16:43 +08:00
sw 27e72c1f39 #2000 增加项目每个模块的访问控制 2015-03-11 15:14:23 +08:00
huang cbfb72bd5b 修改新建资源库显示 2015-03-11 14:32:29 +08:00
whimlex 540ddd4a1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-11 11:55:13 +08:00
whimlex 0eafbb92d5 意见反馈模块国际化 2015-03-11 11:53:42 +08:00
huang 32a2e7ae1f 修改默认情况下 用户反馈框处于关闭状态 2015-03-11 11:38:09 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +08:00
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	app/views/users/show.html.erb
	config/locales/zh.yml
 2015-03-10 10:08:18 +08:00
whimlex 115eb38a02 完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签 2015-03-10 09:45:36 +08:00
sw 81b58e5c87 修改base_project中代码错误 2015-03-09 15:32:55 +08:00
huang d947ebff0c 添加国际化 2015-03-09 10:31:05 +08:00
huang e22b389971 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 11:15:30 +08:00
huang b043d07d61 修改发布新贴显示问题 2015-03-07 11:02:12 +08:00
alan 5ff43fdea7 项目添加新用户邮件发送功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 10:52:20 +08:00
huang ce792f6ce8 修改邮件发送界面 2015-03-07 09:32:27 +08:00
huang b3cbfd39ca 修改一些缺陷，删掉多余的文件 2015-03-07 01:07:50 +08:00
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/issues/show.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/projects/_form.html.erb
	app/views/projects/new.html.erb
	app/views/projects/show.html.erb
 2015-03-06 15:23:42 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +08:00
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb
 2015-03-06 08:59:29 +08:00
sw a2d986f70c 修改页面代码 2015-03-04 16:55:25 +08:00
sw 032e28067d #1959 项目评分是0的，就不显示了！ 2015-03-04 11:34:01 +08:00
sw 5bba54432d #1930 项目缺陷显示个数修改 2015-03-04 09:52:01 +08:00
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/_search_project.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-02-09 22:14:16 +08:00
whimlex 59a2c8283a 国际化结构调整 2015-02-09 22:07:21 +08:00
lizanle d902d76ae2 将google统计换为了百度统计 2015-02-06 10:15:18 +08:00
sw 78d8a0a1c6 修改意见反馈折叠后背景为透明 2015-02-02 09:09:45 +08:00
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-31 10:10:28 +08:00
sw a265556cfe 搜索项目时增加js验证增加 2015-01-30 11:00:18 +08:00
whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
 2015-01-30 10:34:47 +08:00
whimlex f05e046751 首页国际化 2015-01-30 10:26:26 +08:00
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +08:00
sw 2978d9020f Merge branch 'develop' into szzh 2015-01-29 17:44:37 +08:00
sw b71d714103 #1887 用户职称显示问题 2015-01-29 16:39:25 +08:00
sw bf75f32903 修改个人留言界面，左侧个人信息样式显示不正确 2015-01-29 16:22:26 +08:00
whimlex b7c7cc4c64 意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致 2015-01-28 12:13:17 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
sw 5950f0404b #1832 不显示无数据的字段，字段名 2015-01-27 11:35:19 +08:00
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-26 17:47:47 +08:00
whimlex e5e24c1163 resolve conflict 2015-01-26 17:47:33 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正 2015-01-26 17:37:05 +08:00
alan 0944cc4ca8 < 邮件格式调整> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-26 15:54:23 +08:00
alan 472ccc45bf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 23:12:51 +08:00
alan a3cf79db96 修改编码问题 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 15:55:29 +08:00
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	app/controllers/projects_controller.rb
	config/locales/zh.yml
 2015-01-23 10:33:07 +08:00
sw bb64dc9452 修改问卷调查按钮的样式 2015-01-23 10:19:23 +08:00
sw 89ee38481b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/_base_feedback.html.erb
 2015-01-23 09:56:37 +08:00
huang c65bab8c38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 09:47:33 +08:00
huang c6deffe245 修改首页样式显示异常 2015-01-23 09:47:13 +08:00
sw 2b5928602e 1.修改由于意见悬浮框引起的界面的padding不正确的问题 
2.修改问卷调查左侧会出现滚动条的问题
 2015-01-23 09:17:27 +08:00
whimlex 3fcb2f14a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/mailer/issue_edit.html.erb
 2015-01-22 21:02:53 +08:00
whimlex 1e36ca504a 多种邮箱邮件样式调整，回复内容样式更改 2015-01-22 20:41:42 +08:00
sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-22 17:51:11 +08:00
huang 388ddac96b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-22 17:46:31 +08:00
huang 84bfd30fc5 修改问题反馈弹框！ 2015-01-22 17:46:12 +08:00
sw e72ed1054e 修改问卷调查按钮的样式 2015-01-22 09:39:04 +08:00
whimlex 3279928bef 邮件样式调整，国际化；用户资料页面调整 2015-01-21 18:12:04 +08:00
alan 3315116832 修改《课程--留言：给课程留言却返回404》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-19 14:35:30 +08:00
lizanle 49ff5659d9 系统日志查看相关代码，资源 2015-01-19 14:09:53 +08:00
alan 0b0b6c9b6e 修改《托管平台中点击某项目进入该项目主页，右上角的搜索处不输入内容点击搜索按钮，给出的提示信息显示不合理》 
增加《课程平台进入某一课程搜索风格保持与项目及竞赛的一致》
Signed-off-by: alan <547533434@qq.com>
 2015-01-19 11:01:05 +08:00
alan 092265d53c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-18 00:25:19 +08:00
sw 1e8c6374d7 Merge branch 'szzh' into Poll 
Conflicts:
	app/views/layouts/_base_feedback.html.erb
 2015-01-17 15:03:59 +08:00
sw 2f9e658697 增加问卷调查按钮的样式 2015-01-17 14:59:43 +08:00
alan ade0720331 邮件系统界面重置 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 14:19:54 +08:00
sw b3f37f5154 111 2015-01-17 12:13:03 +08:00
sw bba213dec9 1.#1802 修复页面下方有很大一片空白 
2.修复系统文本框的padding、margin都为0
 2015-01-17 12:12:06 +08:00
alan b9ea3e589e 修改《邮件系统》页面 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 11:18:24 +08:00
alan 9c45e372b4 Merge remote-tracking branch 'remotes/origin/develop' into szzh 
Conflicts:
	app/views/layouts/base_newcontest.html.erb
 2015-01-16 17:24:45 +08:00
alan 479a1249ae Signed-off-by: alan <547533434@qq.com> 2015-01-16 17:23:35 +08:00
alan 90925edce2 修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-12 17:56:09 +08:00
sw d2dfff33d0 课程页面增加问卷调查的链接 2015-01-12 17:01:39 +08:00
huang 2cd805ef4c 去掉课程单独的弹框 2015-01-10 18:17:36 +08:00
alan 74af44a826 修改《修改个人资料页面》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 18:01:41 +08:00
alan 3db80fc3fc 修改《contest链接bug》 2015-01-10 17:02:23 +08:00
huang 293b3a3b42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-10 15:42:33 +08:00
huang f7c1b76b3d 用户反馈弹框模块！ 2015-01-10 15:39:02 +08:00
alan fb6c297a37 Signed-off-by: alan <547533434@qq.com> 2015-01-10 11:46:39 +08:00
alan 575b641e25 merge dev_chuangbin 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 11:01:16 +08:00
alan 6c9f5136c0 修改《竞赛主页显示错误》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 10:37:32 +08:00
alan 3f354a019f 修改（个人主页个人签名格式乱了） 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 14:14:15 +08:00