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

10788 Commits

Author SHA1 Message Date
huang da1438b04e Merge branch 'hjq_beidou' into develop 2016-03-30 19:34:03 +08:00
huang 5621f01284 权限访问控制 2016-03-30 19:31:43 +08:00
huang 8f43341f81 新建组织为空的情况 2016-03-30 19:17:29 +08:00
huang b64e8a5f9e 完成所有图片自动适应转换 2016-03-30 19:02:41 +08:00
huang bded9f2e98 图片自动获取功能 2016-03-30 18:35:47 +08:00
huang 0244008b32 一些链接和样式 2016-03-30 17:33:22 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
linchun d98eb8748e 修改管理员界面作业列表的截止时间为作业发布时间，并且按时间倒序排列 2016-03-30 14:17:12 +08:00
huang f2106d0045 more链接添加，区分两种模式 2016-03-29 20:33:16 +08:00
huang a26cf19b86 配置中配置模式 2016-03-29 20:14:07 +08:00
huang 8a6a1b94ee 组织资源的统计与权限 2016-03-29 20:09:47 +08:00
huang 961a264e05 创建时间统一date 2016-03-29 19:04:51 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
cxt 668a724064 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new 2016-03-29 18:22:51 +08:00
cxt 69373468ae 作品详情打不开 2016-03-29 18:22:41 +08:00
alan 9452254b62 去掉缓存机制 2016-03-29 17:39:20 +08:00
huang 2728cccd41 Merge branch 'develop' into hjq_beidou 2016-03-29 16:54:44 +08:00
huang 7c9e20c9bf 登录注册样式 2016-03-29 16:51:50 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
alan 88a4b8ce6c Merge branch 'alan_develop' into develop 2016-03-29 16:44:06 +08:00
alan e4fc9f39e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 16:43:52 +08:00
alan 200561da92 修改《私有资源公共资源中不显示》 2016-03-29 16:43:14 +08:00
yuanke be1351a4d8 Merge branch 'yuanke' into develop 2016-03-29 15:56:02 +08:00
yuanke ef5d8abf38 修改编程作业提示服务器出错的BUG 2016-03-29 15:54:44 +08:00
alan 03d855f5d5 修改资源区分页问题 2016-03-29 15:46:13 +08:00
ouyangxuhua 7f0959c972 题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式 2016-03-29 15:25:22 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
huang 68edc792e9 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/controllers/organizations_controller.rb
 2016-03-29 13:48:26 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
