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

435 Commits

Author SHA1 Message Date
alan 3b58810528 修改课程讨论区的js 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 17:38:08 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
guange 3f88a67eef 编辑器支持直接粘贴QQ截屏 2015-05-06 23:32:34 +08:00
whimlex 3c72af69ea 版本库刷新页面时“git操作指南”展开收起保持一致 2015-05-06 17:41:18 +08:00
guange bd54edd770 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-06 11:05:09 +08:00
guange 05428213a2 让session保持，防止长时间编辑时session丢失 2015-05-06 11:04:57 +08:00
sw 2e26e27298 版本库收起后之保存在cookie中，刷新页面后仍保持收起状态 2015-05-05 17:08:46 +08:00
huang 135c3d9b19 课程讨论区代码重构 
解决路由匹配和JS显示冲突
 2015-04-29 14:29:03 +08:00
whimlex f3fb0115e4 版本库git操作文档默认展开，样式调整 2015-04-27 17:15:21 +08:00
whimlex 40fdda0ee2 版本库git帮助文档的显示与隐藏 2015-04-27 16:58:16 +08:00
whimlex 481f7ee4ba 意见反馈按回退键重新计算 2015-04-24 15:08:09 +08:00
whimlex 85e1262769 意见反馈 2015-04-24 15:02:32 +08:00
whimlex 650ffd4397 课程和项目意见反馈 2015-04-24 14:47:50 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
whimlex b3e0490b90 意见反馈 2015-04-23 17:55:48 +08:00
whimlex 5d0d9de6e8 意见反馈各主页内保持一致 2015-04-23 16:13:01 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +08:00
sw 7b3edb59b0 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js
 2015-04-22 11:11:51 +08:00
sw 3d8ec17bb1 修改学生作业得分列表弹出框样式 2015-04-22 11:07:39 +08:00
huang ca26b0d819 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js
 2015-04-22 09:31:13 +08:00
huang 692500af2e Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-20 14:54:27 +08:00
huang 93e3247685 项目名称不能为空提示 2015-04-20 14:54:04 +08:00
alanlong9278 0668af4f89 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/bids/_bid_homework_show.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-20 14:54:02 +08:00
whimlex 86ef3e680a 项目简介展开更多信息不超过一定内容不显示 2015-04-20 14:45:46 +08:00
whimlex 05712c4c06 学生作业改为作品 2015-04-17 17:48:25 +08:00
huang 7d87915413 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/homework_attach/_homework.html.erb
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-17 15:07:01 +08:00
whimlex 8babe384fd 缺陷历史记录调整 2015-04-16 20:11:33 +08:00
whimlex e9cf61e0f4 缺陷状态根据完成度调整 2015-04-16 17:56:19 +08:00
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +08:00
whimlex 19dd5a9879 项目邀请功能和项目更多功能点击事件 2015-04-16 14:25:02 +08:00
sw 2db3ab9d13 修改课程时增加密码与课时的验证 2015-04-16 10:56:48 +08:00
sw 94ca6cd2f9 新建课程时增加密码与课时的验证 2015-04-16 10:49:58 +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
whimlex 9c07976751 展开和收起更多信息图片样式修改；跟踪者样式修改 2015-04-16 09:54:10 +08:00
whimlex 04698c3e53 项目描述展开信息和收起信息 2015-04-16 04:53:09 +08:00
whimlex d23ac832ca 项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
whimlex ba0535e127 完成新建缺陷页面 2015-04-15 16:34:34 +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
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
sw 8c122a35f7 项目类型切换到其他类型后，再切回开发组，更多按钮不可用 2015-04-14 10:46:31 +08:00
huang 48f096178c 修改配置modoule模块 2015-04-13 21:53:52 +08:00
huang 2b063db0cc 修改版本界面 
未完成部分，隔行换色
 2015-04-13 21:08:26 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
sw 01f56a761f 完成配置---模块 2015-04-11 17:28:18 +08:00
sw 7ad3c2d578 修改项目配置js 
增加项目配置相关子界面
 2015-04-11 16:17:36 +08:00
sw 837fe88545 还原冲突，增加项目配置切换js 2015-04-11 14:19:52 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
whimlex 5936d8d8e9 评论显示 2015-04-11 11:52:11 +08:00
whimlex 874dcc2b89 附件上传国际化调整 2015-04-10 17:58:59 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
huang 45fa01c773 修改缺陷不能显示的bug 2015-04-09 09:22:09 +08:00
guange 0325554d24 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-09 09:20:50 +08:00
huang b415575e0e 修改新缺陷列表 
完成部分项目配置
 2015-04-09 08:43:51 +08:00
