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

267 Commits

Author SHA1 Message Date
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
guange 11c1bbb525 解决打包时文件过多插库错误 2015-04-15 11:24:15 +08:00
huang f528584345 添加迁移--项目类型默认值 2015-04-14 20:04:58 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
lizanle 590dd0cac5 删除这个demo的数据表创建脚本 2015-04-09 10:09: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
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +08:00
guange 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +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
lizanle f59e9a3f7e 添加owner_type字段 2015-03-26 16:13:19 +08:00
guange 15accd7d9f 下载功能优化, 功能已实现 2015-03-25 10:41:42 +08:00
lizanle bfc9cdb3a4 资源表 2015-03-17 10:08:55 +08:00
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	db/schema.rb
 2015-03-17 09:38:24 +08:00
lizanle a9cafb2241 新建DiscussDemo表 2015-03-16 15:25:22 +08:00
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +08:00
lizanle 437fc243ad 给每个项目添加一条初始创建信息，如果有menber，最早加进来的就算创始人,并给projects表的更新创建人 2015-03-11 15:47:10 +08:00
guange c893a2d99b 迁移优化，原来需要1800秒，现只需800秒 2015-03-09 16:25:41 +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
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
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
sw bcc8abdee9 1、增加组织相关数据表 
2、增加组织和项目的关联关系
 2015-03-05 09:27:13 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
sw 6645648027 学生是否看到问卷结果老师可配置增加数据库 2015-01-23 14:10:38 +08:00
alan 6ccb154cc3 课程留言，发邮件给课程所有人 
Signed-off-by: alan <547533434@qq.com>
 2015-01-21 11:33:29 +08:00
z9hang b6826a74d3 问卷显示 2015-01-14 11:50:59 +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 c0fa21eb9f 问卷调查表增加描述列 2015-01-12 16:07:15 +08:00
alan 9f807438d6 教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？ 
Signed-off-by: alan <547533434@qq.com>
 2015-01-12 14:58:11 +08:00
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构 
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
 2015-01-08 17:42:46 +08:00
sw c9de30bd83 增加问卷调查相关表，以及对应的model、control、view的文件夹 2015-01-08 12:00:43 +08:00
alan c1705bd65b 增加《导入student_for_course数据》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 17:02:55 +08:00
alan 486f0b69b1 数据迁移student_for_course的数据 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 10:23:21 +08:00
alan 23140307aa 实现<去存储过程功能，并修改打分的表更新> 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 08:48:14 +08:00
alan ed54248494 修改《查找学生信息》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-30 14:33:46 +08:00
alan 6a86e1c386 <分组点击两次>bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-30 14:00:48 +08:00
alan 4f5fe52485 基于苏稳添加的字段优化存储过程 
Signed-off-by: alan <547533434@qq.com>
 2014-12-30 09:21:56 +08:00
alan 5874450d14 修改《学生列表排序用的存储过程》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-29 22:20:21 +08:00
sw 05b9b26314 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-12-29 17:00:35 +08:00
alan fb398904b6 优化《学生列表》分页查询 
Signed-off-by: alan <547533434@qq.com>
 2014-12-29 16:57:31 +08:00
sw 0a58fce251 优化数据迁移效率 2014-12-29 11:53:26 +08:00
sw 259799eb89 1.增加评分的model 
2.修改评分表中为教师评分的历史数据的is_teacher_score的值
 2014-12-29 11:38:35 +08:00
sw fa36e6d2b0 增加判断评分是不是老师评分的列 2014-12-29 10:58:45 +08:00
alan b79b08fa8f 编写《作业查询存储过程》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-26 15:51:39 +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
sw 2dab864199 #1689修改部分学生匿评得分大于5分 2014-12-10 15:04:35 +08:00
alan 3d12d6f0e8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group 
Conflicts:
	db/schema.rb
 2014-12-03 19:20:25 +08:00
z9hang 29d4266c6c 引用次数的统计修改及按引用排序 2014-12-02 15:30:32 +08:00