ouyangxuhua 2275b367f4 在organization控制器的show方法添加layout 2016-03-29 13:22:18 +08:00
ouyangxuhua 56f8d4854b 恢复代码 2016-03-29 12:38:02 +08:00
alan e9069f0225 fix merge bug 2016-03-29 12:29:23 +08:00
alan eb1c6ccf85 Merge branch 'alan_develop' into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/_resource_share_popup.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-03-29 11:36:49 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
cxt d1cb44cff7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 10:39:51 +08:00
cxt 1daf620ed1 新建作品点取消时跳到我的作业页面 2016-03-29 10:39:44 +08:00
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
alan dfe9cb0c68 Merge branch 'develop' into alan_develop 2016-03-29 10:16:30 +08:00
alan 90fd52970b fix bugger on 资源区 2016-03-29 10:15:18 +08:00
ouyangxuhua 598f69abb0 组织显示模式暂时隐藏 2016-03-29 09:35:07 +08:00
cxt b9f1ff3cd2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 09:24:24 +08:00
cxt ed0eb4aff3 学生作品详情无法打开 2016-03-29 09:24:11 +08:00
yuanke 0217dc0054 Merge branch 'yuanke' into develop 2016-03-29 09:14:31 +08:00
yuanke 213cf48c09 编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管 2016-03-29 09:02:54 +08:00
alan 395fb8fae6 修改pagination,资源区bug 2016-03-28 22:37:01 +08:00
ouyangxuhua 1a1d5b4c49 解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题 2016-03-28 19:20:09 +08:00
cxt 8e7d25a483 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-28 17:20:52 +08:00
cxt f46985c8bc 作品点赞报500 2016-03-28 17:20:46 +08:00
huang 64f13a04cc 动态500问题 2016-03-28 17:09:42 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
cxt 33c9331c7b 课程设置为私有/公开 课程头部未刷新 2016-03-28 15:35:24 +08:00
huang 74a4e80795 Merge branch 'ouyangxuhua' into hjq_beidou 2016-03-28 15:11:37 +08:00
huang 9fc227d619 资源库问题 2016-03-28 14:50:26 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
ouyangxuhua 67ff9fb6e2 组织显示模式功能 2016-03-28 13:03:13 +08:00
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择 2016-03-28 11:24:31 +08:00
huang 326730f6b1 北斗框架 2016-03-28 10:39:09 +08:00
yuanke f217c9097a 全部正确需要提示是否提交 2016-03-26 15:44:28 +08:00
yuanke 88ba2bf556 编译错误处理 2016-03-26 14:59:51 +08:00
yuanke 5116d75eb7 编程作业空格用□表示 2016-03-26 14:48:57 +08:00
yuanke e62ee2eade 修改评测问题 2016-03-26 13:44:13 +08:00
yuanke 2ceef7d3e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 21:12:22 +08:00
yuanke ef49715b08 编程测试加个results为空判断 2016-03-25 21:11:13 +08:00
yuanke a58ba8080c 编程作业加个日志 2016-03-25 21:06:25 +08:00
huang c7c96e0c6a 公共资源附件名编辑问题 2016-03-25 20:37:32 +08:00
huang fc006d64bb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:45 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
cxt 0d5bad1ddd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:11:00 +08:00
cxt 35faa12d4d 组织编辑文章无法提交 2016-03-25 20:10:53 +08:00
ouyangxuhua f0d6bb7fae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 20:08:20 +08:00
ouyangxuhua 26b81fb8b3 组织文章列表回复问题解决 2016-03-25 20:07:55 +08:00
huang 777e585d4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:21:07 +08:00
huang ba25f41bcb 添加教师统计数、学生统计数 2016-03-25 19:20:36 +08:00
ouyangxuhua 00d2542964 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 19:09:48 +08:00
ouyangxuhua 0f4d2e40fb 添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整 2016-03-25 19:09:25 +08:00
alan e764075bd6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:36:53 +08:00
alan 16831e19d9 merge 晓婷的课程留言 2016-03-25 17:34:32 +08:00
ouyangxuhua 2261081dc2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:17:15 +08:00
alan 6862480632 修改当用户没有项目时，报错 2016-03-25 17:16:45 +08:00
ouyangxuhua cca2527401 组织栏目新建文章样式调整 2016-03-25 17:16:36 +08:00
alan 4587e728d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:07:42 +08:00
alan 05d66f41f9 fix bug when user don't have courses or projects 2016-03-25 17:07:30 +08:00
huang 8f0038c3ff tag 2016-03-25 17:06:59 +08:00
yuanke 4c47dae88b Merge branch 'develop' into yuanke 2016-03-25 16:38:21 +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
huang cca570e75c 课程相关优化 2016-03-25 16:30:00 +08:00
alan 3b48b3add7 refactor cache 2016-03-25 16:26:33 +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
alan 4f5e083707 优化个人主页，缓存设置 2016-03-25 16:06:14 +08:00
yuanke 674b63d106 Merge branch 'develop' into yuanke 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
 2016-03-25 15:59:49 +08:00
