binling
/
trustieforge
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,034 Commits 86 Branches 0 Tags 114 MiB
Commit Graph

792 Commits

Author SHA1 Message Date
huang c88d214bb9 处理冲突 
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_cache

Conflicts:
	app/views/courses/_course_activity.html.erb
	app/views/courses/_course_heroes.html.erb
	app/views/users/_message_contents.html.erb
 2016-12-12 16:38:15 +08:00
huang 6fccc7b50c Merge branch 'develop' into dev_cache 
Conflicts:
	.gitignore
	app/controllers/blogs_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/journals_for_message.rb
	app/models/news.rb
	app/views/courses/_course_activity_users.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/projects/_act_messages.html.erb
	app/views/projects/_project_message_contents.html.erb
	app/views/users/_course_homework.html.erb
	app/views/users/_course_journalsformessage.html.erb
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_homework_post_reply.html.erb
	app/views/users/_message_contents.html.erb
	app/views/users/_news_contents.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_blog.html.erb
	app/views/users/_user_journalsformessage.html.erb
 2016-12-12 16:35:20 +08:00
cxt 494946c70e 匿评结束后提交的作品也应计算缺评扣分 2016-12-06 16:13:04 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
daiao 2cbc7bca33 我的Issue导出功能 2016-11-28 16:11:52 +08:00
daiao 2c664dcd21 我的issue导出功能（未完） 2016-11-28 15:32:02 +08:00
guange c2629ebdc0 有几处相同的content key 2016-11-26 17:06:17 +08:00
cxt e202a7b99c 二级回复 2016-11-25 20:13:01 +08:00
cxt 8a52e136cf 点击展开回复 2016-11-25 18:01:50 +08:00
cxt ebda1d7d54 测试版课程列表报500 2016-11-25 16:17:02 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
yuanke 7713fba2f8 个人留言列表优化 2016-11-24 14:30:24 +08:00
yuanke 2d5fbdfaaa Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/views/projects/_project_message_contents.html.erb
 2016-11-22 17:07:35 +08:00
yuanke f4b6cab0d5 项目动态更新缓存修改 2016-11-22 16:56:09 +08:00
cxt eeacd76aa9 首页班级列表的归档 2016-11-22 10:27:56 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
huang 11f8656651 0 2016-11-15 11:20:30 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00
yuanke 5908f243bc Merge branch 'develop' into yuanke_objectcache 2016-11-15 10:40:18 +08:00
huang 3561009efc Merge branch 'develop' into dev_newproject 2016-11-15 09:01:45 +08:00
cxt edf8ceed7c 取消收藏的班级和项目动态不显示 2016-11-14 16:37:42 +08:00
huang f08b04d645 My Issue未完 2016-11-14 16:06:54 +08:00
yuanke cec157944b Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/models/homework_common.rb
	app/views/courses/_course_activity_users.html.erb
	app/views/users/_course_message.html.erb
 2016-11-14 10:11:27 +08:00
huang d1f9ce3ab2 课程中资源库导入不能用 2016-11-11 18:19:03 +08:00
huang 0f328c9c58 解决用户ID转换成用户名后引发的问题 2016-11-10 10:27:57 +08:00
yuanke 7debb74164 Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/models/news.rb
	app/views/users/_message_contents.html.erb
	app/views/users/_news_contents.html.erb
 2016-11-08 09:51:32 +08:00
cxt f921c8cccc 发布作业时默认教师优先、迟交扣分为0、缺评扣分为0 2016-11-04 18:54:51 +08:00
yuanke 2a6713db4e 班级收藏、项目收藏、班级动态时间、项目动态时间增加 2016-11-01 17:20:46 +08:00
yuanke da81c56899 教师、学生数缓存更新 2016-10-28 13:18:56 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
huang c4b32438ee 动态样式冲突问题 2016-10-27 11:16:51 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
cxt ce1da89e02 Merge branch 'cxt_replies' into develop 2016-10-14 16:18:43 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
cxt 5f04baf572 博客动态回复显示：“展开更多”、“收起回复”点击无反应 2016-10-14 15:09:47 +08:00
cxt d2b6d81373 Merge branch 'cxt_replies' into develop 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/blogs/_article.html.erb
	app/views/org_document_comments/show.html.erb
 2016-10-13 14:22:05 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
cxt b8296f3e7e 首页的课程列表显示缺漏 2016-10-13 14:08:20 +08:00
huang dd4d20011d 公共资源库显示优化 2016-10-13 09:43:53 +08:00