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

1135 Commits

Author SHA1 Message Date
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-18 09:17:18 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
huang 721a007779 删除 由于course、project一张表而引起的历史数据异常问题 2015-12-17 13:22:41 +08:00
lizanle 71f6a637e0 帖子按时间倒排 2015-12-16 17:26:19 +08:00
guange c0de5d55de 加入了issue的at消息提醒 2015-12-16 16:37:00 +08:00
cxt 5cf88a287b 分组作业提示语的修改 2015-12-16 11:37:59 +08:00
huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb

解决冲突
 2015-12-16 10:02:08 +08:00
huang 06e5784436 解决英雄榜两个用户同时存在的but 2015-12-16 10:00:10 +08:00
cxt 481b7b96eb 正式版报500 2015-12-15 20:15:10 +08:00
cxt 699d0e22dd 删除多余学生的测验数据 2015-12-15 19:05:19 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目，增加搜索功能 2015-12-14 10:26:34 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang fbba933a46 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-10 16:09:42 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq 2015-12-10 10:55:59 +08:00
lizanle 433059e1bc schema 2015-12-10 10:12:54 +08:00
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段； 
2.在组织配置-》栏目，增加栏目类型。
 2015-12-09 17:24:59 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 17:13:50 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
houxiang 56cb83ffba 版本库首页没有统计commit_count，具体的详情页在开始统计 2015-12-08 15:56:31 +08:00
huang 42f5b86d95 添加字段删除课程 2015-12-08 10:32:10 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
lizanle 0a5a33c2de schema 2015-12-04 16:36:03 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-04 15:54:18 +08:00
huang c1747ab217 fork重名，提交 2015-12-04 15:49:05 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
 2015-12-04 09:12:24 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
cxt fee438cc0b Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-30 16:27:39 +08:00
cxt ebeaac5798 作业匿评的结束状态未更新 2015-11-30 16:27:26 +08:00
ouyangxuhua 6f9c89d67b 1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能； 
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
 2015-11-30 16:04:43 +08:00
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
合并
 2015-11-30 14:35:37 +08:00
huang 39b87aaaac 为student_work表添加索引 
为homework_comments添加索引
大幅提高查询速度
 2015-11-30 13:09:13 +08:00
lizanle d266237590 kaminari分页添加上一页下一页 2015-11-30 11:08:08 +08:00
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
	kaminari分页添加上一页下一页
 2015-11-30 11:07:53 +08:00
lizanle 885215fb8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-30 10:45:50 +08:00
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:19 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00
lizanle 487c6bad09 schema.rb 2015-11-27 18:08:38 +08:00
huang f91918145d 0 2015-11-27 18:00:26 +08:00
huang 634e11d0ec 0 2015-11-27 17:15:51 +08:00
huang b130b52a23 修改迁移 2015-11-27 16:55:45 +08:00
Tim 580cc6b8d8 系统自动生成文件 2015-11-27 16:14:42 +08:00
huang 501a8f905b Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/courses.css
 2015-11-27 14:56:30 +08:00
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-11-27 14:49:49 +08:00
huang 2ec78d07fa Merge branch 'szzh' into hjq_new_course 2015-11-27 14:47:16 +08:00
ouyangxuhua e0f4050779 1.修改组织中关联项目和课程的内容和样式 2015-11-27 12:34:02 +08:00
huang 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
houxiang c6b5abba4e hide the the count of project'repo 2015-11-27 10:10:59 +08:00
huang 8c83bbfff3 课程英雄榜数据 2015-11-27 00:48:08 +08:00
huang aca7684414 课程英雄榜 
各模块动作 触发加分
 2015-11-26 18:22:03 +08:00
cxt cc0ff6bbc0 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-26 17:22:46 +08:00
cxt c9f844b9ba Merge branch 'sw_new_course' into develop 2015-11-26 17:22:26 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
huang c8b1cae947 建立贡献榜表及相关关联 
部分页面
按总分排序（英雄榜）
部分页面（未完成）
 2015-11-25 15:16:33 +08:00
Tim d1f16a0851 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	db/schema.rb
 2015-11-25 10:15:12 +08:00
Tim ec42cd2d7f 系统自动生成文件 2015-11-25 10:12:20 +08:00
ouyangxuhua ccfbc1e0bd 1.组织翻页增加type参数； 
2.删除组织表中冗余的项目动态和课程动态。
 2015-11-24 12:50:43 +08:00
cxt 9b033c3adf 数据日志 2015-11-24 10:08:51 +08:00
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
	db/schema.rb