sw c5b55042d4 1、修复课程讨论区引用功能 
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
 2015-04-08 17:25:52 +08:00
sw dae907d0b8 1、课程通知无法添加评论 
2、课程通知界面显示
3、课程通知评论取消按钮
 2015-04-08 15:49:53 +08:00
sw 663c9aad60 1、课程通知列表出现html代码 
2、整理课程通知部分js
3、还原编辑器js代码
 2015-04-08 15:01:41 +08:00
guange 89af4b451b #2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了 2015-04-08 13:52:52 +08:00
sw ba4894239c 1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名 
2、修改课程密码显示取消明码显示
 2015-04-08 11:29:21 +08:00
sw 3bedddd190 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:49:45 +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 7b09fd0489 作业的时间选择器选择时间后不能自动关闭 2015-04-03 17:33:33 +08:00
sw b971147aa8 1、添加通知会alert 
2、添加通知描述样式
3、通知添加评论样式
 2015-04-03 15:01:26 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
sw 046536230c 增加课程配置界面、成员的基本信息以及相关js 2015-03-30 10:47:23 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
 2015-03-27 18:17:46 +08:00
sw 7b70369438 上传文件样式调整 2015-03-27 15:19:13 +08:00
z9hang 41e372c16a 上传资源按钮样式调整 2015-03-27 14:51:59 +08:00
sw 2ca2f90830 上传文件js问题 2015-03-27 14:21:10 +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
sw 519c119543 修改上传文件样式 2015-03-27 09:32:13 +08:00
sw 9a2f572cf4 是否启用匿评功能异常 2015-03-26 19:06:17 +08:00
sw cb1fce32fe 配置课程 2015-03-26 17:17:31 +08:00
sw 8f90fed8be 新建课程界面完成 2015-03-26 16:01:25 +08:00
sw ab7d12e514 1、修改、删除分班是js方法重构 
2、验证分班名是否重复重构
 2015-03-26 11:30:00 +08:00
sw ab3a3a8573 学生收索功能 2015-03-25 20:38:07 +08:00
whimlex 05d17361e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-25 17:30:54 +08:00
whimlex 1452e09154 邮件邀请邮箱格式自动填充；部分国际化 2015-03-25 17:28:22 +08:00
sw 7b379456ed 课程作业描述很长时才显示更多按钮 2015-03-25 14:34:20 +08:00
sw 6c5cf50bf0 去掉弹框js 2015-03-25 14:12:57 +08:00
sw 27e7bc21b5 当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示 2015-03-25 14:09:44 +08:00
guange 4b636d8be6 #1801 打包上传分个数下载完成 2015-03-25 13:13:09 +08:00
guange bdf419438e merge 2015-03-25 10:38:04 +08:00
z9hang 8190d0cecc 修改留言页面样式 2015-03-24 19:51:03 +08:00
z9hang be46142b3c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/javascripts/course.js
 2015-03-24 17:14:08 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +08:00
sw 2ef10e89ac Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 17:01:19 +08:00
sw 273e82f620 修改poll的show界面的样式 2015-03-24 16:26:54 +08:00
sw 7970bd6df0 1、增加作业截至时间的js显示 
2、截止时间到了之后的显示
 2015-03-24 09:57:55 +08:00
z9hang a2ec9c661a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 08:43:54 +08:00
sw f3fefe50f1 1、增加flash显示样式 
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
 2015-03-23 18:40:58 +08:00
guange 1126d9b9a9 #2082 IE8浏览器--任意模块上传附件：上传附件后，“未上传文件”字样并未随着附件的上传变成“已上传X个文件” 2015-03-23 18:06:53 +08:00
z9hang cb278e65a2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/javascripts/course.js
	public/stylesheets/courses.css
 2015-03-23 17:49:18 +08:00
z9hang d44bbe9de1 课程通知界面新建通知修改 2015-03-23 17:36:50 +08:00
sw 5139ac30dc 修改老师新建作业界面 2015-03-23 17:18:58 +08:00
z9hang bcfdac37a7 课程资源中的图片点击下载有弹框改为预览图片 2015-03-20 17:26:31 +08:00
z9hang 27a4e462de jpeg图片预览 2015-03-20 16:49:04 +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
z9hang 1cd2984c05 #2066 网站中的图片附件链接，能否点击后直接在浏览器中显示，而不是下载？ 2015-03-20 15:11:53 +08:00
whimlex 5924cd6432 commit 2015-03-20 11:37:57 +08:00
sw b6b479f6f9 1、增加开启关闭匿评时弹框 
2、增加js调用是等待的样式
 2015-03-20 11:37:56 +08:00
