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

1057 Commits

Author SHA1 Message Date
huang 3f744d46f2 超级管理员界面--贴吧回复成功 2015-05-20 16:24:32 +08:00
sw a7fd5b950d 1、老师新建作业界面，数据i初始化 
2、部分help方法添加
 2015-05-20 15:05:35 +08:00
guange 9b0602fd9c 新增学生作业下载spec 2015-05-18 17:26:50 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
guange d2a7d41963 头像加入大小限制 2015-05-15 17:35:24 +08:00
huang 6c500109c9 修改项目上传资源 2015-05-13 10:06:04 +08:00
sw cfe3021391 用户收索国际化丢失 2015-05-08 09:16:11 +08:00
sw cba473269d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 09:31:22 +08:00
huang f08357d300 用户反馈添加提示：课程问题反馈给老师 2015-05-07 09:17:47 +08:00
sw cba760b8b0 课程、项目搜索提示 2015-05-06 15:01:26 +08:00
sw c0b7819870 修改资料时昵称提示以及样式 2015-05-06 14:20:55 +08:00
huang b39e00b5c7 项目讨论区--内容必填 
添加国际化
 2015-05-06 09:26:14 +08:00
huang 0b524b8a40 登录后主页只显示我的项目 
方法定义
功能实现
 2015-05-05 16:29:53 +08:00
huang 119e540373 邮件邀请系统已注册的用户 2015-04-30 11:08:36 +08:00
whimlex e30c446847 项目私有问题提示信息 2015-04-27 17:49:05 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +08:00
guange 3f9abf170e #2363 按天发送邮件相关标题修改 2015-04-23 17:43:10 +08:00
whimlex 15d7cde055 意见反馈 2015-04-23 16:57:18 +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
huang 49f33dd50c 类型bug修复 2015-04-22 10:50:12 +08:00
lizanle 0de5ddd14c 题型用户上传百度云 2015-04-22 10:33:09 +08:00
huang be5c7ac6dd 修改项目类型术语 
图标
 2015-04-22 10:24:15 +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
whimlex ab93d19b56 动态中显示更新项目缺陷样式异常 2015-04-21 16:17:51 +08:00
whimlex 84d7e63d54 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 15:11:15 +08:00
whimlex 6195f0a150 课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断 2015-04-21 15:10:45 +08:00
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +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
lizanle 54f8079ba6 去掉html符号 2015-04-17 14:34:57 +08:00
lizanle 3bba1f93b4 版本库名输入条件描述去掉换行符 2015-04-17 12:01:31 +08:00
sw 9f862ad7a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-17 11:11:03 +08:00
sw a8b1ca10b3 1、学生作业 --> 作品 
2、学生交了作品之后显示修改作品
 2015-04-17 10:36:32 +08:00
huang d1e7777040 关注列表样式 2015-04-16 20:00:07 +08:00
huang 440eb8dc7f 1、修改项目成员一排显示 
2、项目动态显示强制换行
3、讨论区提示用语
 2015-04-16 19:08:16 +08:00
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +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
huang 104075b3fd 修改缺陷留言方式 2015-04-15 16:38:39 +08:00
sw 676cf8f180 课程上传资源是根据上传的类型，对资源添加默认的TAG 2015-04-15 16:00:45 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
huang 5ae5cfda03 项目配置添加申请加入 
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
 2015-04-14 15:34:04 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
huang 78868b34f0 修改缺陷中四中颜色按钮会折断换行的bug 
区别新闻和通知
 2015-04-11 15:12:06 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
whimlex 5936d8d8e9 评论显示 2015-04-11 11:52:11 +08:00
whimlex 6ff1a7d692 问题顶和踩国际化 2015-04-11 11:03:36 +08:00
huang 33abbaffe1 修改isuue显示界面 
附件显示形式
国际化
部分样式调整
 2015-04-10 17:49:16 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