处理冲突
 2015-11-24 09:55:26 +08:00
huang a174cade83 commit by hx , 2015/11/13 2015-11-23 20:35:37 +08:00
cxt f262a7cc13 cffd 2015-11-20 22:05:31 +08:00
huang fd03e62957 添加字段迁移 2015-11-20 22:04:07 +08:00
huang 1df8c94b98 解决字符过长不能保存成功的问题 2015-11-20 21:49:36 +08:00
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course 
Conflicts:
	db/schema.rb
 2015-11-20 20:25:17 +08:00
ouyangxuhua 5ac65d86b1 将org_document_comment中的title改成text类型 2015-11-20 19:58:25 +08:00
Tim e3d78bf4f0 组织样式更改 2015-11-20 14:30:54 +08:00
cxt 99945d5bb5 学生答题界面的修改 2015-11-20 12:54:41 +08:00
huang 3deebf2006 show 2015-11-20 11:08:47 +08:00
ouyangxuhua 4d4b163f17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-20 09:27:15 +08:00
ouyangxuhua d71d9730bd 修改迁移文件的bug 2015-11-20 09:26:58 +08:00
huang 7dc16775dc 添加字段迁移 2015-11-19 20:44:01 +08:00
lizanle dffabce806 Merge branch 'dev_zanle' into szzh 
Conflicts:
	db/schema.rb
 2015-11-19 15:03:56 +08:00
lizanle 56e96a035b schema.rb 2015-11-19 15:01:03 +08:00
houxiang 4a9da97f9b modify by hx add commit_count_detail_show 2015-11-18 16:23:02 +08:00
cxt 249b15751d 新建多选题 2015-11-18 14:05:29 +08:00
ouyangxuhua f6251b758b 1.迁移课程动态数据至组织动态 
2.“项目动态迁移至组织动态”迁移文件增加事物
 2015-11-18 12:55:18 +08:00
huang 282c7f5bd2 修改添加题目相关 2015-11-18 10:46:56 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表，建立相应模型及控制器； 
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
 2015-11-17 17:34:50 +08:00
lizanle 291868ba43 Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
 2015-11-17 16:48:03 +08:00
lizanle 0eff2bcb74 课程添加允许学生发布资源的配置 2015-11-17 16:43:50 +08:00
huang 23ca20692f 问卷部分方法 2015-11-17 15:20:59 +08:00
cxt 167d001b3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 09:34:09 +08:00
cxt 5400b907e6 学生测验列表 2015-11-17 09:33:40 +08:00
ouyangxuhua 687c0c8306 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/org_document_comments/edit.html.erb
 2015-11-16 15:50:46 +08:00
ouyangxuhua d220dbbc9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-16 15:45:18 +08:00
ouyangxuhua 10dedcb7be 增加组织成员加入时间 2015-11-16 15:39:59 +08:00
ouyangxuhua de32745eef 1.将项目动态数据迁移至组织动态； 
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
 2015-11-16 15:02:57 +08:00
cxt 10ac8eaa35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 10:58:08 +08:00
houxiang 9350841d50 change by hx 2015-11-16 10:44:36 +08:00
cxt 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 08:59:54 +08:00
cxt 24e9f5e7d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-11-16 08:53:15 +08:00
cxt a50ec626cd 数据 2015-11-16 08:52:32 +08:00
lizanle b88d5e59a1 回复的时候会多出一条一模一样的内容 2015-11-14 09:44:53 +08:00
cxt ee8d9d7b4e 提交 2015-11-13 17:47:29 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
ouyangxuhua 71e6a8b135 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-13 17:21:44 +08:00
sw 466f3c4cc3 数据库修改以及一对一，一对多，多对多等关系的确立 2015-11-13 15:47:39 +08:00
sw bbf087fa67 数据库的修改以及model数据关系的确定 2015-11-13 14:40:14 +08:00
sw 5a153637b7 增加在线测试迁移问卷 2015-11-13 11:43:44 +08:00
lizanle b24fadea05 设置 删除 编辑按钮做成项目一样的 2015-11-12 19:15:35 +08:00
cxt ab868d7b65 课程通知增加置顶 2015-11-12 16:52:42 +08:00
ouyangxuhua a3443ba968 组织模块功能实现 2015-11-12 09:32:00 +08:00
cxt 2a82f33227 个人首页的留言动态显示不合理 2015-11-09 16:08:15 +08:00
lizanle 8e66bb8fe1 在课程 项目 上传资源后跳转到对应的资源库界面 2015-11-09 10:07:12 +08:00
ouyangxuhua 283af137c6 组织模块动态及配置 2015-11-05 17:57:07 +08:00
Tim 223b17d8fe 普通作品列表、系统评分作品列表、匿评作品列表格式修改 2015-11-05 14:45:22 +08:00
huang 4608190529 增加点击选择历史版本记录 2015-11-05 14:31:43 +08:00
cxt 958532bedc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 11:16:25 +08:00
cxt ee7b21de72 禁用匿评功能 2015-11-04 10:54:09 +08:00
ouyangxuhua eadab840b6 建立组织、成员表及模型控制器； 
编写创建组织页面。
 2015-11-03 11:19:38 +08:00