whimlex 3837e1fcf5 申请加入：附件上传 2015-03-20 11:34:59 +08:00
sw 3418c9ccee 1、修改course/homewrok方法 
2、修改course的作业列表显示
 2015-03-19 17:28:36 +08:00
sw b9ed34f86e 1、右边内容区域、增加js：最短为左侧长度 
2、修改课程首页动态显示
3、修改course.css文件
 2015-03-19 11:42:52 +08:00
sw 64b0646281 base_course基本完成 2015-03-18 15:18:06 +08:00
sw 16872597b6 实现课程搜索 2015-03-17 18:02:46 +08:00
z9hang 943258aebe #2025 项目--资源库：上传资源时，分类资源为“课件”或“研究报告”，成功上传后，都是源代码 2015-03-17 17:29:35 +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
guange 38c3b40ca1 #1701 修复在编辑作业时，删附件会导致名称编辑内容丢失 2015-03-11 10:52:09 +08:00
guange 31351bc9e8 #1095 在issue主题下，输1个字符可以进行搜索，500错误解决 2015-03-10 15:39:14 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +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
lizanle 4461a66c7a 添加刷新函数 2015-01-21 17:43:06 +08:00
lizanle c82722c220 日期选择js 2015-01-22 16:41:56 +08:00
sw a1f21f3ebb 1、修改一次添加一个题目 
2、新增题目时，新建题目获取焦点
3、新增题目后页面事件改变
 2015-01-15 16:10:24 +08:00
alan 63c9804da8 添加course_group表单到数据库中，并建立对应于members和courses之间的关联， 
对相应页面的修改

Signed-off-by: alan <547533434@qq.com>
 2014-12-02 14:41:36 +08:00
alan ace5b514c6 修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-25 14:17:04 +08:00
alan 6363208781 修改base_user 
Signed-off-by: alan <547533434@qq.com>
 2014-11-24 15:29:19 +08:00
alan 526e9bc923 修改《IE登录不了》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-24 10:48:53 +08:00
alan 90e4387395 修复登录 
Signed-off-by: alan <547533434@qq.com>
 2014-11-24 09:08:49 +08:00
alan 949867c50b Signed-off-by: alan <547533434@qq.com> 2014-11-23 09:36:47 +08:00
alan 12de248e87 Signed-off-by: alan <547533434@qq.com> 2014-11-13 10:18:07 +08:00
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
 2014-11-08 16:40:36 +08:00
z9hang e297bb2687 修改匿评 2014-11-08 14:03:02 +08:00
z9hang cd1be67b8c 学生可多次评分、评分完毕不在提示评分成功 2014-11-08 13:43:07 +08:00
z9hang cc71682e40 评分前添加无法修改提示 2014-11-07 13:51:18 +08:00
alan 591fc409b3 修改bug<forge网站的项目缺陷的关联问题机制有问题> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-05 15:01:36 +08:00
sw e2897b3d1a 修改匿评弹出框样式 2014-11-03 18:45:53 +08:00
gonglexin 4f3b1a670d 去掉 titlebar 的颜色 2014-11-02 15:10:09 +08:00
z9hang 0723643ca6 #1410新建贴吧：输入贴吧描述为非汉字类型，编辑框不会自动换行 2014-10-28 16:49:05 +08:00
alan 66aa72d210 Signed-off-by: alan <547533434@qq.com> 2014-10-23 18:49:14 +08:00
z9hang 3d860af48b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/contest.html.erb
	app/views/welcome/index.html.erb
	public/javascripts/attachments.js
 2014-10-23 14:42:26 +08:00
z9hang 269e1cf497 1、空数据库情况下3个主页布局修改。2、上传附件成功提交后公开自动变成私有的bug 2014-10-23 14:36:10 +08:00
alan e044f5b615 修改contest中出现的逻辑错误 
Signed-off-by: alan <547533434@qq.com>
 2014-10-23 11:30:34 +08:00
