jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,996 Commits 98 Branches 0 Tags 0 B
Commit Graph

13996 Commits

Author SHA1 Message Date
huang 7759670fa1 Merge branch 'yuanke' into develop 
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
 2016-05-13 11:39:01 +08:00
huang 2d701b7d03 Merge branch 'cxt_course' into develop 2016-05-13 11:34:39 +08:00
yuanke a1323e3d76 表格问题 2016-05-13 11:32:52 +08:00
huang 343e9d9434 修改日志分割关闭 2016-05-13 11:32:50 +08:00
Tim 21a56509fc Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 11:30:08 +08:00
huang 457bac0b9d 0 2016-05-13 11:30:49 +08:00
Tim 61470c9bd4 名师榜css样式添加 2016-05-13 11:29:45 +08:00
huang 7bd047f7e4 组织模式二中名师榜样式 2016-05-13 11:25:05 +08:00
huang f7a888ac3d 名师默认创建 2016-05-13 11:11:09 +08:00
cxt 979598f334 课程问答区帖子的发送防止连续提交 2016-05-13 11:06:47 +08:00
cxt 17497cd74e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-13 10:57:54 +08:00
cxt 345e1c0a48 评分的回复连续点击多次防止提交多次表单 2016-05-13 10:57:45 +08:00
cxt f1821e54e1 通知和新闻详情页面的回复点击多次不会提交表单多次 2016-05-13 10:56:48 +08:00
huang 61803aa696 删除名师榜的时候局部刷新 2016-05-13 10:54:33 +08:00
huang e8d76f449f Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 10:50:47 +08:00
huang 1673ae451b 名师榜新增一个后就不能再新增 2016-05-13 10:50:34 +08:00
Tim 51a6727b07 名师榜样式 2016-05-13 10:41:13 +08:00
Linda aec7366594 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-13 10:31:12 +08:00
Linda a2418396dd 邦本库zip下载样式界面 2016-05-13 10:30:38 +08:00
huang 83ac35cc94 不同的组织定制是否允许设置名师榜 2016-05-13 10:29:22 +08:00
cxt cc92105da9 作品列表添加序号及样式调整 2016-05-13 09:58:24 +08:00
huang 37ee03374e 完成设置名师功能 2016-05-13 09:53:22 +08:00
yuanke c31d4dc3bd 我要回复字不消失 2016-05-13 09:19:47 +08:00
yuanke 6237bcb6cd 加个gem 'certified' 2016-05-13 09:10:08 +08:00
yuanke a39702f962 图片自动上传，代码测试编译错误过长。 2016-05-13 08:38:28 +08:00
cxt f74e5eb6ae Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:49:13 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
Tim 2ac201ffdd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-12 17:41:42 +08:00
Tim 565d5e3bcc 作业测验列表html代码重构，添加序号列 2016-05-12 17:41:27 +08:00
cxt 8af0459519 首页动态中不应出现已删除的课程动态 2016-05-12 16:56:50 +08:00
cxt 582c305a47 申请引用过的作业在课程删除后不应该在申请题库中显示 2016-05-12 16:29:39 +08:00
huang 2be8e64748 内容和查看更多重复问题 2016-05-12 16:00:23 +08:00
cxt d4c1f27533 私有作业请求分享时，强制要求写请求分享的说明文字 2016-05-12 15:29:20 +08:00
huang ad2f12c9d0 名师列表搜索功能 2016-05-12 15:02:23 +08:00
cxt ac5a9c87ac 消息通知中的“同意|拒绝”调整宽度 2016-05-12 14:59:12 +08:00
cxt ca5f03f2ea 作业回复的消息通知，评阅作品的消息通知修改 2016-05-12 14:13:34 +08:00
cxt 7761bd5313 微信模板消息的“有新缺陷了”改成“有新的问题动态了” 2016-05-12 10:49:12 +08:00
cxt b3782c5d0c 合并代码 2016-05-12 10:47:07 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
cxt f4b8f2c794 学生追加附件发送消息 2016-05-12 10:29:43 +08:00
cxt 9ec488684b 分享申请的消息更改 2016-05-12 09:30:06 +08:00
huang 922958e732 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-11 16:23:58 +08:00
huang 3dde8bd25a Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-11 16:21:17 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
Tim b649882a23 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-11 15:52:09 +08:00
Tim 7957beb64a 发送至按钮样式控制 2016-05-11 15:51:59 +08:00
cxt fdefbf3795 作品打分连续点击不会多次提交 2016-05-11 15:31:33 +08:00
cxt 9096ad5eac 数据迁移的还原 2016-05-11 15:06:12 +08:00
cxt 2d95885345 迁移文件 2016-05-11 15:00:26 +08:00
cxt d4a35b94f6 导出的作品成绩保存为数字格式 2016-05-11 14:51:49 +08:00