huang e02ad85bbb 项目动态关联优化（主要优化查询次数） 2016-03-25 15:58:17 +08:00
huang 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00
ouyangxuhua 9f8ad41533 Merge branch 'ouyangxuhua' into develop 2016-03-25 15:42:37 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
huang 9549d695f6 讨论区局部优化 2016-03-25 14:29:58 +08:00
alan aeb694a68e 修改《删除blog_comment时删除user_activities内容》 2016-03-25 13:57:00 +08:00
ouyangxuhua 7b24b053a5 Merge branch 'develop' into ouyang 2016-03-25 12:35:13 +08:00
ouyangxuhua 5cc31fb511 组织资源栏目排序，带过滤条件，如tag类型、搜索条件等 2016-03-25 12:30:33 +08:00
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
alan 04b4823ac2 user_activities 加cache 2016-03-25 10:27:28 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
alan 357c60d42e Merge branch 'hjq_new_course' into alan_develop 2016-03-25 09:36:17 +08:00
alan 7108e6d763 减少数据库查询字段 2016-03-25 09:22:05 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
huang 9cbe719c5e 项目动态表添加索引 2016-03-24 16:44:54 +08:00
huang 88185b1f34 点击作品消息，作品展开 2016-03-24 15:04:50 +08:00
huang 77419dc2d4 Merge branch 'develop' into hjq_new_course 2016-03-24 14:00:45 +08:00
alan 11a5e0a963 Merge branch 'develop' into alan_develop 2016-03-24 13:58:04 +08:00
huang a9ef2c28e2 项目创建类型迁移 2016-03-24 13:57:52 +08:00
alan a0e11a787f 修改个人主页不能展开更多 2016-03-24 13:57:01 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
ouyangxuhua 589f939bbd 消息类型“学生再次提交作业”中的链接，应该打开学生作品 2016-03-24 11:39:38 +08:00
huang d6f81c8978 课程讨论区优化 2016-03-24 10:41:08 +08:00
ouyangxuhua 3fc988757c 组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索 2016-03-24 10:14:25 +08:00
alan 0d049bbe1f refactor new_base_user 2016-03-24 10:07:39 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
cxt fe35bb3b44 学生打开作品列表报500 2016-03-23 14:42:27 +08:00
ouyangxuhua 6b3e9ba4b3 新建组织时，点击私有或者公开选项，允许游客下载选项及时响应 2016-03-23 14:29:30 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
alan 49026f0438 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-23 00:05:21 +08:00
alan 9273e37a5b 优化SQL查询：1，members与users表关联查询； 2，blogs表单查询 2016-03-23 00:04:53 +08:00
cxt aa1cbcdf87 课程留言动态加入个人动态 2016-03-22 16:44:53 +08:00
cxt f90b25b230 作业附件的用户名省略号太早 2016-03-22 15:50:06 +08:00
huang 12efbcb9ae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-22 15:07:25 +08:00
huang 7967066b05 附件添加动态发送方式改变 2016-03-22 15:06:54 +08:00
ouyangxuhua fcb189d874 编辑组织栏目的顺序时，不需要弹窗 2016-03-22 14:10:36 +08:00
ouyangxuhua 675b1ad403 1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。 2016-03-22 13:51:19 +08:00
huang 478311128d 优化project_controller show方法 2016-03-22 12:42:53 +08:00
huang 341308658d 优化项目消息更新代码 2016-03-22 10:48:37 +08:00
huang e20fe85ddf 消息去掉tip 2016-03-21 18:16:50 +08:00
huang 70d594659e 课程英雄榜代码封装 2016-03-21 16:50:24 +08:00
huang e06695b56b 课程活跃度代码封装 2016-03-21 16:45:49 +08:00
huang e77a891bc6 消息查询语句优化，添加索引 2016-03-21 16:36:25 +08:00
yuanke a10830c90f Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-21 14:40:47 +08:00
ouyangxuhua 4fa1288411 添加组织栏目后，栏目子域名输入框设置为空 2016-03-21 12:29:25 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员，链接使用https://www形式 2016-03-18 16:35:36 +08:00
cxt 74e77bf347 题库的来源排序不可用 
题库的分布时间排序
 2016-03-18 16:23:24 +08:00
