Commit Graph

11799 Commits

Author SHA1 Message Date
huang dc90976497 项目资源库添加 “发送”功能 2016-01-08 17:09:32 +08:00
huang 57af22e3af 项目资源库tag增、删、改ajax 2016-01-08 16:30:04 +08:00
huang 6a9ebb572b 资源库添加上传按钮 2016-01-08 14:51:47 +08:00
huang 6a9dc43d03 版权修改、issue编辑 2016-01-08 14:42:28 +08:00
huang dd4d687559 修改项目资源附件统计功能 2016-01-08 11:11:11 +08:00
huang fd2197a73d 项目资源库历史数据迁移
搜索功能添加Version类型判断
2016-01-08 11:01:29 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
huang 8f7d5c8a35 项目资源库,上传资源类型,创建资源 2016-01-07 14:47:47 +08:00
huang 972f2bfea8 完成项目资源库tag云的查询统计 2016-01-07 10:31:22 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +08:00
huang b4617e431f 代码格式 2016-01-06 16:22:25 +08:00
huang 9464495c19 资源搜索
资源公开私有ajax
2016-01-06 15:58:22 +08:00
huang c4718f992c 项目资源搜索 2016-01-06 11:05:52 +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
huang 2efcb5b89a 课程讨论区添加展开、收缩 2016-01-05 16:05:27 +08:00
huang dc77eb6ef6 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-05 15:59:30 +08:00
huang be218baa52 添加迁移:项目讨论区数据重复问题 2016-01-05 15:59:13 +08:00
cxt 0a2d2a539f 关联项目的组长名字加个title 2016-01-05 15:46:41 +08:00
Tim 06fa32f0e2 博客高度控制 2016-01-05 15:23:37 +08:00
cxt c4886306d4 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-05 15:05:51 +08:00
cxt 94eaf608c3 Merge branch 'cxt_course' into szzh 2016-01-05 15:05:39 +08:00
huang 428eb018a3 隐藏注册中“组织一列” 2016-01-05 15:02:39 +08:00
huang 1f09817e4d 增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
2016-01-05 12:59:59 +08:00
guange 1b177a8498 默认禁用自动高度 2016-01-05 11:55:30 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +08:00
huang 81bb35ac49 项目资源库 资源列表 2016-01-05 10:01:56 +08:00
huang ce085a23b0 Merge branch 'develop' into hjq_new_course 2016-01-04 17:08:42 +08:00
huang 0d6ad9ffac 修改课程删除后可以显示的问题 2016-01-04 17:08:15 +08:00
huang 470f45becd 课程讨论区(未完) 2016-01-04 17:05:32 +08:00
guange d2c7d12cd9 merge 2016-01-04 15:53:56 +08:00
guange 8ea9430318 at链接问题修改 2016-01-04 15:51:24 +08:00
huang b79a50ce2f issue回复添加附件 2016-01-04 12:33:43 +08:00
cxt 3ddbeae100 课程的“更多”模式的文字不用粗体 2016-01-04 11:32:48 +08:00
cxt a4a29b0ee9 关联项目的文字样式调整 2016-01-04 11:26:42 +08:00
cxt 28d491495a Merge branch 'develop' into cxt_course 2016-01-04 11:25:43 +08:00
huang 9e87e63b82 系统消息去掉附件 2016-01-04 10:36:27 +08:00
huang 3394af7ad5 Merge branch 'develop' into hjq_new_course 2016-01-04 10:29:13 +08:00
cxt 7f751cfc63 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-31 17:58:59 +08:00
cxt 4d4e91c358 Merge branch 'szzh' into develop 2015-12-31 17:58:51 +08:00
huang 11444f43f0 解决issue多附件,删除一个附件后,提交弹出白色框框的问题 2015-12-31 17:55:48 +08:00
cxt 6b5341805e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 17:54:04 +08:00
cxt f0216cf604 Merge branch 'cxt_course' into szzh 2015-12-31 17:53:52 +08:00