Commit Graph

147 Commits

Author SHA1 Message Date
yuanke 55afb84aef 模版消息标题加上句号,审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
yuanke 12a9c95c01 微信项目及班级邀请码相关BUG修改 2016-08-04 14:07:35 +08:00
yuanke 17c98eb9fe 微信分享修改 2016-08-04 09:08:18 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
yuanke 614e877e6e 微信项目和班级加入修改 2016-08-02 15:50:15 +08:00
cxt 98a2ebd682 Merge branch 'cxt_course' into develop 2016-07-29 21:54:33 +08:00
cxt b3d34d6e0f 配置班级列表的名称显示全 2016-07-29 20:18:26 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
2016-07-29 19:39:42 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
yuanke cf65e6748b 微信项目相关功能开发,班级角色功能等 2016-07-28 14:49:45 +08:00
yuanke 4fe60bfc97 微信课程角色修改 2016-07-27 14:56:41 +08:00
yuanke 653b98d832 微信增加项目相关内容 2016-07-27 14:30:19 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/base_syllabus.html.erb
2016-07-22 16:46:01 +08:00
yuanke 86731c34d5 单个课程作业不显示的BUG修改,加入班级时如果班级已被删除需要提示! 2016-07-21 15:21:09 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
2016-07-21 14:31:43 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复, 二级回复代码的整合 2016-07-20 17:00:18 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改,我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
yuanke 596bfe4bfc 邀请码分享问题修改 2016-07-15 19:08:05 +08:00
yuanke b8c8b2c4ae 修改加入班级的提示 2016-07-15 09:48:10 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
yuanke 4c39dcc677 微信:修改班级下有挂起作业所有作业都不显示的BUG,将班级下作业、测验发送按钮屏蔽 2016-07-14 17:39:22 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
guange b010ce2e61 发送课程完成 2016-07-02 23:46:45 +08:00
yuanke 70e26927cb 班级中的课程字样改为班级 2016-07-01 20:38:33 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-07-01 11:30:24 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
cxt 383483de26 课程大纲的左侧栏base,新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
cxt 0611ddcc43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/users/_reply_to.html.erb
2016-06-24 16:54:19 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
guange 657e506071 . 2016-06-24 15:45:50 +08:00
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:36:03 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
guange fc5895e74f . 2016-06-22 17:02:33 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
cxt c6d203d186 低版本的谷歌浏览器无法修改课程密码 2016-02-23 15:51:33 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
cxt 17aeff1587 复制学期时密码修改无效 2016-01-08 16:20:14 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
lizanle 34a2c2c90d 课程创建属性添加 是否允许学生上传资源 2015-11-19 15:13:34 +08:00
lizanle 0eff2bcb74 课程添加允许学生发布资源的配置 2015-11-17 16:43:50 +08:00
lizanle e9a0334ab1 Merge branch 'szzh' into dev_zanle 2015-11-03 17:41:25 +08:00
lizanle 4ffafff7c4 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/services/courses_service.rb
2015-11-03 17:34:59 +08:00
lizanle 8ffbe8f300 course manager can not apply to join that course 2015-11-03 11:42:33 +08:00
lizanle ae6fe6f9a7 申请加入课程,允许身份覆盖 2015-10-30 15:55:48 +08:00
ouyangxuhua 1963434242 解决搜索课程后,点击加入按钮无反应的bug 2015-10-29 16:35:23 +08:00
lizanle 348a4df8d8 合并出错 2015-10-27 14:31:46 +08:00