ouyangxuhua 636063c6ca 添加组织表和组织成员表 2015-11-02 17:22:09 +08:00
cxt 3bb56f1606 教辅可查看未发布的作业 2015-10-30 17:24:09 +08:00
cxt f5aaf7ac58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-10-30 13:59:33 +08:00
cxt 6dcc97d5d1 添加作业的发布功能 2015-10-30 13:58:54 +08:00
lizanle c2be8b4eec 课程大纲界面 2015-10-28 15:54:27 +08:00
Tim 61dc979ee4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-10-28 14:53:39 +08:00
Tim e58dcc851b 资源库搜索图标替换 2015-10-28 14:34:39 +08:00
huang 294a517251 查看所有提交记录入口 
点击自动复制版本库地址
 2015-10-27 15:27:12 +08:00
huang 4c61e7490b Merge branch 'develop' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-27 14:42:05 +08:00
lizanle 2a76461cd1 简单博客功能 2015-10-24 15:34:43 +08:00
huang 1157dcaa06 版本库summary 
文件目录
新版本库地址
按分支显示提交记录
相关界面
 2015-10-22 13:44:35 +08:00
huang 147cdf3018 Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-20 14:26:21 +08:00
cxt d049a00655 删除课程动态中未发布问卷的动态 2015-10-20 10:28:16 +08:00
cxt 90ee4bbe60 删除空的课程动态 2015-10-20 09:55:51 +08:00
cxt dbbdae1be2 附件迁移文件的修改 2015-10-20 09:24:50 +08:00
cxt 0b565b1be0 私有课程的课件迁移 2015-10-19 17:34:59 +08:00
guange 6086c9304e merge 2015-10-16 17:00:46 +08:00
guange 9e8e77f3e1 方法重构 2015-10-16 16:57:45 +08:00
cxt 5f3c8d928d 作业批次下拉列表的样式修改 2015-10-16 14:51:30 +08:00
huang 150ee3d28d Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-16 09:07:38 +08:00
cxt caa278d9f5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/boards_controller.rb
	db/schema.rb
 2015-10-15 16:22:49 +08:00
lizanle b3d15b886a 学校的查询与现实问题重做 2015-10-15 12:04:55 +08:00
guange 9266eccdff Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-10-14 17:28:11 +08:00
guange 716f0f31b3 merge 2015-10-14 17:26:51 +08:00
cxt ea66ca5e00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
	public/javascripts/init_activity_KindEditor.js
 2015-10-14 11:41:30 +08:00
cxt 8abc97ae84 个人主页添加个人留言动态 2015-10-14 11:38:16 +08:00
guange 6472367b68 firefox粘贴图片只能一张的bug 2015-10-13 21:47:55 +08:00
cxt b9b7f6fa9e 个人主页留言动态的实现 2015-10-13 16:51:44 +08:00
huang 73898953d9 project表添加字段，记录project对应gitlba中project id 2015-10-13 10:58:22 +08:00
huang fbeb6585d2 去掉初始化输出提示 2015-10-10 16:18:05 +08:00
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange 
Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	lib/trustie.rb

解决冲突
 2015-10-10 16:09:05 +08:00
lizanle d8a4e4d710 issue序号丢失的问题 
issue缩进以及代码缩进的样式不同 的问题
 2015-10-08 11:33:52 +08:00
sw 11736eb266 迁移文件有问题 2015-09-30 10:16:55 +08:00
cxt 452766bade 课程通知的动态排序时间调整 2015-09-30 09:58:29 +08:00
sw 774b00f2d4 数据迁移错误 2015-09-29 11:19:53 +08:00
huang 5f26e331c6 缺陷截止时间到了消息通知 2015-09-28 17:31:55 +08:00
cxt a2d6168043 课程动态的数据迁移 2015-09-28 10:51:44 +08:00
cxt 6a3089bb9b 动态的回复图片超出边框 2015-09-28 10:51:24 +08:00
cxt c81e07d588 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-25 16:32:25 +08:00
cxt 223bac373f 课程动态的数据迁移 2015-09-25 16:29:47 +08:00
guange 08eecbd5ec merge 2015-09-25 09:30:32 +08:00
huang 25a604d7b8 issue解决冲突 2015-09-24 16:59:19 +08:00
huang 38ba47f8c8 讨论区结构修改 
任务中添加：自动开启/关闭匿评消息通知
匿评开启失败消息通知
 2015-09-24 16:16:37 +08:00
