Commit Graph

1889 Commits

Author SHA1 Message Date
sw 5640eae39b 删除课程成员 2015-03-30 15:59:57 +08:00
sw ed02959e00 修改成员角色 2015-03-30 15:57:10 +08:00
sw 2af071a92e 课程添加成员后js提示 2015-03-30 14:55:41 +08:00
sw 98bf8dd494 课程成员列表显示 2015-03-30 11:20:16 +08:00
sw 72d683bdb7 加入课程与退出课程js刷新 2015-03-27 19:50:01 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
2015-03-27 18:17:46 +08:00
sw 21db854adb Merge branch 'develop' into szzh 2015-03-27 17:45:08 +08:00
z9hang ef7949584c 课程资源tag点击报错问题,回退后删除无效问题 2015-03-27 15:02:13 +08:00
sw 9af60424c2 去除错误代码 2015-03-27 14:14:11 +08:00
sw b9031095d4 Merge branch 'szzh' into sw_new_course
Conflicts:
	Gemfile
	app/controllers/courses_controller.rb
	app/views/attachments/_form.html.erb
	app/views/attachments/_form_course.html.erb
	app/views/files/_attachement_list.html.erb
	app/views/layouts/base.html.erb
	app/views/layouts/base_projects.html.erb
	config/locales/zh.yml
	public/javascripts/attachments.js
2015-03-27 14:13:49 +08:00
z9hang 61b220c913 课程资源库删除资源tag失效问题 2015-03-27 11:28:27 +08:00
sw fcbcdffa44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	public/stylesheets/courses.css
2015-03-27 09:33:41 +08:00
z9hang ddecd61926 课程资源添加标签时无样式问题 2015-03-26 20:17:47 +08:00
sw cba678a357 课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
2015-03-26 19:01:22 +08:00
sw ed92faaedd 关闭课程与重开课程js 2015-03-26 18:12:24 +08:00
sw 0d04eb745f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 17:18:27 +08:00
z9hang 35eb7e80af 讨论区留言分页 2015-03-26 16:17:33 +08:00
lizanle 5f203ec8c0 新建论坛或者回复,如果传图了,要更新资源的owner 2015-03-26 16:08:31 +08:00
z9hang 57dad3f3c7 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 15:55:21 +08:00
z9hang 8ef9779b46 修正课程讨论区样式。修正项目讨论区被影响的样式 2015-03-26 15:55:07 +08:00
sw 53eef164c9 新建课程时layout修改 2015-03-26 15:12:14 +08:00
sw 2bb7153131 去掉作业打包下载功能 2015-03-26 14:17:26 +08:00
sw ab7d12e514 1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
2015-03-26 11:30:00 +08:00
whimlex 4de0255ce6 邀请邮件国际化;js冲突 2015-03-26 10:45:14 +08:00
sw cfe487e217 搜素学生后内容清空 2015-03-26 10:25:54 +08:00
sw ab3a3a8573 学生收索功能 2015-03-25 20:38:07 +08:00
sw 92808fe8ea 完成学生列表界面 2015-03-25 20:13:48 +08:00
sw 5f41c92cb3 学生列表界面静态显示 2015-03-25 16:21:47 +08:00
guange 4b636d8be6 #1801 打包上传分个数下载完成 2015-03-25 13:13:09 +08:00
guange 15accd7d9f 下载功能优化, 功能已实现 2015-03-25 10:41:42 +08:00
z9hang be46142b3c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	public/javascripts/course.js
2015-03-24 17:14:08 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +08:00
sw 2ef10e89ac Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 17:01:19 +08:00
sw f5059147d2 修改学生提交作业界面的layout 2015-03-24 14:11:27 +08:00
sw c4cd61c71b 修改学生提交作业界面的layout 2015-03-24 10:02:38 +08:00
sw 0496c33378 添加部分方法的注释 2015-03-24 09:28:35 +08:00
z9hang a2ec9c661a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 08:43:54 +08:00
sw 584dcabeaa 修改学生作业列表弹出框不正确 2015-03-23 20:36:52 +08:00
sw 221276ba1f 增加老师布置作业学生访问的列表 2015-03-23 20:30:38 +08:00
sw 0408cc5150 去除无用代码 2015-03-23 20:01:09 +08:00
sw 37bd338311 1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
2015-03-23 19:55:29 +08:00
z9hang cb278e65a2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
	public/javascripts/course.js
	public/stylesheets/courses.css
2015-03-23 17:49:18 +08:00
sw 5139ac30dc 修改老师新建作业界面 2015-03-23 17:18:58 +08:00
z9hang aaf14d5d1a 修改课程通知页面 2015-03-23 16:53:04 +08:00
huang dc0c9417e3 修改新提交的作业显示在前面 2015-03-21 10:19:58 +08:00
z9hang 5278d4dd2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 11:37:22 +08:00
z9hang 4ca5687b3b #2072测试版--项目--问题跟踪:成功新建问题后建议提示信息为“问题已创建”就好 2015-03-20 11:37:09 +08:00
lizanle cdad43fdfc Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-20 11:08:47 +08:00
lizanle a4567396e4 如果没有上传图片就会报空指针 2015-03-20 11:08:27 +08:00
sw 0c4f88ca29 Merge branch 'szzh' into guange_dev 2015-03-19 17:43:56 +08:00