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

1288 Commits

Author SHA1 Message Date
Your Name 537f152562 0 2016-06-24 18:47:54 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
Your Name 06fe02890f index for sonar result 2016-06-24 14:59:17 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
Your Name ce6e6116b5 get data from sonar API 2016-06-22 17:09:54 +08:00
Your Name 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
Your Name d5631defb5 added xml to jenkins and added some gems 2016-06-20 17:53:56 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-06-17 11:33:48 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
txz 719774f159 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-12 14:52:29 +08:00
txz b57f6fbc65 微信回复框增加padding 2016-06-12 14:52:24 +08:00
huang 78b445a7ae 组织历史数据迁移 模式术语修改， 配置页面域名长度问题 2016-06-12 13:36:35 +08:00
huang 4ea12a6dc5 删除匿名用户数据迁移 2016-06-06 14:55:13 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
cxt b065184754 删除机器人组织的匿名评论 2016-05-27 08:54:31 +08:00
huang 61eeee702c migrate 2016-05-24 09:40:47 +08:00
huang ed7c6cbcfe 组织新建帖子增减status状态 2016-05-24 09:40:16 +08:00
huang 1c400669aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 15:36:00 +08:00
huang 5cefedd20a Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-05-20 15:35:08 +08:00
cxt b03b9a3c27 课程：问卷导入时显示的数据未进行过滤 2016-05-20 09:59:41 +08:00
huang faf5e89cc2 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
 2016-05-19 16:04:27 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
txz e2f3ba8e7d 微信问题修改 2016-05-19 15:20:46 +08:00
txz 278ee66368 系统冲突 2016-05-19 13:47:08 +08:00
txz 1b3bc38f8e 拖代码改动 2016-05-19 13:44:03 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
cxt 9b6c629d10 学生列表增加活跃度的统计 2016-05-17 14:18:14 +08:00
cxt baaff3f988 数据迁移 2016-05-13 20:12:56 +08:00
cxt 90a9472e30 删除空数据 2016-05-13 20:07:43 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
Tim dc92e821a3 名师榜样式调整 2016-05-13 14:08:34 +08:00
huang 83ac35cc94 不同的组织定制是否允许设置名师榜 2016-05-13 10:29:22 +08:00
huang 37ee03374e 完成设置名师功能 2016-05-13 09:53:22 +08:00
huang 922958e732 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-11 16:23:58 +08:00
cxt 9096ad5eac 数据迁移的还原 2016-05-11 15:06:12 +08:00
cxt 2d95885345 迁移文件 2016-05-11 15:00:26 +08:00
cxt 77d713a390 合并两个相同的作业 2016-05-11 14:28:13 +08:00
cxt 320c3881ef 多次点击发送按钮不应新建多个作业 2016-05-11 10:48:04 +08:00
txz ec3a077b22 微信意见反馈按钮文字错误 2016-05-10 14:48:40 +08:00
Tim cf1cf58bab 组织门户二级目录添加分栏"|"以及登录未登录位置控制 2016-05-09 18:44:20 +08:00
cxt 6d32e812aa 统一课程动态和作业的更新时间 2016-05-09 11:06:23 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
cxt c6c3625029 题目申请说明内容较长时，会导致被申请者收不到消息 2016-05-06 18:47:38 +08:00
huang 3de2b151a3 左三”更多“提供链接 2016-05-06 17:03:54 +08:00
huang 6e7d20c410 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 10:17:18 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
guange e8adcf8cc7 添加sso model 2016-05-04 15:40:18 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
cxt d7789b7739 迁移文件 2016-04-29 16:48:11 +08:00
cxt f62b6c4c31 提交 2016-04-29 16:45:15 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
Tim 5f1b335cfb 北斗二级菜单显隐 2016-04-29 15:38:38 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
cxt 4a5a602a6e 迁移 2016-04-28 14:46:27 +08:00
yuanke b3fdc45a04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 12:38:06 +08:00
yuanke 54a8e6871c 问答区列表修改 2016-04-28 11:31:31 +08:00
Tim 5c795b92ee 图片百分百显示； 默认大图尺寸调整 2016-04-28 11:12:44 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
cxt 451b53f3cc qianyi 2016-04-28 10:09:45 +08:00
cxt d244e22066 rake 2016-04-28 10:08:09 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
yuanke c357971e8a 课程列表、项目列表等修改 2016-04-27 16:02:52 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
huang 5d506458df 迁移空数据问题 2016-04-24 11:25:29 +08:00
huang cc48fb5a98 Merge branch 'hjq_beidou' into develop 2016-04-24 10:53:23 +08:00
huang f5a88ef6f9 数据库为空的迁移问题 2016-04-24 10:52:29 +08:00
yuanke 81cd30cbda Merge branch 'cxt_course' into yuanke_1 
Conflicts:
	db/schema.rb
 2016-04-23 13:22:28 +08:00