guange 0b4c8b05f1 JAVA语言支持 2015-09-24 15:09:15 +08:00
sw f2325dee88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:21:54 +08:00
cxt a37f39558d 项目和课程的列表符号样式修改 2015-09-22 15:54:50 +08:00
sw 7a62b7f13d 增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改 2015-09-21 17:11:45 +08:00
sw 385f2aa4ac 111 2015-09-19 15:23:01 +08:00
sw a54a51c984 Merge branch 'guange_homework' into szzh 
Conflicts:
	app/models/homework_detail_programing.rb
	db/schema.rb
 2015-09-19 11:21:45 +08:00
sw 07dbb9da4c 111 2015-09-19 11:18:30 +08:00
huang c9bedb2362 Merge branch 'szzh' into dev_hjq 2015-09-19 11:01:48 +08:00
huang 961b2bd564 开启/关闭匿评邮件通知 2015-09-19 10:54:50 +08:00
guange c99222820e 加入了python语言支持 2015-09-19 10:39:10 +08:00
huang fb76bc8f9a 完成项目邀请消息通知及对应页面 
解决防注入问题（通过随机6为密码）
 2015-09-18 23:18:15 +08:00
sw 34db84e79f test 2015-09-18 20:27:13 +08:00
sw 715dc28187 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 17:51:11 +08:00
huang ba2474e480 关闭匿评消息 2015-09-18 17:38:19 +08:00
sw 20b4c056a8 历史数据：普通作业改为匿评作业 2015-09-18 16:19:30 +08:00
huang f041c80d0a Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css

解决冲突
 2015-09-18 13:08:12 +08:00
sw f04e0c5f84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 11:34:29 +08:00
sw a8c5d18069 1、之前普通作业更改为匿评作业。。。 
2、系统评分为null时默认为0
 2015-09-18 09:32:25 +08:00
sw 5bdb1cd461 1、启动匿评、关闭匿评时弹出框位置 
2、缺评评分设置报错
 2015-09-17 20:33:36 +08:00
sw f6f3d83c5e 1、老师、学生打分 
2、评论及评论的回复功能
 2015-09-17 16:31:32 +08:00
huang 9324d45e2c 系统消息发布添加标题功能 2015-09-17 16:23:09 +08:00
cxt 68338c46e1 个人动态按最后更新时间排序 2015-09-17 15:50:33 +08:00
sw 90d70e7c88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 10:24:58 +08:00
sw 84bb5af86f 增加教师优先字段 2015-09-17 10:24:37 +08:00
Tim 5b6ac4564a 回复框头像路径改变 2015-09-17 08:46:43 +08:00
huang b0ccf9037a 邮件邀请： 
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
 2015-09-15 17:39:57 +08:00
lizanle 2fa01f32fb schema 2015-09-15 11:28:08 +08:00
huang 4a7d3c9072 系统消息增加长度 2015-09-14 15:33:11 +08:00
sw da269ef716 发布作业，请先输入作业标题 2015-09-11 17:27:07 +08:00
cxt 42ddc0bf3c 迁移文件 2015-09-11 17:19:40 +08:00
cxt 9dc3f43af1 修改迁移文件 2015-09-11 17:15:05 +08:00
cxt 312955e5dc 迁移文件 2015-09-11 16:45:50 +08:00
cxt dbdd68f45d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-11 16:43:59 +08:00
cxt 585818fe7a 讨论区动态重复出现 2015-09-11 16:42:24 +08:00
huang dc564c37f1 修改系统消息参数 
输入内容JS控制
 2015-09-11 16:36:10 +08:00
huang 4d4b48ef99 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-09-11 15:50:10 +08:00
sw cd36965cd1 历史编程作业数据补齐 2015-09-11 11:31:59 +08:00
lizanle 80e38287dd 所有baselayout都引入prttefy.css .js 
调整资源库宽度
 2015-09-10 16:38:45 +08:00