cxt fdcd44e240 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:07:43 +08:00
cxt d967a31ec9 课程报500 2016-03-18 16:07:34 +08:00
alan 7d4e0c5d8a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:00:00 +08:00
alan 20cdec0cab Merge branch 'alan_develop' into develop 2016-03-18 15:59:21 +08:00
alan 66d2558f87 修复《issue具体页面样式》 2016-03-18 15:58:23 +08:00
huang 2793a9a874 0 2016-03-18 15:39:39 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
huang 0413eb1c02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:23:53 +08:00
alan 2b07671d95 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:21:01 +08:00
huang 8b09be83e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:18:31 +08:00
huang fc6210eada 资源导入，搜索条件中导入400问题 2016-03-18 15:17:49 +08:00
cxt 9917e802cb 课程推荐的资源统计 2016-03-18 15:15:25 +08:00
cxt e167a28d49 课程推荐的作业统计 2016-03-18 14:59:34 +08:00
ouyangxuhua c64910d343 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt a482b76207 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt dc4a7ee2e6 Merge branch 'cxt_course' into develop 2016-03-18 14:53:43 +08:00
cxt e34f2e45db 管理员界面的课程列表和项目列表分页 2016-03-18 14:53:06 +08:00
ouyangxuhua 5c22b23f3a Merge branch 'develop' into ouyangxuhua 2016-03-18 14:52:51 +08:00
cxt b1f3395bd1 修改作品描述框和名称框的提示文字 2016-03-18 14:45:42 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +08:00
huang bff20ee072 英雄榜数据显示问题 2016-03-18 14:16:23 +08:00
huang 51bd745b8d 课程讨论区限制改成20000 2016-03-18 13:39:28 +08:00
linchun d3635067b7 Merge remote-tracking branch 'remotes/origin/develop' into linchun 2016-03-18 13:01:39 +08:00
linchun 66a7827eb2 组织列表增加分页功能，学校列表调整分页 2016-03-18 12:55:55 +08:00
cxt 24318e3d6b 题库的刷新 2016-03-18 12:47:25 +08:00
linchun f8a88767c0 管理员用户列表增加单位信息 2016-03-18 12:44:16 +08:00
huang 8a8c9bf7c3 注释修改 2016-03-18 12:41:07 +08:00
huang 2fe1100da6 去掉课程使者帖子中时间 2016-03-18 12:34:41 +08:00
huang 888c024e9e 资源库ajax局部刷新 2016-03-18 12:23:59 +08:00
huang 4876e6669a 课程附件局部刷新 2016-03-18 11:04:43 +08:00
cxt 119b12349b 作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交 2016-03-18 10:56:35 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
huang 4766abab7f 下载行为添加ID判断 2016-03-18 09:59:39 +08:00
huang b262e1b432 完成下载行为记录 2016-03-18 09:58:47 +08:00
alan 6f5a4d429d 修改《issue详情页面样式乱了》 2016-03-17 21:17:30 +08:00
cxt 2466184d8a 编辑作业的时候，还要选择作业发布的课程不合理，影响体验 
编辑作业时layout根据来源而不同
 2016-03-17 17:34:29 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +08:00
ouyangxuhua 34d1aef256 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 17:09:04 +08:00
ouyangxuhua 282a720916 私有组织下的资源栏目，没有发送文件功能 2016-03-17 17:08:42 +08:00
huang 4999b47b44 项目去掉ID 2016-03-17 16:46:26 +08:00
cxt c73637a4ca 作业列表按作业发布时间排序 2016-03-17 16:42:10 +08:00
huang 1b0bcd0c05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:37:24 +08:00
huang cefa6efc1b 项目动态中加入附件 2016-03-17 16:36:57 +08:00
cxt b8b34f7861 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:23:47 +08:00
cxt 368c70b14d Merge branch 'cxt_course' into develop 2016-03-17 16:23:38 +08:00
cxt 1489c8d924 课程简介没有内容就不要显示 2016-03-17 16:22:29 +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
cxt 602864bd71 个人主页课程列表: 1、增加学期信息 2、排序不对 2016-03-17 16:17:33 +08:00
cxt 10da3e1e53 题库样式调整 2016-03-17 16:11:04 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +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 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
huang 03597b85ff 解决项目被淹没问题 2016-03-17 16:02:36 +08:00
cxt 0f80f0e377 作品列表：已禁用了匿评的作业就不要显示“匿评截止时间”了 2016-03-17 15:54:10 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
cxt a1f393c117 批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样 2016-03-17 15:21:09 +08:00
cxt 2eefdcd0ee 批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样 2016-03-17 15:17:00 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
alan 8e41b19563 消息列表取消tip 2016-03-17 15:09:08 +08:00
linchun 52af5e4303 修复了管理员界面多个列表的题目问题 2016-03-17 15:05:14 +08:00
cxt a8780be9b4 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
huang 84470af2ff 删除的课程和项目不在发送中显示 2016-03-17 14:47:14 +08:00
alan a4e2fd741e 删除issue，返回页面不变 2016-03-17 14:13:29 +08:00
huang ee40255d7e 资源库bytes改成b 2016-03-17 14:09:13 +08:00
huang 0d1fc409d1 版本库提示同一高度 2016-03-17 13:58:55 +08:00
huang ab3fc0fb2c 成员提供真实姓名 2016-03-17 13:02:32 +08:00
huang c8eb2d9c95 项目、组织添加资源历史版本下载 2016-03-17 12:49:00 +08:00
huang b3faef601b 修复资源库样式问题 2016-03-17 12:43:35 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
ouyangxuhua 805784a858 组织内的链接加上Setting.protocol 2016-03-17 10:52:19 +08:00
huang 0a881f14e8 导入添加自动搜索 2016-03-16 17:06:11 +08:00
alan 4d82f0c959 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》 2016-03-16 16:03:53 +08:00
linchun 34c9f54510 完成了管理员界面学校列表 2016-03-16 15:24:41 +08:00
alan 3b63071dee 修复《issue的展开和收起在属性表格的上面》 2016-03-16 15:12:50 +08:00
ouyangxuhua baf547417e 组织下的链接用Setting.protocol表示协议 2016-03-16 14:57:32 +08:00
huang 064dc81ed6 解决公共资源删除资源后统计数字不减少的问题 
（增加删除回调）
 2016-03-16 13:48:02 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