whimlex 1fae44b201 用户主页国际化修改 2015-04-10 13:21:36 +08:00
whimlex 2a35e771c2 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
whimlex 9ef212b6d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-09 20:47:08 +08:00
whimlex bcf83328f2 项目界面国际化 2015-04-09 20:46:48 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
sw 7303253c07 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-09 16:04:15 +08:00
sw 988f8b7918 增加隐藏非项目信息按钮以及路由 
实现点击按钮事数据的存储与修改
修改配置文件
 2015-04-09 10:33:15 +08:00
huang 4d4e1cac8b 完成新的邮件邀请界面 2015-04-09 10:25:46 +08:00
lizanle 13273cecf1 app的创建动态描述 2015-04-09 10:08:47 +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 a1a761266b Merge branch 'szzh' into guange_dev 2015-04-03 11:38:27 +08:00
whimlex 2ef224556e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-03 11:31:08 +08:00
whimlex aa64b47d74 资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整 2015-04-03 11:30:48 +08:00
guange 618e8c017c Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	db/schema.rb
 2015-04-01 11:16:57 +08:00
z9hang 5eac727584 项目资源模块功能完成（样式尚未调整，代码尚未应用） 2015-03-31 15:57:15 +08:00
z9hang eabcd4e92b 项目资源模块新界面（列表显示，排序等功能，样式尚未调） 2015-03-30 17:14:52 +08:00
guange c1ed8bd36d #2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报 2015-03-29 12:33:33 +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 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
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 090190f3e6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 11:56:13 +08:00
sw ab7d12e514 1、修改、删除分班是js方法重构 
2、验证分班名是否重复重构
 2015-03-26 11:30:00 +08:00
whimlex 4de0255ce6 邀请邮件国际化；js冲突 2015-03-26 10:45:14 +08:00
z9hang 30cb622abd 评论显示页面修改 2015-03-25 20:36:49 +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
guange 15accd7d9f 下载功能优化, 功能已实现 2015-03-25 10:41:42 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +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
sw 5139ac30dc 修改老师新建作业界面 2015-03-23 17:18:58 +08:00
z9hang aaf14d5d1a 修改课程通知页面 2015-03-23 16:53:04 +08:00
huang a17458f132 1、户登录名可以在“修改信息”中修改 
2、缺陷统计国家化及显示样式调整。
 2015-03-23 14:11:57 +08:00
sw 36bd04cc7a 国际化课程作业列表 2015-03-23 14:09:41 +08:00
huang 1e1ee9a248 修改邮箱匹配错误后提示语 2015-03-21 13:54:16 +08:00
huang fd9eaa93d6 关注添加+号；去掉css文件中多余符号引起的样式问题 2015-03-20 17:43:57 +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 5278d4dd2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 11:37:22 +08:00
z9hang 4ca5687b3b #2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好 2015-03-20 11:37:09 +08:00
whimlex 3837e1fcf5 申请加入：附件上传 2015-03-20 11:34:59 +08:00
whimlex 45475c3612 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-19 17:28:38 +08:00
whimlex 6995ead66c 项目ID 2015-03-19 17:28:12 +08:00
dingxu f4dff55377 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-19 17:24:14 +08:00
dingxu 073cb07f70 邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、 
展开条样式修改
 2015-03-19 17:23:53 +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
z9hang 2a3a70b7d5 app接口部分信息国际化 2015-03-19 14:41:31 +08:00
whimlex 7e8ee49298 资源库国际化 2015-03-18 18:02:54 +08:00
sw 423849ca84 加入课程、退出课程、配置、关闭、复制等按钮 2015-03-18 17:14:26 +08:00
sw 64b0646281 base_course基本完成 2015-03-18 15:18:06 +08:00
whimlex cfaf788e37 新版项目成员，关注者，资源库国际化；修改国际化缺失的bug 2015-03-17 18:04:35 +08:00
sw 4d60a6dabc 1、修改版权 
2、增加footer
 2015-03-17 17:04:18 +08:00
