Commit Graph

12178 Commits

Author SHA1 Message Date
ouyangxuhua 38a87a04ba 1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag,增加“双击可编辑”的tips 2016-01-27 15:50:31 +08:00
ouyangxuhua 85c2d69800 Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
Conflicts:
	app/views/issues/show.html.erb
2016-01-27 15:34:45 +08:00
ouyangxuhua 135cb410bc 1.解决资源过滤中资源总数与资源统计数不一致的问题;2.对栏目的子目录名进行限制,不能是members setting org_document_comments,因为这会引起路由冲突 2016-01-27 15:29:15 +08:00
ouyangxuhua 89a919163c 一旦组织私有,就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua f3dcd4ed09 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-26 10:59:44 +08:00
ouyangxuhua 63d1d3a8e7 项目动态中,只要是项目成员就显示编辑issue多属性界面 2016-01-26 10:59:28 +08:00
ouyangxuhua dda64245b3 解决以下问题:1.编辑个人首页后,返回至个人动态;2.个人名片中,正确显示个人信息;3.同意申请子域名后,显示已同意申请。 2016-01-26 10:35:54 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
Tim f099611d7a 问题跟踪样式更改 2016-01-25 11:25:43 +08:00
cxt 12f55f039c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-25 10:16:43 +08:00
cxt 4465e93dae 最近登录报500 2016-01-25 10:16:33 +08:00
huang 154417378e 精品课程默认推荐 2016-01-24 10:58:58 +08:00
huang 49d0d214de 精品课程默认排序 2016-01-24 08:48:38 +08:00
cxt 21bdbe98a9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 22:37:58 +08:00
cxt d386b2ff84 留言页面的“展开更多” 2016-01-22 22:37:47 +08:00
huang 8df6789cf4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 22:35:57 +08:00
huang dfb8a3afbf 数据迁移 2016-01-22 22:35:47 +08:00
cxt f632a3d4fb 编程弹框固定位置 2016-01-22 22:17:52 +08:00
huang 49fd2fc41f Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 22:06:43 +08:00
cxt 8f1bffd28b 留言不能为空 2016-01-22 21:53:32 +08:00
huang 83ff449946 项目、课程资源 浏览 改成 上传文件 2016-01-22 21:51:31 +08:00
cxt 435f81a422 关联项目的更新时间 2016-01-22 21:47:59 +08:00
cxt 4b25383531 学生列表的tip被遮盖 2016-01-22 21:42:05 +08:00
cxt bbdced9bc1 留言页面的样式修改 2016-01-22 21:41:17 +08:00
cxt 4530e7896a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:55:31 +08:00
cxt 8a2a1d2bc9 Merge branch 'szzh' into develop 2016-01-22 20:55:18 +08:00
cxt fc0b589760 Merge branch 'cxt_course' into szzh 2016-01-22 20:54:14 +08:00
huang b3caa01540 修改课程作业链接 2016-01-22 20:45:25 +08:00
huang 655cc0d2db issue截止时间邮件通知 2016-01-22 20:26:44 +08:00
cxt 3de8687440 留言页面的动态内容不生成链接,留言回复的样式更改 2016-01-22 20:11:49 +08:00
huang 29c49fbb0c Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:03:13 +08:00
huang f2d93c0b72 修改issue编辑权限 2016-01-22 20:02:18 +08:00
ouyangxuhua 4b183c2928 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 19:50:01 +08:00
ouyangxuhua afad062b80 设置资源栏目、项目资源、课程资源的title,不显示Files 2016-01-22 19:49:05 +08:00
huang 007afa8c4f issue在动态中回复自动刷新 2016-01-22 19:34:02 +08:00
huang 19bb545993 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 18:49:28 +08:00
cxt c4a264f8a6 提交作品时的附件显示 2016-01-22 18:48:50 +08:00
huang 16cb4add09 issue局部刷新属性问题 2016-01-22 18:48:40 +08:00
ouyangxuhua 26f8500671 博客回复后,该博客的更新时间为当前时间 2016-01-22 18:42:50 +08:00
cxt 6ae7da99be 帖子、博客、通知、文章详情页面的单词折行 2016-01-22 18:33:43 +08:00
ouyangxuhua 2d07801f52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 18:10:50 +08:00
ouyangxuhua dbed8379d3 新建组织允许游客下载选项功能修复 2016-01-22 18:10:32 +08:00
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库
精品课程数据迁移
2016-01-22 18:00:01 +08:00
cxt f3a956a336 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:34:43 +08:00
cxt bb67a8f77d 若测试集够长,点击增加测试集,此时应该自动定位到测试集输入框 2016-01-22 17:34:35 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
huang 18ea59fc83 Merge branch 'szzh' into develop 2016-01-22 17:29:59 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
cxt a96d8ce5a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:29:29 +08:00