Commit Graph

12037 Commits

Author SHA1 Message Date
huang 6a9ebb572b 资源库添加上传按钮 2016-01-08 14:51:47 +08:00
huang 6a9dc43d03 版权修改、issue编辑 2016-01-08 14:42:28 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang dd4d687559 修改项目资源附件统计功能 2016-01-08 11:11:11 +08:00
huang fd2197a73d 项目资源库历史数据迁移
搜索功能添加Version类型判断
2016-01-08 11:01:29 +08:00
Tim 125479f671 课程复制样式调整 2016-01-08 10:49:02 +08:00
cxt 2aea4da310 导出的测验成绩列表添加”班级“ 2016-01-08 10:37:10 +08:00
ouyangxuhua 9e286ef8a5 对于当前用户,鼠标经过该用户头像显示详细信息时,有编辑资料按钮 2016-01-08 10:11:47 +08:00
cxt 2d73933f4f 已经删除了的课程还显示在新建作业的发布课程列表中 2016-01-08 09:46:07 +08:00
guange 067f3be598 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 09:42:04 +08:00
ouyangxuhua 178f9e167c 1.申请子域名时,对子域名进行规范,仅能输入字母、数字和下划线;
2.博客主页,添加取消主页按钮;
3.私信只能发送者和接收者能看到
2016-01-08 09:41:56 +08:00
guange 5ebfbc901a at排序按照拼音来 2016-01-08 09:41:12 +08:00
cxt 2de42afdae 开启匿评的提示信息修改 2016-01-08 09:09:57 +08:00
cxt 5e0ee0426a 作业动态的附件放在扣分上面 2016-01-07 17:23:32 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +08:00
ouyangxuhua 539d971901 组织页面也增加项目/课程快捷菜单 2016-01-07 16:37:41 +08:00
cxt 5b234580a8 学生作品列表打开报500 2016-01-07 15:59:51 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态,鼠标经过显示详细信息,并且可以留言、私信等 2016-01-07 15:58:22 +08:00
cxt 1263e4cac0 关联项目的样式修改 2016-01-07 15:33:21 +08:00
cxt 2b75c1e11a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-07 15:29:38 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能 2016-01-07 15:09:09 +08:00
huang 8f7d5c8a35 项目资源库,上传资源类型,创建资源 2016-01-07 14:47:47 +08:00
huang 972f2bfea8 完成项目资源库tag云的查询统计 2016-01-07 10:31:22 +08:00
ouyangxuhua 80668d6a47 增加以下功能:
鼠标经过用户头像时,显示用户的详细信息,并且可以添加/取消关注,可以私信/留言。
2016-01-07 10:10:24 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +08:00
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq
Conflicts:
	app/controllers/organizations_controller.rb
	config/routes.rb
	db/schema.rb
	public/images/hwork_icon.png
	public/stylesheets/new_user.css
	public/stylesheets/public.css
2016-01-06 16:27:42 +08:00
huang b4617e431f 代码格式 2016-01-06 16:22:25 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能;
2.增加私信功能
2016-01-06 16:22:13 +08:00
huang 9464495c19 资源搜索
资源公开私有ajax
2016-01-06 15:58:22 +08:00
huang c4718f992c 项目资源搜索 2016-01-06 11:05:52 +08:00
Tim e9d986b311 课程关联项目样式调整 2016-01-06 11:01:00 +08:00
cxt cf125159f2 关联项目增加提交次数 2016-01-06 10:36:53 +08:00
Tim 17800e8cf2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-06 10:36:28 +08:00
cxt d4d96e66fc Merge branch 'develop' into cxt_course 2016-01-06 10:03:21 +08:00
cxt 0606584edf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-06 09:59:56 +08:00
cxt 50a1344aa3 Merge branch 'szzh' into develop 2016-01-06 09:59:48 +08:00
cxt 244e133803 关联项目的对齐 2016-01-06 09:57:54 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
2016-01-06 09:27:00 +08:00
huang cf32085564 Merge branch 'szzh' into develop 2016-01-05 17:03:51 +08:00
huang 7ee4ff69b3 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
2016-01-05 17:03:10 +08:00
huang f81eea54b1 Merge branch 'develop' into szzh 2016-01-05 17:02:06 +08:00
huang fc55be78c6 博客列表展开/ 2016-01-05 17:01:41 +08:00
ouyangxuhua a81eb5cbc8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-05 16:55:38 +08:00
ouyangxuhua dab3f0d225 为组织1添加子域名:team 2016-01-05 16:55:21 +08:00
huang 738acad211 展开、收缩 2016-01-05 16:52:34 +08:00
cxt 9ccca401f6 匿评时也显示系统测试情况 2016-01-05 16:47:55 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态,评分设置弹框不能关闭 ”的问题;
2.组织申请子域名功能。
2016-01-05 16:46:06 +08:00