huang 66251c8d30 添加功能：管理员界面发送系统消息 2015-09-09 17:05:32 +08:00
sw 519f079bcc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 16:54:21 +08:00
cxt a991500e55 登录首页的样式修改 2015-09-09 10:21:44 +08:00
sw 1cbda41997 11 2015-09-08 14:43:59 +08:00
sw e4209007b1 Merge branch 'guange_homework' into szzh 2015-09-08 10:28:21 +08:00
sw 3b24bb375a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-08 08:50:00 +08:00
sw a29d004fdc 没有加入课程的用户进入作业列表报错 2015-09-08 08:45:29 +08:00
guange be29bcc8bd 模拟答题记入数据库 2015-09-07 23:47:14 +08:00
guange 9e9f373a76 发布作业优化 2015-09-07 23:09:19 +08:00
cxt aa0c0dab83 添加“我的动态” 2015-09-07 15:01:08 +08:00
cxt d667e6359c 切换 2015-09-07 11:12:04 +08:00
sw d0f7f89db3 迁移文件修改 2015-09-06 17:42:55 +08:00
sw 955ef3d5fd 取消打印 2015-09-06 17:28:09 +08:00
sw 88397d58d0 1、讨论区新建帖子时增加权限判断 
2、删除历史的匿名用户发布帖子的数据
 2015-09-06 17:27:20 +08:00
huang b2e25e8afc Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-09-06 17:19:33 +08:00
sw 62c657a827 用户留言增加登录判断，并且删除匿名用户留言数据 2015-09-06 17:06:05 +08:00
sw 9ddb4f6683 删除匿名用户在缺陷中的回复 2015-09-06 16:38:24 +08:00
sw 093273968b 删除匿名用户在缺陷中的回复 2015-09-06 16:38:12 +08:00
huang c579ee51fe 增加点击时间表 2015-09-06 15:31:48 +08:00
sw fe91ec1a85 1、历史数据导致项目动态中部分数据连接到课程相关页面 
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
 2015-09-06 11:22:27 +08:00
sw 1bda18afff 111 2015-09-06 09:31:09 +08:00
huang a47c9176b7 注释掉消息迁移文件 
修改消息html样式
 2015-09-02 21:33:03 +08:00
huang 8b9eabd027 迁移文件中添加打印收据 
添加未读消息样式
 2015-09-02 18:35:12 +08:00
huang 487881bb92 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
 2015-09-02 14:15:38 +08:00
huang 48ddee478e 默认更新为已读 
公共贴吧区分已读和未读消息
 2015-09-02 11:00:32 +08:00
huang fede611fea 鼠标经过显示内容效果 
公共贴吧数据迁移
 2015-09-01 15:23:30 +08:00
huang 6dff29f931 添加时间迁移 2015-08-31 17:45:14 +08:00
huang b5c0d03590 添加迁移 
代码优化
 2015-08-31 16:41:52 +08:00
guange a142103091 Merge remote-tracking branch 'origin/develop' into guange_homework 2015-08-31 09:33:20 +08:00
huang e652e92217 新增消息迁移 2015-08-30 11:20:37 +08:00
huang 7ed93c1d80 消息总表数据迁移 2015-08-29 19:26:23 +08:00
guange 8f426ca040 merge 2015-08-29 18:22:33 +08:00
huang 43170c696c 迁移总表时间 2015-08-29 17:09:44 +08:00
huang 2a17cfc741 Merge branch 'szzh' into dev_hjq 2015-08-29 16:09:30 +08:00
huang 353e2f5d18 添加课程消息迁移 2015-08-29 16:08:09 +08:00
sw 98d533e8f9 1、整理迁移文件 
2、个人动态添加与更新判断不正确
 2015-08-29 15:34:18 +08:00
guange 18bfe1fc73 jquery升到1.11 2015-08-29 11:59:52 +08:00
sw c5b0b4164c 迁移文件back 2015-08-29 11:54:28 +08:00
huang f438d300dd 消息数据迁移（未完） 2015-08-29 11:50:08 +08:00
guange 1462ea09f3 测试代码功能完成 2015-08-28 12:04:49 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
guange ad0b14b768 schema 2015-08-26 22:11:39 +08:00
sw 5b9c9312f5 留言界面样式修改 2015-08-26 17:42:02 +08:00
huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
 2015-08-26 15:04:44 +08:00
huang 1dce1a2a4c 老师更新作品评阅消息通知 
区分第一次评阅和后面的评阅
 2015-08-26 14:47:53 +08:00
