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

311 Commits

Author SHA1 Message Date
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
lizanle 027f6592ef 日志查看路由 2015-01-19 14:07:27 +08:00
sw 79ad33a90f 增加发布问卷的路由 2015-01-16 15:57:49 +08:00
sw c4bedfb369 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 
Conflicts:
	app/controllers/poll_controller.rb
 2015-01-15 18:22:05 +08:00
sw d55492b07a 增加修改单选题的路由、action、以及js 2015-01-15 18:17:45 +08:00
z9hang 77dc9607df 简答题答题 2015-01-15 17:36:30 +08:00
sw 3fab26214f 删除单选题后页面数据的删除，增加删除题目的路由及相关方法 2015-01-15 17:15:29 +08:00
sw a99d7c5145 1、分离出新建问卷问题页面 
2、增加修改问题相关路由及action
 2015-01-15 14:40:17 +08:00
z9hang 8dab2057a9 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 
Conflicts:
	config/routes.rb
 2015-01-15 09:42:41 +08:00
z9hang 6d82e79e7f 答题相关方法添加 2015-01-15 09:41:19 +08:00
sw eb2498c62c 1.增加新增单选题、新增选项、删除选项等js 
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
 2015-01-14 14:23:41 +08:00
sw 311d90d565 1.增加点击单选、多选、单行文本、多行文本的js 
2.分割问卷标题头
3.增加新增问题的路由及action
 2015-01-13 20:13:50 +08:00
sw fc72d6f9a9 1.增加问卷统计、问卷答卷等页面跳转，并增加对应路由 
2.调整页面样式
3.动态分页
 2015-01-13 15:59:02 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
 2015-01-13 15:12:05 +08:00
sw d0a6fa64e5 修改路由 2015-01-12 16:27:47 +08:00
sw c964194d85 增加问卷调查相关的路由、action、以及部分对应的页面 2015-01-12 16:02:15 +08:00
huang f7c1b76b3d 用户反馈弹框模块！ 2015-01-10 15:39:02 +08:00
z9hang 35dce16924 课程成员列表excel导出 2014-12-30 17:49:48 +08:00
alan 815d2ceb3d 添加《添加相同组时应该给出相关提示信息》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-19 23:12:32 +08:00
alan f9a86356ad 添加《重新发送激活邮件》功能to注册模块 
Signed-off-by: alan <547533434@qq.com>
 2014-12-19 10:51:53 +08:00
alan 1965b75d92 添加《学生列表按作业评分排序》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-18 18:24:37 +08:00
alan 7c1b86556d 增加《作业评分弹窗》《学生列表增加作业评分》两项功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-17 17:36:12 +08:00
= bb23468c7d Merge branch 'szzh' into api 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/courses_controller.rb
	db/schema.rb
 2014-12-17 16:41:28 +08:00
alan 5c33c578bb 增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-08 16:50:20 +08:00
alan c9b84d0a35 增加《学生加入，退出分组》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-04 22:02:10 +08:00
alan 9765f11f7e 增加<修改，添加分组>功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-04 19:09:10 +08:00
alan 615bc7d444 增加课程分组的功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-03 19:17:10 +08:00
www 53ecf8718f [api]用户认证完成 2014-11-27 19:43:04 +08:00
z9hang 68505239f9 课程资源搜索功能，暂时屏蔽排序功能 2014-11-21 11:38:53 +08:00
z9hang f2da5704ef 课程应用的功能实现 2014-11-20 17:44:30 +08:00
z9hang eeda25add1 设置资源公开与私有功能 2014-11-19 11:03:23 +08:00
z9hang 0821320dfe tag删除功能完成，翻页样式修改 2014-11-19 10:07:49 +08:00
z9hang a7a6fbcd22 课程资源界面修改 2014-11-18 18:02:01 +08:00
alan ad6b32ff50 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-11-11 17:01:29 +08:00
alan 2cea3178d6 添加邮箱验证功能 
Signed-off-by: alan <547533434@qq.com>
 2014-11-11 17:01: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
sw be500eb0d2 增加开启匿评关闭匿评弹出框动态显示 2014-11-07 10:02:13 +08:00
alan 591fc409b3 修改bug<forge网站的项目缺陷的关联问题机制有问题> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-05 15:01:36 +08:00
alan 495c4db43e 增加功能<增加学生列表是否公开功能> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-03 17:00:01 +08:00
alan 8cec84dca7 添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-03 15:16:56 +08:00
gonglexin e8e7708d6e 作业匿评功能 2014-11-02 14:38:43 +08:00