Commit Graph

13995 Commits

Author SHA1 Message Date
cxt 70910c5238 “我的作业”中不应出现已删除课程的作业 2016-05-04 09:40:18 +08:00
Tim 399f757811 0 2016-05-04 09:01:51 +08:00
huang 39dd62580a 完成2级目录详情页面 2016-05-03 20:08:40 +08:00
huang a9059c4c2e 帖子添加编辑删除功能 2016-05-03 19:32:38 +08:00
yuanke afd176b805 课程项目按更新时间排序 2016-05-03 19:10:04 +08:00
huang 48002eb247 二级目录讨论区添加帖子回复功能 2016-05-03 19:03:28 +08:00
huang d212d4f4c5 Merge branch 'cxt_course' into develop 2016-05-03 18:17:54 +08:00
huang 4489bc13d7 课程列表按创建时间排序 2016-05-03 18:17:03 +08:00
cxt d3e3e9d22b 补交作品的样式 2016-05-03 18:15:40 +08:00
cxt 407af62654 作业动态的分数显示 2016-05-03 18:06:53 +08:00
yuanke 8b672cc7c3 项目、课程列表增加更新时间 2016-05-03 17:57:24 +08:00
cxt bcb02e49d3 课程问答区的名片显示 2016-05-03 17:23:56 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
huang 8446fbe39a Merge branch 'weixin_guange' into develop
Conflicts:
	app/services/wechat_service.rb
	public/stylesheets/weui/weixin.css
2016-05-03 17:14:58 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_course_message.html.erb
2016-05-03 17:12:38 +08:00
cxt ada4407e63 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
huang 0e46d0ac27 二级域名中帖子回复功能 2016-05-03 17:11:08 +08:00
huang 5fb5a2e8bc 二级域名帖子列表两种形式区分 2016-05-03 16:49:13 +08:00
yuanke 96e7c9d134 新闻排序时间改为更新时间 2016-05-03 16:34:31 +08:00
txz de8b303b93 微信数据请求时显示加载中 2016-05-03 15:37:35 +08:00
cxt 55297a9daf 统一作业动态中项目的更新时间与tip中的更新时间 2016-05-03 15:19:22 +08:00
cxt c49627913b 更改评分设置中的教师优先,评分未更新 2016-05-03 15:12:56 +08:00
huang 6635ded1e8 组织base中添加二级域名 2016-05-03 14:55:08 +08:00
yuanke 5f24fb6496 锁的样式修改 2016-05-03 14:40:33 +08:00
yuanke 2468010125 课程、项目列表修改 2016-05-03 14:30:35 +08:00
cxt 8ccedaa622 通知详情添加点赞 2016-05-03 14:13:01 +08:00
cxt 14a539bd0a 样式冲突 2016-05-03 11:40:24 +08:00
huang 517db8f105 组织二级域名弹框 2016-05-03 11:24:39 +08:00
yuanke d5805e8103 课程、项目列表不显示已删除的 2016-05-03 11:24:16 +08:00
cxt 151661830f 微信模板消息的样式 2016-05-03 11:03:34 +08:00
cxt 6b1137980e 挂起的作业编辑截止日期后报500 2016-05-03 10:58:49 +08:00
cxt 39c2365338 已拒绝的私有作业不可引用 2016-05-03 10:15:09 +08:00
cxt 3f7a391214 课程和项目的排序 2016-04-29 20:45:14 +08:00
cxt 1cad1626e0 解决冲突 2016-04-29 20:31:31 +08:00
guange 483f99f401 注释掉profile的GEM 2016-04-29 20:09:42 +08:00
cxt 2ca77d26b6 作业列表报500 2016-04-29 19:49:09 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
cxt 0bb6d42c80 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-29 19:22:08 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
cxt b0988dc950 Merge branch 'cxt_course' into develop 2016-04-29 17:57:32 +08:00
cxt 389b75f7ab 申请引用私有作业时发送消息 2016-04-29 17:55:57 +08:00
huang 14335d5da3 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
	app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
2016-04-29 17:14:12 +08:00
huang 90a285b35e base中添加二级目录 2016-04-29 17:13:09 +08:00
Tim 56a4a64d09 北斗详情翻页更改;位置超出省略号 2016-04-29 17:09:15 +08:00
cxt 8f3b9ae9fe 动态的? 2016-04-29 16:54:48 +08:00
huang 84ae444880 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 16:53:02 +08:00
cxt d7789b7739 迁移文件 2016-04-29 16:48:11 +08:00
Tim 0d3c79eb12 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 16:47:32 +08:00
Tim 1f87d105d0 添加二级目录弹窗,翻页css 2016-04-29 16:47:06 +08:00
cxt f62b6c4c31 提交 2016-04-29 16:45:15 +08:00