cxt bd00870eba 个人主页 2015-08-25 19:24:23 +08:00
sw ffe40b399d 个人动态表重构 2015-08-25 17:54:29 +08:00
sw 44419eff04 rake db 2015-08-25 15:39:50 +08:00
lizanle 256ccedfe8 schema 2015-08-25 15:16:24 +08:00
ouyangxuhua d7de5fc480 更改消息样式 2015-08-25 13:04:46 +08:00
huang 0da75afc88 消息排序（公共表） 2015-08-25 11:10:08 +08:00
huang 7961e3db6f 建立公共表 2015-08-24 22:47:48 +08:00
cxt 2e5916cf5e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/admin_controller.rb
 2015-08-24 18:01:51 +08:00
huang 4af3c9816c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	db/schema.rb
 2015-08-24 17:53:55 +08:00
huang 2d05d1f7d0 0 2015-08-24 17:51:44 +08:00
huang d575ce5e5f 消息公共表 2015-08-24 17:51:19 +08:00
ouyangxuhua f0483b6de8 更新新闻viewed 2015-08-24 17:45:00 +08:00
sw 3b3712891b 111 2015-08-24 11:08:16 +08:00
sw f6d122e37f Merge branch 'guange_dev' into sw_new_course 2015-08-24 11:04:19 +08:00
sw 111478ec72 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
 2015-08-24 10:39:52 +08:00
guange baea29e2f0 回复需要点击两次才能显示的问题 2015-08-22 15:48:20 +08:00
sw 535145f8f2 11 2015-08-21 16:35:52 +08:00
lizanle 1aa61acd79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/public.css
 2015-08-21 16:16:18 +08:00
lizanle 11d6298efa 资源库 合并后css样式冲突 2015-08-21 14:37:19 +08:00
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-21 14:10:50 +08:00
cxt 4c87071765 个人动态 2015-08-20 17:24:34 +08:00
huang a15ab2c72e Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-08-20 14:07:11 +08:00
sw b52f607b68 用户动态 = 参与课程动态 + 参与课程动态 
表创建以及相关关系的搭建
 2015-08-20 11:19:26 +08:00
huang 6b6f6e0b0d 个人主页留言消息推送 2015-08-20 09:25:48 +08:00
huang d18d1a9d81 用户留言添加 
公共讨论区留言修改
 2015-08-19 17:29:05 +08:00
huang d657e9f3cc 新增 公共贴吧 消息通知 2015-08-19 11:06:39 +08:00
cxt 27ff5471ec 超级管理员新增功能页面的分页、添加超链接，添加查询条件。 2015-08-18 14:40:12 +08:00
sw c97ec1a370 111 2015-08-15 19:47:50 +08:00
sw 0ba9cfe5dd 提升迁移文件效率 2015-08-15 19:47:24 +08:00
huang a38e91b3d3 Merge branch 'szzh' into dev_hjq 2015-08-15 17:10:02 +08:00
cxt 58613e843b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-08-15 17:09:10 +08:00
lizanle 89b9a5c09d 资源库 2015-08-15 17:06:41 +08:00
sw 5d000ea431 增加系统评分 2015-08-15 17:02:54 +08:00
huang 9a695b2d09 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/models/poll.rb
 2015-08-15 16:54:51 +08:00
sw 35d6c76a8e 部分课程资源创建时间不正确 2015-08-14 13:55:46 +08:00
huang a5c941f48c 课程发布通知消息提示 2015-08-14 10:19:59 +08:00
huang b958340ab6 Merge branch 'szzh' into dev_hjq 2015-08-14 08:55:41 +08:00
sw 053587bd53 课程动态增加课程创建信息的动态 2015-08-11 17:11:10 +08:00
sw ce76308864 课程动态，历史数据的迁移 2015-08-11 17:02:52 +08:00
huang 998fe24e49 建立forge_messages表 
建立user、project关联
 2015-08-11 16:52:04 +08:00
sw 465af5e2d3 增加课程动态，以及课程内相关活动时动态的添加 2015-08-11 15:54:05 +08:00
cxt a872692984 为activities表添加created_at字段，并导入数据 2015-08-11 14:49:32 +08:00
sw f5cfd7258d 修改编程作业时，对已通过测试、未通过测试显示的初始化，以及修改时的结果的存储 2015-08-01 14:27:32 +08:00
guange 909521df54 Merge remote-tracking branch 'origin/szzh' into gitlab_guange 2015-08-01 09:41:01 +08:00
sw 9da18bcad4 老师测试结果的返回 2015-07-31 13:58:27 +08:00
sw 41cba6db6a 增加每组测试的编译错误信息的存储 2015-07-30 21:10:05 +08:00
sw 5e885d9417 老师布置编程作业界面增加测试，以及测试结果的存储 2015-07-30 17:38:01 +08:00
lizanle b22f9b221b db_schema.rb 2015-07-28 11:34:50 +08:00
lizanle e74ca78b0e 日志级别在debug环境下 调整为debug 2015-07-27 10:03:45 +08:00
cxt afce49839f Merge branch 'szzh' into dev_cxt2 
Conflicts:
	app/views/layouts/base_users_new.html.erb
 2015-07-24 09:07:58 +08:00
