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

10531 Commits

Author SHA1 Message Date
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