Commit Graph

983 Commits

Author SHA1 Message Date
sw 1c4ca0c913 导航栏进入课程、项目、个人主页新打开一页 2015-06-03 14:33:53 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
alan 70330f0f4b Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
	app/views/layouts/_user_project_list.html.erb

Signed-off-by: alan <547533434@qq.com>
2015-06-01 10:42:18 +08:00
alan 3967b632b5 去除导航的缓存
Signed-off-by: alan <547533434@qq.com>
2015-06-01 10:41:23 +08:00
guange 0eace6e598 cached导致的个人项目列表问题 2015-05-29 18:42:22 +08:00
sw a562cc7409 Merge branch 'dev_hjq' into szzh 2015-05-29 16:12:50 +08:00
huang d6aeb5b0e7 Merge branch 'szzh' into dev_hjq 2015-05-29 14:52:24 +08:00
alan 98f38b0a5b Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-05-28 16:34:56 +08:00
huang e2ec7d5f3e QQ在线支持功能 2015-05-28 15:45:36 +08:00
alan f47d30f22a 项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
2015-05-28 15:14:38 +08:00
alan 32a6c29c7c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
	Gemfile
	app/views/layouts/base_projects.html.erb
	app/views/projects/_development_group.html.erb
	app/views/projects/_research_team.html.erb

Signed-off-by: alan <547533434@qq.com>
2015-05-27 17:42:25 +08:00
alan 59c77e870c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
	db/schema.rb
	public/javascripts/course.js

Signed-off-by: alan <547533434@qq.com>
2015-05-27 17:01:52 +08:00
huang 8e74712b86 Merge branch 'szzh' into dev_hjq 2015-05-27 16:10:44 +08:00
huang 5af284e8a4 项目资源统计代码优化 2015-05-27 10:43:03 +08:00
sw 1ae8c7d234 作业评分、上传评阅结果,以及上传结果的显示样式 2015-05-26 17:51:56 +08:00
alan 0b6f35055d Signed-off-by: alan <547533434@qq.com> 2015-05-26 17:44:39 +08:00
huang a7aa83be8c module配置未选时候,禁止其它方式的访问
去掉无用文件代码
2015-05-26 16:50:10 +08:00
huang f52058aaf3 课程首页新界面(未完成) 2015-05-26 09:37:29 +08:00
sw faeb06aae8 1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
2015-05-21 15:52:27 +08:00
guange 7b5021c4fd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-21 11:20:12 +08:00
huang e2f0aeb693 公共贴吧--帖子里面搜索错误 2015-05-20 17:32:16 +08:00
sw a7fd5b950d 1、老师新建作业界面,数据i初始化
2、部分help方法添加
2015-05-20 15:05:35 +08:00
sw 7684a6b253 1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
2015-05-19 17:12:43 +08:00
yutao 895058f38e 修复bug#2154:成功上传课件,课程资源数统计未自动刷新 2015-05-19 11:30:31 +08:00
huang d42fd98dff 优化项目类型 2015-05-19 10:10:52 +08:00
guange 1355dc805f 用户界面返回500错误 #2610 2015-05-18 17:31:53 +08:00
huang df48d89881 版本库权限封装
添加admin可以管理资源的公开私有
2015-05-18 17:02:02 +08:00
yutao df24007dbb 修复bug(#2525) :项目--邀请:收起“邀请”下拉框,刷新页面后又自动打开 2015-05-18 11:16:41 +08:00
sw a8e7590b16 Merge branch 'szzh' into guange_dev 2015-05-15 16:13:47 +08:00
sw 06a3ca9fe9 IE浏览器中,课程收索为空时显示不正确 2015-05-15 16:12:46 +08:00
sw 6566a044d2 无工作地点就不显示了 2015-05-15 15:38:38 +08:00
guange 39308dacfd 将setting中的domain合并到host配置中 2015-05-14 21:40:34 +08:00
guange af2c20f666 修复意见反馈不见了的问题 2015-05-14 17:58:56 +08:00
sw c2d11140a1 意见反馈问题 2015-05-14 17:57:00 +08:00
sw dd7140f4fb 意见反馈。内容宽没了 2015-05-14 16:57:49 +08:00
huang 404073d76e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-13 16:25:56 +08:00
huang c148a8a145 私有项目版本库全休修改 2015-05-13 16:24:46 +08:00
guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
#	db/schema.rb
2015-05-13 16:22:44 +08:00
huang 406d608edc 版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
2015-05-13 11:46:19 +08:00
huang 6f3621f6c0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-13 10:27:53 +08:00
huang 6c500109c9 修改项目上传资源 2015-05-13 10:06:04 +08:00
guange 4e6ca53b53 jquery-js找不到报错 2015-05-12 10:12:00 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
alan 79c0c6f551 修改路由跳转
Signed-off-by: alan <547533434@qq.com>
2015-05-11 16:45:03 +08:00
sw 86f686efb3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 14:56:22 +08:00
huang 89ea9ddc7b 项目讨论区代码还原
样式调整
2015-05-08 14:41:57 +08:00
sw 05c26aceb6 发布新贴按钮跳转 2015-05-08 14:27:59 +08:00
huang 30c6a71cbc 修正新建课程讨论区跳转 2015-05-08 11:25:25 +08:00
huang 5167cf374c 项目讨论区左侧新建按钮跳转页面修改
通过传参跳入(JS实现)
2015-05-08 10:56:02 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
2015-05-08 09:15:50 +08:00