sw 66924560c4 编程作业上线 2015-07-22 16:06:31 +08:00
sw baccd28493 迁移文件出错 2015-07-22 10:48:46 +08:00
sw 5bd1cdc4eb 编程作业结果增加错误信息的存储 2015-07-22 10:06:55 +08:00
guange 7d0a53ec86 merge 2015-07-21 20:56:33 +08:00
cxt 3b6d6596c0 3218 3219缺陷的修复 2015-07-21 11:59:15 +08:00
huang 5926b2fe81 dts测试 2015-07-19 20:39:53 +08:00
huang c198a03a90 DTS测试工具 2015-07-19 20:08:57 +08:00
sw a7666af597 Merge branch 'yutao' into szzh 
Conflicts:
	app/controllers/users_controller.rb
 2015-07-17 17:38:07 +08:00
yutao 8d858cccfc 个人主页 2015-07-17 13:40:53 +08:00
yutao 87ab758ec5 个人主页->动态 2015-07-16 10:26:09 +08:00
sw 536a9d7b6b 修改表名 2015-07-15 15:28:44 +08:00
sw 0b66097bfb 增加每份编程作品的测试结果的记录 2015-07-15 15:21:26 +08:00
yutao 00c50d8114 个人主页->访客 2015-07-14 15:16:15 +08:00
yutao b7c4449f4b 个人主页 2015-07-13 16:44:53 +08:00
guange 3614c6ee9b project同步 2015-07-12 15:56:15 +08:00
sw aeb0d23289 Merge branch 'develop' into sw_new_course 
Conflicts:
	app/views/homework_common/index.html.erb
 2015-07-10 15:42:53 +08:00
sw 11191f6743 与编程作业服务器联调 2015-07-09 15:50:04 +08:00
sw 24d6c8e17e 编程作业表增加question_id字段 2015-07-09 15:20:59 +08:00
sw 8f3ac85fec 1、作业描述、编程作业代码字段改为longtext 
2、提交作业界面显示修改
3、编程作业不可以修改和删除control判断
 2015-07-08 17:19:11 +08:00
sw 6af6fdd5a3 编程作业分配比例添加以及界面显示 2015-07-08 11:17:59 +08:00
sw 17a9a1023a 增加编程作业中教辅比例 2015-07-08 10:58:03 +08:00
lizanle 6d85dd7ca4 app的课程动态界面api修改 
添加活跃学生查看，
获取作业的匿评率
 2015-07-07 17:18:29 +08:00
sw 08c9d5a498 迟交扣分记录 2015-07-02 16:16:29 +08:00
sw 976c4ddd19 增加迁移文件 2015-07-02 15:36:27 +08:00
sw 156f2f9a2e 部分评分数据重复 2015-06-30 14:30:11 +08:00
lizanle 2ba87477fa Merge remote-tracking branch 'origin/szzh' into szzh 2015-06-26 09:18:39 +08:00
sw 358c344ca5 迁移文件错误 2015-06-19 16:10:49 +08:00
sw 044370b958 作品创建时间迁移 2015-06-19 14:21:36 +08:00
lizanle 96220a0147 schema.rb 2015-06-15 10:08:05 +08:00
sw 243fa0af89 admin用户能操作作业和作品 2015-06-04 17:24:50 +08:00
yutao cd0752f5da 课程讨论区动态与我相关 2015-06-04 15:55:41 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
sw c8128cffea 删除无效动态 2015-06-02 13:59:33 +08:00
sw 8d23815169 数据迁移不完整 2015-06-02 11:42:12 +08:00
sw bdbcc52320 评分计算的数据迁移 2015-06-02 11:01:49 +08:00
sw c1d753f634 数据迁移文件增加个人动态中的迁移 2015-06-02 10:09:05 +08:00
sw e4046851cf 1、作品列表 学号、姓名过长会换行 
2、作品作业相关数据迁移
3、student_work缺少字段project_id
 2015-06-02 09:33:34 +08:00