cxt 76b37d7670 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-21 10:02:16 +08:00
cxt 26b1aee90d 修改周海芳老师四个作业的截止日期和学生得分 2016-04-21 10:01:12 +08:00
yuanke 8f62cccfd6 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 16:14:26 +08:00
yuanke dc3837da76 Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-20 09:59:37 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
cxt 0fa16251e7 删除学生提交的多分作品 2016-04-18 15:57:15 +08:00
txz 73b89cdde5 微信边框，回复点赞样式更改 2016-04-18 11:19:13 +08:00
cxt a3a92a19f9 数据迁移 2016-04-15 18:50:38 +08:00
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 16:52:15 +08:00
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 16:51:37 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
yuanke de0ba0fbe5 Merge branch 'yuanke' into develop 2016-04-14 13:56:42 +08:00
yuanke 6444d859a7 迁移文件修改 2016-04-14 13:55:55 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
cxt fcddaf403c 删除博客为空的数据 2016-04-08 15:59:23 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
txz feb0014bf8 作业详情页面 2016-04-06 11:29:50 +08:00
huang c408185b40 Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new 
Conflicts:
	db/schema.rb
 2016-04-05 11:25:25 +08:00
cxt 6a8a82e85a 删除周海芳老师2882作业的学生匿评 2016-04-05 11:23:50 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
huang 1ccb3a2c41 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-31 15:25:24 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
huang 20ea251cab 添加字段 2016-03-31 14:01:09 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
cxt 0b0f484a5b 更新吴文植的分数 2016-03-29 09:50:37 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择 2016-03-28 11:24:31 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
 2016-03-25 16:33:22 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +08:00
huang 5fd3e7d3a2 动态表添加索引 2016-03-25 11:13:42 +08:00
alan bd5dd24164 add alias name to farge_activitiy index 2016-03-25 10:55:08 +08:00
huang 9cbe719c5e 项目动态表添加索引 2016-03-24 16:44:54 +08:00
huang a9ef2c28e2 项目创建类型迁移 2016-03-24 13:57:52 +08:00
ouyangxuhua 675b1ad403 1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。 2016-03-22 13:51:19 +08:00
huang 44549e091d message_all表中添加type索引 2016-03-21 16:54:12 +08:00
huang e77a891bc6 消息查询语句优化，添加索引 2016-03-21 16:36:25 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 4de81605a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-03-17 15:19:41 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
huang e8e9688644 项目资源数目迁移 2016-03-16 14:18:57 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
ouyangxuhua a7312a6191 修改游客下载组织资源的权限 2016-03-14 14:43:30 +08:00
cxt f174101297 数据迁移 2016-03-11 20:28:43 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
huang 8079254089 首页增加访问统计 2016-03-11 15:51:45 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-03-10 14:52:23 +08:00
cxt 8a4175dc02 点击学生作品列表中的编程作品，代码会跳到上一个作品的详情 2016-03-10 11:40:56 +08:00
cxt 5b4ff5ec8a 学生列表中的作业积分为负分 2016-03-10 09:22:49 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang d3fd445108 数据迁移 2016-03-09 15:27:50 +08:00
cxt d3489ec5cb 作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间 2016-03-09 11:15:43 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-08 11:29:58 +08:00
Tim 1deb611ba2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-07 10:58:57 +08:00
Tim ef05867e6e 自动生成文件 2016-03-07 10:58:41 +08:00
cxt 0090c89dd1 数据迁移 2016-03-07 10:53:58 +08:00
huang 4f2937e1a2 英雄榜 2016-03-05 10:38:21 +08:00
huang 0a18f365ab 新的迁移 2016-03-05 08:00:56 +08:00
huang 094af07a2f 数据迁移 2016-03-05 04:22:01 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/models/course_contributor_score.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_homework_search_input.html.erb
	app/views/users/_show_user_homeworks.html.erb
	app/views/users/_user_homework_detail.html.erb
	app/views/users/_user_homework_form.html.erb
	app/views/users/user_homework_type.js.erb
	app/views/users/user_homeworks.html.erb
	app/views/users/user_homeworks.js.erb
 2016-03-05 03:17:47 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