ouyangxuhua dcadadae03 退出和用户的链接使用https:// +Setting.host_name 2016-03-16 11:24:55 +08:00
alan 050a266985 Merge branch 'FX-alan-message-access-slow' into alan_develop 2016-03-16 11:17:35 +08:00
alan 0ac12f3400 Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop 2016-03-16 11:16:52 +08:00
alan 5343759f2f Merge branch 'FX-alan-search-404' into alan_develop 2016-03-16 11:16:41 +08:00
ouyangxuhua da1b27cd38 Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang 2016-03-16 10:01:42 +08:00
ouyangxuhua 9bac560906 超级管理员有编辑和删除博客的权限 2016-03-16 10:00:21 +08:00
huang 9aab10c05a 代码更新 2016-03-15 17:29:37 +08:00
cxt 2ce2134f0b 浏览器tab的title，显示用户姓名，不是登录名 2016-03-15 17:25:46 +08:00
cxt 879f9a0ad5 对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天 2016-03-15 17:21:12 +08:00
linchun 69ec475752 组织列表时间倒序排列 2016-03-15 16:59:32 +08:00
cxt e97690e2f2 “导入作业”改为“从题库选用” 2016-03-15 16:47:57 +08:00
cxt 90d664bbca 学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。 2016-03-15 16:36:10 +08:00
huang a10475fa65 公共资源删除、新建代码优化 2016-03-15 16:28:35 +08:00
linchun 7d5a5f1de2 完成项目资源列表中的排序（资源大小，上传时间，下载次数） 2016-03-15 16:14:53 +08:00
linchun 3fcf192430 完成了课程资源列表的排序（上传时间，资源大小，下载次数） 2016-03-15 15:59:49 +08:00
huang 22ce591c36 资源库添加搜索过滤 2016-03-15 15:42:20 +08:00
linchun d3ed89d87e sort 2016-03-15 15:23:43 +08:00
ouyangxuhua 70f4bb1c14 Merge branch 'develop' into ouyangxuhua 2016-03-15 14:22:38 +08:00
ouyangxuhua fe0d31d9c4 1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示 2016-03-15 14:17:06 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +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 2a46d60433 组织下的链接的host_name均使用Setting.host_name 2016-03-15 11:19:03 +08:00
huang 5681d329d6 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-15 11:12:24 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
cxt 5476016b79 调整题库高度与资源库一致 2016-03-15 09:47:58 +08:00
linchun 4da8a3828f 用户最新列表单位完成，修改了点击最后两页报错的问题 2016-03-15 09:47:27 +08:00
linchun df4ad9f597 完成管理员界面最近登录列表单位信息 2016-03-15 09:31:35 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00