sw a562cc7409 Merge branch 'dev_hjq' into szzh 2015-05-29 16:12:50 +08:00
alan f47d30f22a 项目首页缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-05-28 15:14:38 +08:00
huang cae882b3d6 新增邮件状态表 
相关关联
 2015-05-28 14:44:04 +08:00
sw 4783bad924 1、打分后作品的各项得分数据刷新 
2、作品列表样式调整
 2015-05-27 17:32:14 +08:00
alan 59c77e870c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	db/schema.rb
	public/javascripts/course.js

Signed-off-by: alan <547533434@qq.com>
 2015-05-27 17:01:52 +08:00
alanlong9278 a27b3e9dc6 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-25 23:22:11 +08:00
lizanle 42fab7c784 schema 2015-05-25 11:05:28 +08:00
sw 6ac97f2c34 1、迁移文件增加回滚方法 
2、作品表增加所属项目字段
 2015-05-21 10:54:02 +08:00
alan 799f561d77 Merge branch 'szzh' into memcached_alan 
Conflicts:
	Gemfile
	app/views/issues/index.html.erb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
 2015-05-20 17:42:26 +08:00
huang b645a1aa1e 私有项目成员列表非项目成员不能通过URL访问 2015-05-19 14:25:10 +08:00
sw dc1971f507 学生作品详细得分表，以及相关的关系 2015-05-19 11:18:19 +08:00
sw 08b469fa3c 学生作品匿评分配表 2015-05-19 10:56:41 +08:00
sw 3abfaed081 学生提交作品表，以及相关的关系 2015-05-19 10:36:30 +08:00
sw bb3e0c4c7e 手动评分作业、编程作业相关表的添加以及关系的定义 2015-05-19 10:20:07 +08:00
sw 7bfd7755f7 增加手动评分相关表，以及关系的定义 2015-05-19 09:56:08 +08:00
sw a43a6289e4 新的老师布置的作业表添加，以及相关关系定义 2015-05-19 09:49:26 +08:00
guange 907d89e1cc merge 2015-05-15 13:39:26 +08:00
guange 39308dacfd 将setting中的domain合并到host配置中 2015-05-14 21:40:34 +08:00
guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
# Conflicts:
#	db/schema.rb
 2015-05-13 16:22:44 +08:00
lizanle 3fae37fa90 课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动 2015-05-13 09:56:34 +08:00
guange 461d9cc183 将autologin默认过期时间改为两个月 2015-05-10 18:06:45 +08:00
sw 6a31a99c93 编辑课程讨论区回复时的问题 2015-05-08 16:14:46 +08:00
alanlong9278 49fe15a666 论坛js冲突 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:37:52 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
huang a7b2ac860b 修改索引迁移文件不能执行的问题 2015-05-06 15:40:13 +08:00
sw 2ade53053b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-05 16:33:13 +08:00
sw c60ea1db84 111 2015-05-05 16:33:01 +08:00
lizanle 71004e2f78 课程学生列表显示太慢，需要对表加索引 2015-05-05 10:58:37 +08:00
alan 54078e114c redis缓存服务器的搭建以及对首页的缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-05-04 15:20:40 +08:00
alan c80263a66e Merge branch 'guange_dev' into memcached_alan 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb
	config/environments/production.rb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
 2015-05-04 14:58:11 +08:00
lizanle 2f4ac77838 schema 2015-04-30 09:25:16 +08:00
guange 38ec84cde9 将删除版本库的操作置入后台 2015-04-28 10:33:15 +08:00
guange 3f9abf170e #2363 按天发送邮件相关标题修改 2015-04-23 17:43:10 +08:00
sw 92eabdbecd 修改作业历史数据的问题 2015-04-22 11:49:48 +08:00
sw 09c51d1a87 修改创建作业未启用匿评时，所有作业列表看不到 2015-04-22 11:44:52 +08:00
alanlong9278 945192f1d8 添加memcached配置 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-21 09:41:40 +08:00
lizanle 871623b7c8 commit 2015-04-16 11:14:12 +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 115d77dd01 圈子JS和modulesJS 
版本库删除按钮
 2015-04-16 09:49:03 +08:00
guange 11c1bbb525 解决打包时文件过多插库错误 2015-04-15 11:24:15 +08:00
lizanle b13d30bf20 自动更改 2015-04-15 10:52:50 +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 04c064ddc8 nothing 2015-03-26 16:22:16 +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
z9hang 8190403380 app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文） 2015-03-12 16:33:31 +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
alan 5ff43fdea7 项目添加新用户邮件发送功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 10:52:20 +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