Commit Graph

47 Commits

Author SHA1 Message Date
cxt 9e2c381b4a 取消班级设置页面的课程编辑 2016-10-08 11:22:37 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
cxt 2974833533 新建班级页面--创建课程后面,增加: 然后 【刷新】 2016-09-05 14:14:25 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +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
cxt 7ea5d7d934 新建班级页面,提示“如果列表中没有对应的课程,请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
Tim b02c1b5995 提交与取消按钮之间增加间距;新建问卷"选项D"文字折行;日历图标样式调整,问题跟踪日历前input宽度缩减; 2016-07-07 15:08:34 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
cxt eff4780ea9 去掉班级配置页面的自动填充 2016-07-05 14:29:42 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
cxt d9bd13c2fc 复制课程报500 2016-05-25 14:57:46 +08:00
cxt 278139104b 允许老师修改开始学期 2016-02-22 15:09:07 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
huang faf1fcaf22 issue回复局部刷新
附件浏览问题
昵称改成登录名
2016-01-22 17:27:21 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
cxt 605ec52f8a 测验答题失败时提示网络异常 2015-12-29 16:31:19 +08:00
cxt 6bdd6d3e03 课程添加设置菜单,设置页面的信息更改 2015-12-29 10:15:53 +08:00
huang b981f3dcea 修复项目删除403问题
课程回复的时候不显示删除按钮
2015-12-11 15:39:38 +08:00
huang c7b2c9e3af 课程删除功能
admin中课程列表取消删除按钮
2015-12-10 18:59:54 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
lizanle dffabce806 Merge branch 'dev_zanle' into szzh
Conflicts:
	db/schema.rb
2015-11-19 15:03:56 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表,建立相应模型及控制器;
2.在课程设置中,添加加入组中功能;
3.解决添加项目后,组织列表的上一页和下一页链接问题。
2015-11-17 17:34:50 +08:00
lizanle 291868ba43 Merge branch 'szzh' into dev_zanle
Conflicts:
	db/schema.rb
2015-11-17 16:48:03 +08:00
lizanle 0eff2bcb74 课程添加允许学生发布资源的配置 2015-11-17 16:43:50 +08:00
cxt 4adc6deabf 配置课程页面的开课学期不可更改,弹框提醒用户。 2015-11-10 14:18:39 +08:00
cxt a714b10860 阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充 2015-09-16 12:39:08 +08:00
sw ea1a98f8ac 测试版--搜狗浏览器中课程名称显示为当前登录用户的用户名 2015-05-15 16:02:33 +08:00
sw d5e71e9803 增加课程成员收索功能后、添加课程成员,成员列表不自动刷新 2015-04-17 16:38:25 +08:00
huang 7d87915413 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/homework_attach/_homework.html.erb
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-17 15:07:01 +08:00
sw 2db3ab9d13 修改课程时增加密码与课时的验证 2015-04-16 10:56:48 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-16 10:26:03 +08:00
huang 45fa01c773 修改缺陷不能显示的bug 2015-04-09 09:22:09 +08:00
sw ba4894239c 1、部分浏览器下新建课程页面密码默认填写,课时默认填写为登录名
2、修改课程密码显示取消明码显示
2015-04-08 11:29:21 +08:00
sw 98bf8dd494 课程成员列表显示 2015-03-30 11:20:16 +08:00
sw 046536230c 增加课程配置界面、成员的基本信息以及相关js 2015-03-30 10:47:23 +08:00
sw 8374ba1995 配置课程是对齐单选框 2015-03-27 16:05:38 +08:00
sw cb1fce32fe 配置课程 2015-03-26 17:17:31 +08:00
nwb 2f3d9b1795 1.修改资源文件类index方法
2.添加课程资源文件index视图
2014-06-09 14:23:31 +08:00