Commit Graph

17087 Commits

Author SHA1 Message Date
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
Tim a8ca2e136c Merge branch 'develop' into cs_optimize_txz 2016-10-12 16:47:12 +08:00
Tim 72189cda48 Merge branch 'develop' into dev_newproject 2016-10-12 16:41:22 +08:00
daiao 4093847017 Merge branch 'develop' into dev_newproject 2016-10-12 16:29:14 +08:00
daiao b925ee312e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 16:28:02 +08:00
daiao 9b5999eed1 项目Issue列表功能 2016-10-12 16:27:50 +08:00
huang 50f9c5244d 项目配置--版本库代码简化及界面 2016-10-12 16:09:17 +08:00
Tim af4ace1319 将匿评和分数提示弹框在右侧固定位置显示 2016-10-12 16:00:10 +08:00
huang fabe6bd999 项目配置过短的时候JS控制底端留白 2016-10-12 14:38:46 +08:00
huang 2126364a19 新版项目配置及JS 2016-10-12 14:13:52 +08:00
cxt 399b982e0d 問卷 2016-10-12 13:34:09 +08:00
huang 7800ba9701 项目动态头部 2016-10-12 11:09:41 +08:00
huang 57d1397597 版本库界面优化(未完) 2016-10-12 10:45:14 +08:00
Tim c693afdee8 project.css去重,提取到public.css 2016-10-11 17:26:36 +08:00
Tim 0b93d196d2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-11 14:59:04 +08:00
Tim 005cd09d4a 大纲中按钮样式移到common.css中;project.css中部分样式去重;翻页去掉灰色边线;大纲项目公用样式提取到public.css中 2016-10-11 14:58:50 +08:00
cxt a581f989c9 给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id,优化平台的回复 2016-10-11 14:08:44 +08:00
huang a206a471af Merge branch 'dev_newproject' into dev_newrep
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/base_projects.html.erb
2016-10-11 10:58:37 +08:00
huang dd452f9efe Merge branch 'dev_daiao_temp' into develop 2016-10-11 10:32:26 +08:00
huang 7e0a5952f2 issue列表新界面 2016-10-11 10:24:38 +08:00
huang 227965aafe 新版base完成 2016-10-11 10:16:17 +08:00
huang 3c15c4f315 版本库权限,及项目收藏用户列表 2016-10-11 10:03:00 +08:00
daiao 61b07e3f13 资源库,公有资源/我的资源中,根据大小,下载数,上传时间排序时,箭头样式不对 2016-10-11 09:53:27 +08:00
huang 188db13c33 项目导航权限判断 2016-10-11 09:31:17 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
cxt 405e2cfb9b 问卷单选题 2016-10-11 08:51:00 +08:00
daiao 850a88c6b0 组织帖子,回复有时不可用 2016-10-10 17:31:39 +08:00
cxt c06e2bf4c6 新建班级 2016-10-10 15:43:30 +08:00
cxt 5a725dd074 去掉公共贴吧为空时的提示信息 2016-10-10 15:39:53 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
yuanke 163abb70de 课程搜索只能搜索title 2016-10-10 14:00:10 +08:00
huang 17743457e1 项目menu导航 2016-10-10 10:41:41 +08:00
yuanke b94553edcd 搜索修改及代码优化 2016-10-10 09:38:21 +08:00
huang bd29a637b6 新版项目 2016-10-09 17:24:37 +08:00
cxt 4de0105d99 问卷头部的修改 2016-10-09 17:05:32 +08:00
daiao 41ee915ece 数据为空时,帮助中心,问题和建议报500 2016-10-09 16:55:41 +08:00
cxt 9f72539845 本地版新建班级报500 2016-10-09 16:11:34 +08:00
yuanke 9ca685ea94 搜索课程 2016-10-09 16:10:33 +08:00
cxt 2cc2d8e562 课程班级列表的“加入班级”样式调整 2016-10-09 16:05:36 +08:00
yuanke c4de8cf948 调试 2016-10-09 16:00:41 +08:00
cxt 38589641a3 删除未命名的问卷 2016-10-09 15:44:16 +08:00
huang acb6fcfc81 Merge branch 'develop' into dev_newrep 2016-10-09 15:36:49 +08:00
huang 125a389448 数据为空的时候“帮助中心”500问题 2016-10-09 15:33:22 +08:00
yuanke 85e0a1df67 搜索课程 2016-10-09 15:20:52 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
yuanke 5d5306dede 搜索课程 2016-10-09 15:05:50 +08:00
yuanke fdcb13a3de 搜索 2016-10-09 13:57:27 +08:00
yuanke 11edc93c0f 搜索课程 2016-10-09 13:48:38 +08:00
huang d827b3e519 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-09 13:44:46 +08:00
huang 5f1458483c 修改attachment字段类型,解决字段长不能上传的问题 2016-10-09 13:44:32 +08:00