whimlex e8da6ef871 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-17 15:07:51 +08:00
whimlex 50fe8f2bb7 项目配置模块 2015-03-17 15:06:15 +08:00
sw 3b0a229c43 1.修改意见反馈框默认关闭 
2、FIle--->资源库
 2015-03-13 18:01:16 +08:00
whimlex aee987d634 邀请Trustie用户 2015-03-13 17:47:58 +08:00
huang 1ed542af09 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-13 15:40:06 +08:00
huang a010c800d6 修改权限库为空情况下403问题 
修改项目标题样式
确认发送国际化
添加小图标
 2015-03-13 15:37:54 +08:00
whimlex be75bcef47 项目得分国际化 2015-03-13 11:51:53 +08:00
whimlex baa854c5a9 公共标签 2015-03-13 10:26:10 +08:00
whimlex cef923b8a8 邮件邀请用户国际化 2015-03-13 09:46:05 +08:00
whimlex 18422ecf6a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-12 17:50:15 +08:00
whimlex 1e5fac32b4 添加邮箱验证 2015-03-12 17:48:31 +08:00
sw 3fd94ce243 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-12 17:19:03 +08:00
sw 362bad594f 修改项目发送邮件邀请页面样式，以及提示 2015-03-12 17:18:18 +08:00
whimlex 3a1f0aec55 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 17:14:12 +08:00
whimlex 5f88ffc5d0 项目邀请用户国际化，js判断邮件格式 2015-03-12 17:13:46 +08:00
sw 971c278de5 #2026 作业创建时间->截至时间 2015-03-12 17:02:47 +08:00
sw d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 16:32:31 +08:00
sw 312d7660b2 增加邀请成功后的提示 
邀请成功后跳转页面修改
调整翻页控件的样式
 2015-03-12 16:32:20 +08:00
whimlex e952490fa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-12 15:25:45 +08:00
whimlex 458fa5b977 完善代码审查插件、账户、项目部分模块国际化 2015-03-12 15:25:27 +08:00
huang 0ba7ef0560 修改邮箱邀请时，邮件为空时提示错误 2015-03-12 15:13:41 +08:00
sw 1e23007e5d 资源库中文丢失 2015-03-12 13:58:50 +08:00
whimlex 65ee3fdc74 项目主页国际化，项目主页JS冲突解决 2015-03-12 09:47: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
sw 9e896118e9 项目模块配置：作品下载->资源库 2015-03-11 15:16:20 +08:00
sw 0525b03e65 zh.yml删除重复的 2015-03-11 14:50:06 +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
sw b0eba062a8 修复项目、课程留言不正确的BUG 2015-03-11 11:20:43 +08:00
sw d177f1ae89 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 10:16:23 +08:00
whimlex 5732f0ed03 国际化问题修改，新添加en.yml存在中文字符，格式问题 2015-03-11 10:10:54 +08:00
sw 284625de8f 国际化文件错误修改 2015-03-11 10:07:14 +08:00
sw c2f494911d 修改en.yml不正确 2015-03-11 09:33:36 +08:00
z9hang 43e9a9a495 1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成 2015-03-10 17:20:30 +08:00
z9hang 803f4a3eaf 1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加 2015-03-10 14:41:36 +08:00
z9hang 08f625446e app版本管理功能新建版本界面 2015-03-10 10:18:56 +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 61167e55c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 17:37:49 +08:00
sw 81b58e5c87 修改base_project中代码错误 2015-03-09 15:32:55 +08:00
z9hang d634532789 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/en.yml
	config/locales/zh.yml
 2015-03-09 15:26:02 +08:00
