Commit Graph

434 Commits

Author SHA1 Message Date
daiao a8a7029746 班级资源库,资源描述输入非汉字类型过长时,对学生成员只显示一行内容 2016-11-09 16:26:50 +08:00
daiao 3d2d526149 新建和编辑ISSUE,上传附件名称显示问题 2016-11-07 15:21:00 +08:00
Tim 10e644f9be 项目资源库描述折行问题 2016-10-31 15:12:59 +08:00
Tim 1738fee99f 资源库宽度扩展 2016-10-25 09:30:40 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
2016-10-19 11:27:49 +08:00
Tim bde2f6b65d 项目上传资源弹框样式js控制;更新版本弹框资源名长度控制 2016-10-15 16:45:41 +08:00
Tim ee03cda8a6 班级资源库弹窗样式及位置js控制 2016-10-15 15:34:33 +08:00
Tim 0c481de79d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 13:41:45 +08:00
Tim bc37d09edf 更新资源版本title长度限制 2016-10-15 13:41:33 +08:00
huang 8005958f03 删除版本刷新 2016-10-15 12:35:36 +08:00
huang 6dbb50f803 确定按钮变成手型 2016-10-15 11:34:06 +08:00
huang 50ba2fb04f 多个历史版本和没有历史版本删除附件提醒 2016-10-15 11:31:15 +08:00
huang da7de2c2a2 更新版本中隐藏删除 2016-10-15 11:12:12 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
2016-10-15 10:53:01 +08:00
huang f1e4628e75 组织添加历史版本删除功能 2016-10-15 09:17:47 +08:00
huang 3db29cd40b J解决重复提交问题 2016-10-14 21:10:58 +08:00
huang 3a1ab607fa 附件重复提交问题 2016-10-14 20:25:14 +08:00
huang 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
Tim 7f7f786aa0 资源库描述文字折行 2016-10-14 16:59:50 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality
Conflicts:
	public/stylesheets/css/project.css
2016-10-14 15:43:45 +08:00
huang 0c137515c1 项目、组织存在历史版本一键删除功能 2016-10-14 15:08:29 +08:00
huang 333c9c6db0 项目历史版本一键删除功能 2016-10-14 15:01:22 +08:00
huang b408b6ef97 组织历史版本删除功能 2016-10-14 14:46:48 +08:00
huang 4646f20bba 项目版本库历史版本删除功能及弹框样式 2016-10-14 14:28:51 +08:00
huang db63a5514d 项目资源库历史版本更新及局部刷新 2016-10-14 13:45:47 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
2016-10-13 17:00:53 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
2016-10-13 14:37:37 +08:00
huang 227965aafe 新版base完成 2016-10-11 10:16:17 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
cxt 9bfb749e70 班级资源库的课内搜索改成班内搜索 2016-09-26 10:17:45 +08:00
daiao 984b540a63 游客身份,进入具体的班级和项目各功能入口的调整 2016-09-19 10:01:22 +08:00
huang 2c03bfbf3a 资源提示权限控制 2016-09-02 16:51:05 +08:00
huang 3881e5c5c5 资源搜索的是时候tip局部刷新
组织资源更新公开私有问题
2016-09-02 14:50:06 +08:00
huang 2e36cf6d6a 课程资源库添加资源提示及 2016-09-02 12:12:26 +08:00
huang fa25a78f62 项目资源库 添加私有资源提示及局部过滤刷新 2016-09-02 11:27:35 +08:00
huang efa162fdeb 项目隐藏之组织资源发送 2016-09-01 11:16:09 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
huang 8c4f943f83 注释掉资源提示 2016-08-26 19:33:18 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
huang af68f4ca76 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
	app/views/files/_course_file.html.erb
	app/views/files/_project_file.html.erb
2016-08-26 16:27:14 +08:00
huang a71f948f41 项目、课程资源库添加私有资源提示 2016-08-26 16:26:12 +08:00
Tim 3f7c623163 新增资源提示框 2016-08-26 15:57:45 +08:00
daiao 90803fbb2a Merge branch 'dev_shcool' into develop 2016-08-24 14:53:31 +08:00
daiao 5088770214 修复:文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +08:00
huang 93f8ac31f1 项目资源库新分页及ajax刷新 2016-08-13 14:17:50 +08:00
huang ce9c2d3d06 搜索的时候分页刷新 2016-08-12 17:25:20 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
huang 047eea125d 课程资源分页及局部刷新 2016-08-12 17:05:46 +08:00
Tim 59a76c3b9a 调整组织上传资源弹窗位置 2016-08-11 10:47:22 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz
Conflicts:
	app/views/versions/index.html.erb
2016-07-18 14:32:17 +08:00