huang 3f56fa3405 0 2016-03-05 03:14:57 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +08:00
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
cxt 8aff404f0c 题库过滤作业的搜索 2016-03-04 11:37:14 +08:00
huang 085729f91b 课程活跃度中添加作业留言得分 2016-03-03 18:51:28 +08:00
Tim f51d16c538 资源库样式调整 2016-03-02 18:20:36 +08:00
guange a59f65a455 wechat 2016-03-01 16:13:37 +08:00
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +08:00
Tim e8234092ec 复制学期弹框调整 2016-02-26 11:16:12 +08:00
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
guange 296d6efbf1 单文件作业不压缩 2016-02-24 16:52:36 +08:00
cxt 2aa0fefa1c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-24 16:08:38 +08:00
cxt 72c3fa1166 某个学生分数异常 2016-02-24 16:05:16 +08:00
ouyangxuhua 11231d0ff9 1.解决组织配置报500的错误；2.增加转发表 2016-02-24 16:01:32 +08:00
ouyangxuhua 3eb7c62b85 组织子域名迁移 2016-02-23 17:09:33 +08:00
ouyangxuhua 16efcafe77 注释迁移 2016-02-23 16:55:25 +08:00
ouyangxuhua 035b22d6dd Merge branch 'ouyangxuhua' into develop 2016-02-23 16:49:12 +08:00
ouyangxuhua 2a26fd4e75 修改组织子域名的问题 2016-02-23 16:48:31 +08:00
ouyangxuhua d818e1774b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-23 16:18:01 +08:00
huang 69ae7e3845 解决附件无法更新问题 2016-02-23 15:45:19 +08:00
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop 
Conflicts:
	db/schema.rb
 2016-02-23 13:36:05 +08:00
ouyangxuhua c91ef44570 组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码 2016-02-23 12:52:04 +08:00
cxt 98946b9855 课程上传资源弹框的延迟发布功能 2016-02-22 18:10:20 +08:00
cxt 3369183fb7 课程表的数据迁移 2016-02-20 18:16:07 +08:00
Tim 89eff0f920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-20 16:29:28 +08:00
Tim e223ac77d0 自动生成文件 2016-02-20 16:28:19 +08:00
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果” 2016-02-20 10:50:46 +08:00
huang aa22a253ba “发送至”弹框飘动问题 2016-02-20 09:45:37 +08:00
cxt cc7d75a046 Merge branch 'szzh' into develop 2016-02-03 09:28:24 +08:00
guange 7f8f3fa152 被rubymine坑了，这两个文件没加进去 2016-02-02 18:47:53 +08:00
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/user_import_homeworks.js.erb
	db/schema.rb
 2016-02-02 15:55:07 +08:00