z9hang d96b87cf42 修改用户课程动态接口返回数据 2015-03-09 15:23:24 +08:00
sw 8c44d25750 处理资源标签搜索中标签丢失的问题 2015-03-09 10:27:32 +08:00
sw 659a87ef60 修复部分本地化标签丢失 2015-03-09 09:11:57 +08:00
sw 3cac4336cd 修改课程、项目、竞赛首页搜索懒为英文 2015-03-07 17:15:01 +08:00
alan 838c39da69 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/projects/_invite_members_by_mail.html.erb
 2015-03-07 16:08:54 +08:00
alan 48ac3dbea8 修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 16:07:48 +08:00
huang ba09213023 添加新闻模块、部分样式 2015-03-07 15:32:50 +08:00
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
 2015-03-06 15:36:47 +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 26081c6120 新建项目时增加不选择所属组织 2015-03-06 09:27:43 +08:00
sw e2307366f6 实现组织的增、删、改、查功能及相关界面 2015-03-05 17:42:31 +08:00
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
sw 3c4b502e97 1、修改进入组织主页项目列表显示不正确的问题 
2、admin页面增加组织列表显示
 2015-03-05 17:03:44 +08:00
sw 5f8595d874 admin页面增加组织列表 2015-03-05 15:27:22 +08:00
sw dead08a0d6 添加、修改项目增加所属组织的选择 2015-03-05 11:53:28 +08:00
sw 33e9a3e326 #1958 关注有用户0个后边取消冒号 2015-03-04 10:02:40 +08:00
alan 22ac578ede Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-02 14:50:10 +08:00
alan aa8f58530c 给黄总提供接口 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 23:34:10 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能，修改《贴吧》邮件发送策略 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 20:23:50 +08:00
sw 5ef1bc1d02 修改本地登录后报错 
修改zh.yml文件异常
 2015-02-10 10:21:46 +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
alan 7442cc1ca4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify 2015-02-06 18:19:35 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
sw 95b757ba09 修改问卷发布成功和取消发布成功后弹框提示样式 2015-02-06 09:32:32 +08:00
huang 59e7f2f28b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-02-03 15:23:05 +08:00
huang 8bef9420cf 修改企业版中自己能看到自己的私有项目 2015-02-03 15:22:45 +08:00
sw 96f538c76b #1917邮件通知设置中将“收取选中项目的所有通知...”后的省略号去掉 2015-02-02 16:42:51 +08:00
sw bb79aac700 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 17:20:11 +08:00
sw ab18dfcaa8 School => 中国高校 2015-01-31 17:19:13 +08:00
whimlex 8f19467115 英文国际化 2015-01-31 17:18:07 +08:00
z9hang 836be8c75e 添加企业首页配置功能 2015-01-31 17:14:01 +08:00
alan 1010003737 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:55:17 +08:00
alan 134f0d5557 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:49:00 +08:00
huang 3350bb98b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:46:30 +08:00
alan 9e36f9264c 修改《竞赛作业评分》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-31 15:46:10 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
whimlex c413ce1405 项目企业模块国际化修改 2015-01-31 14:44:16 +08:00
whimlex 57237c76d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 10:55:08 +08:00
whimlex 3e1d90630e 找回密码，邮件激活国际化 2015-01-31 10:48:09 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 16:05:36 +08:00
huang 864ed349e4 国际化 2015-01-30 14:48:24 +08:00
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
	config/routes.rb
 2015-01-30 14:27:56 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +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
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正 2015-01-26 17:37:05 +08:00
whimlex 38157e560e 课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛 2015-01-23 15:08:34 +08:00
whimlex 2be757a3d5 翻译缺失完善 2015-01-23 14:19:43 +08:00
whimlex 9886a3212c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 14:15:39 +08:00
whimlex 15a8bddfe6 缺失翻译 2015-01-23 14:02:00 +08:00
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
 2015-01-23 13:49:13 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +08:00