gonglexin 6e0c916246 #1026 上传出现网络问题时给出提示 2014-10-20 22:50:49 +08:00
sw 1361801723 上传文件描述最长限定254个字符 2014-10-09 11:16:45 +08:00
linhk 879e93beb9 项目、竞赛、课程首页的微信部分样式修改并添加js跟随滚动处理 2014-09-15 16:04:06 +08:00
z9hang 38c5c86a39 日期选择器不能用问题 2014-08-23 10:58:07 +08:00
nwb 095cb7fc32 加强对chrome浏览器文件上传的支持 2014-07-22 15:02:58 +08:00
z9hang 6a45a0287d 添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因） 2014-07-15 16:13:50 +08:00
z9hang fcdfeae326 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-07-11 11:45:46 +08:00
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/repositories_controller.rb
	db/schema.rb
 2014-07-11 09:08:50 +08:00
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件 
2.资源文件添加文件密级设置
 2014-07-11 09:07:09 +08:00
z9hang 720c75478a 修正上传图片可传非图片文件bug 2014-07-10 10:15:20 +08:00
yanxd 2ff24841fd optimization image check. 2014-07-10 10:12:16 +08:00
yanxd 2b57e170ef want that image popup in html when user click on thumbnail. 2014-07-10 10:05:45 +08:00
yanxd 654cb404e2 bootstrap test 2014-05-26 11:27:10 +08:00
yanxd 7a4e5afba0 test 2014-05-24 12:12:38 +08:00
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
yanxd 34aa8433de import hubspot 2014-05-22 11:00:13 +08:00
xianbo 4b063a2c69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	db/schema.rb
 2014-05-21 11:09:22 +08:00
yanxd 112b8de921 issues#575 2014-05-20 09:50:28 +08:00
nwb 7df6be8ff4 调整资源文件界面 2014-05-17 14:07:57 +08:00
ganyiang 27ade53af3 针对OSP社区的新需求的界面展示： 
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示

ps.此次为不负责任的提交~
 2014-05-14 09:45:11 +08:00
ganyiang 5e780e6872 修复新建问题中autocomplete在Firefox下的不正常 2014-05-08 12:18:05 +08:00
ganyiang 786481e144 新建问题-主题-autocomplete-选中跳转 2014-05-07 20:30:42 +08:00
wanglinchun 0634f36c10 "打分后不要显示英文，而且还要提示：您可以重新打分"问题解决 2014-05-05 09:00:10 +08:00
yanxd 939e4cc100 footer 下方距离 
welcome调整下主页
 2014-04-26 09:03:25 +08:00
yanxd 60bc3bb1b2 seem_rateable to lib, using Engine setting routes 2014-04-23 08:51:46 +08:00
yanxd b4209b7cc5 jrating 2014-04-21 15:41:51 +08:00
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop 
Conflicts:
	Gemfile
	app/controllers/tags_controller.rb
	app/views/layouts/_base_header.html.erb
	config/routes.rb
	db/schema.rb
 2014-04-18 16:03:52 +08:00
wanglinchun 8f6d9fc6a5 0418 2014-04-18 10:46:29 +08:00
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload 2014-04-17 08:33:44 +08:00
yanxd 2a62bc822a 修改ajax提交过程中，等待indicator被覆盖的问题 2014-04-09 15:33:21 +08:00
yanxd 3fad5abb5c modal init 2014-04-08 16:56:53 +08:00
yanxd 84c5032eb2 整理下，加个推荐tag 2014-03-31 15:36:51 +08:00
yanxd 32510028aa 论坛留言里发帖的分界 2014-01-02 14:48:01 +08:00
yanxd 8a1316cf8f 删除留言操作 2013-12-26 19:28:18 +08:00
yanxd 7130347f39 回复框 设置姓名 七八糟 2013-12-26 10:52:16 +08:00
yanxd 60be338848 作业提交的部分问题 
禁止js的情况
修复一些路由错误
ie提交的问题.
 2013-12-19 15:59:10 +08:00
yanxd 5e9bb9a99f 删除提示框作业，作业提交的问题。附件提交之后还会存在。 2013-12-16 14:39:02 +08:00
yanxd 16c0bc3ac3 memo edit/destory. 2013-11-26 16:32:08 +08:00
william 2079c87362 增加tag删除。 2013-09-27 14:58:51 +08:00
baiyu d92755f805 修改需求列表 2013-08-21 09:46:22 +08:00
wanglinchun 9bb6f648e5 修改头像、logo上传进度条显示 2013-08-12 22:05:27 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00