Tim f3bcb3ca47 导入题库弹框位置调整 2016-02-02 15:23:23 +08:00
guange 28035dfc47 子域名处理 2016-02-02 12:40:00 +08:00
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启 2016-01-29 20:31:25 +08:00
Tim 55fddbcabe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 16:52:14 +08:00
Tim 674a8e0035 单词折行问题 2016-01-29 16:16:02 +08:00
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
	db/schema.rb
 2016-01-29 15:44:26 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
guange d8ef2f0965 个人留言中的at启用 2016-01-26 18:24:15 +08:00
cxt 19003f27fc 课程添加is_copy属性 2016-01-26 15:05:45 +08:00
cxt 520811fdc7 留言按回复的更新时间排序 2016-01-26 11:17:55 +08:00
cxt 945d0a933f 项目资源统计为负数 2016-01-25 17:34:04 +08:00
huang dfb8a3afbf 数据迁移 2016-01-22 22:35:47 +08:00
cxt bbdced9bc1 留言页面的样式修改 2016-01-22 21:41:17 +08:00
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库 
精品课程数据迁移
 2016-01-22 18:00:01 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
huang 2947ff8997 精品课程数据迁移 2016-01-22 16:46:23 +08:00
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间 2016-01-22 11:10:35 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
 2016-01-21 16:10:29 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项 2016-01-21 15:31:36 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
Tim a3c30ee965 issue上传附件样式修改 2016-01-19 17:31:59 +08:00
guange 08e193ea3c 添加微信用户表 2016-01-19 11:51:37 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-18 17:12:56 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
huang 8b815f95bb Merge branch 'develop' into hjq_new_course 2016-01-18 08:55:35 +08:00
guange 5f6a3cac04 wechat init 2016-01-16 11:54:59 +08:00
guange 62c2085d61 merge 2016-01-15 22:45:16 +08:00
huang ed26242f94 版本库提交次数迁移 2016-01-15 21:19:52 +08:00
guange b68eab23ea merge 2016-01-15 17:03:32 +08:00
guange 587d347178 added wechat 2016-01-15 17:01:30 +08:00
huang 64f972770f 添加board和attachment数据迁移 2016-01-15 10:41:34 +08:00
huang 157502d450 精品课程 2016-01-15 10:35:56 +08:00
huang 20d550e755 提交次数默认值为空的数据处理 2016-01-14 21:25:36 +08:00
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
处理冲突
 2016-01-14 17:35:25 +08:00
Tim 13e289dfb5 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
 2016-01-14 16:07:06 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
Tim 4493261797 自动生成文件 2016-01-14 15:59:24 +08:00
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +08:00
huang f3402e4fa4 项目得分新计算 2016-01-14 15:00:21 +08:00
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-14 14:40:13 +08:00
huang 49d456bf21 修改数据统计信息 2016-01-14 14:32:19 +08:00
huang a68392fd24 issue统计数据更新 
提交次数加入新表
 2016-01-14 13:05:33 +08:00
huang e808f0bc61 提交新迁移 2016-01-14 11:37:10 +08:00
cxt 90acb7816f 数据迁移 2016-01-14 09:38:00 +08:00
cxt f7a88a63e0 更新项目缺陷动态的更新时间 2016-01-13 18:46:28 +08:00
Tim 3d73a3c243 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-13 18:21:16 +08:00
cxt e889f798d7 项目创建动态报500 2016-01-13 17:26:36 +08:00
Tim d495f58408 切换分支文件 2016-01-13 17:13:39 +08:00
Tim 88895ff262 英文文本强制折行修复 2016-01-13 16:36:34 +08:00
huang 05cf2d24dc 新项目积分系统 
讨论区回复加入得分系统
版本库行号显示错误问题
 2016-01-13 15:29:29 +08:00
huang 165d5f50c8 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/files_controller.rb
	db/schema.rb
处理冲突
 2016-01-13 13:01:26 +08:00
huang cf7130a398 0 2016-01-13 12:57:09 +08:00
huang a0ceb9b11c 添加缺陷回复统计 
项目版本库提交次数统计
 2016-01-13 12:53:09 +08:00
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-13 09:58:14 +08:00