lizanle 69ced4b14b 添加国际化内容 2015-01-23 11:08:58 +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 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 90a81ee1f1 增加网站项目首页加入项目的功能 2015-01-22 17:03:01 +08:00
alan 24dfeb1614 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-22 16:32:53 +08:00
alan 432e3a05f2 增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 16:30:21 +08:00
whimlex 0c0160ac2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-21 18:13:47 +08:00
whimlex 3279928bef 邮件样式调整，国际化；用户资料页面调整 2015-01-21 18:12:04 +08:00
lizanle 4d20c8080f 修改国际化文件名字 2015-01-22 17:22:44 +08:00
lizanle 458749b921 添加了国际化代码 2015-01-22 16:46:29 +08:00
alan 9f36469d39 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-20 16:34:30 +08:00
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +08:00
sw e493ae22cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-19 17:08:47 +08:00
sw 14a1f31a12 1、项目动态 -> 近期动态 
2、修复新建修改课程时，描述会有一行空白行
 2015-01-19 16:43:21 +08:00
z9hang 493b7ca695 #1821 课程--作业：导出excel相关问题 调整样式 2015-01-19 16:05:18 +08:00
huang 6bba6b2b76 weiwan 2015-01-17 14:04:20 +08:00
huang 0f5c3c5f4c 添加主观题统计页面及样式 2015-01-17 11:46:34 +08:00
sw f99d159ca1 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 17:34:52 +08:00
sw d16d5fd362 单行文字/多行文字 --> 单行主观/多行主观 2015-01-16 17:31:04 +08:00
z9hang bbf4c4629b 问卷show页面国际化 2015-01-16 16:13:03 +08:00
huang 7177303eeb 问卷统计最终效果 2015-01-16 15:49:22 +08:00
sw 20c160f03f 1、修改标题头、取消修改标题头数据的保存和页面的变更 2015-01-15 10:50:08 +08:00
sw 0433f7c87f 增加新建单选题功能 2015-01-14 15:35:04 +08:00
sw 311d90d565 1.增加点击单选、多选、单行文本、多行文本的js 
2.分割问卷标题头
3.增加新增问题的路由及action
 2015-01-13 20:13:50 +08:00
sw d0dc01b992 增加问卷修改功能，以及相关js 2015-01-12 17:55:22 +08:00
sw 450c4b203d 增加新建问卷按钮功能 2015-01-12 17:30:33 +08:00
sw d2dfff33d0 课程页面增加问卷调查的链接 2015-01-12 17:01:39 +08:00
sw 475b046898 修改访问poll#index报ArgumentError 2015-01-12 16:56:53 +08:00
sw bf7eaa7a80 修复同一个学生提交相同的文件后，打包下载异常的BUG 2015-01-10 17:41:50 +08:00
sw 41679a8d5c 修改文件缺少时的提示 2015-01-10 16:20:36 +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
zhuhao 92cf3d86cc Merge branch 'develop' into szzh 2015-01-09 16:05:38 +08:00
sw a30cc9bea8 修改文件缺少时的提示 2015-01-09 16:01:47 +08:00
sw 9ef3849fe3 如果缺少某一附件。在下载后的文件增加相关说明文档 2015-01-09 15:59:42 +08:00
sw 805de7fc28 修改课程首页课程列表显示策略 2015-01-04 13:28:33 +08:00
z9hang 4b923ed483 修改导出作品列表的名称 2014-12-31 09:48:17 +08:00
z9hang d3f9f23465 修改课程列表导出的文件名 2014-12-31 09:05:21 +08:00
z9hang 35dce16924 课程成员列表excel导出 2014-12-30 17:49:48 +08:00
z9hang 899ac6f654 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
sw 734216bbcd "截止了，可补交”改为“已截止，但可补交” 2014-12-24 09:48:09 +08:00
alan 6c09228139 根据凌彬设计修改学生列表样式 
Signed-off-by: alan <547533434@qq.com>
 2014-12-22 15:48:35 +08:00
alan 815d2ceb3d 添加《添加相同组时应该给出相关提示信息》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-19 23:12:32 +08:00