Commit Graph

351 Commits

Author SHA1 Message Date
sw 4d43cd2765 点赞功能 2015-05-28 16:10:40 +08:00
sw fea784cbcc 1、添加评分回复路由改变
2、删除回复功能及界面刷新
2015-05-27 15:11:11 +08:00
sw a0324f5e39 增加评分回复,以及相关显示
评分回复真实信息显示
评分回复以及回复删除
2015-05-27 11:25:32 +08:00
sw c289af2e7c 评分 2015-05-23 11:24:24 +08:00
sw 7684a6b253 1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
2015-05-19 17:12:43 +08:00
guange 05428213a2 让session保持,防止长时间编辑时session丢失 2015-05-06 11:04:57 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +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
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
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
sw fadca9128f 完成项目朋友圈、开发组、科研组直接的切换功能 2015-04-14 10:17:42 +08:00
sw 988f8b7918 增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
2015-04-09 10:33:15 +08:00
lizanle 5299d2d332 删除demo代码 2015-04-03 15:13:51 +08:00
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +08:00
z9hang 5eac727584 项目资源模块功能完成(样式尚未调整,代码尚未应用) 2015-03-31 15:57:15 +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 2bb7153131 去掉作业打包下载功能 2015-03-26 14:17:26 +08:00
guange 15accd7d9f 下载功能优化, 功能已实现 2015-03-25 10:41:42 +08:00
guange e007920cb6 Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
	Gemfile
	app/views/attachments/_form.html.erb
2015-03-19 17:41:45 +08:00
guange 6c87cd40c1 加入git回调接口 2015-03-17 20:52:12 +08:00
lizanle 926283398b 路由修改 2015-03-17 09:41:30 +08:00
lizanle 6bafec03e9 添加路由 2015-03-16 15:25:41 +08:00
z9hang 0f2ded4d25 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 15:36:16 +08:00
z9hang 782071ab64 显示接口不能用问题,app版本管理部分代码 2015-03-07 15:36:00 +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
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
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 3b4bf8b99d 增加组织的index界面,以及index界面到组织首页的跳转 2015-03-05 14:15:07 +08:00
sw f380d781e7 增加根据已有课程复制成新课程的路由以及方法实现 2015-02-09 10:28:33 +08:00
z9hang 836be8c75e 添加企业首页配置功能 2015-01-31 17:14:01 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
huang 768e06ea8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 17:58:58 +08:00
huang be9ff9b4bb 修改控制器名
解决列表中企业重名的bug
2015-01-30 17:58:41 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
2015-01-30 16:05:36 +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
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
Conflicts:
	Gemfile
	config/routes.rb
2015-01-28 12:38:32 +08:00
sw 950d831108 Merge branch 'api' into szzh 2015-01-27 14:51:15 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api
Conflicts:
	Gemfile
	db/schema.rb
2015-01-23 16:51:40 +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 90a81ee1f1 增加网站项目首页加入项目的功能 2015-01-22 17:03:01 +08:00
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能 2015-01-21 17:51:12 +08:00
lizanle 6c0f47d96d 日志路由 2015-01-22 16:40:22 +08:00
sw 7b9d88ecfe 问卷调查增加重新发布功能 2015-01-20 11:42:28 +08:00