trustieforge

Commit Graph

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	10 years ago
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	10 years ago
cxt	494946c70e	匿评结束后提交的作品也应计算缺评扣分	10 years ago
陈晓婷	39258f4ac5	Merge branch 'develop' into 'develop' 课程相关bug修复；叠层回复的“回复”、“赞”的显隐 See merge request !32	10 years ago
cxt	3f35b7f806	贴吧回复改版	10 years ago
daiao	2cbc7bca33	我的Issue导出功能	10 years ago
daiao	2c664dcd21	我的issue导出功能（未完）	10 years ago
guange	c2629ebdc0	有几处相同的content key	10 years ago
cxt	e202a7b99c	二级回复	10 years ago
cxt	8a52e136cf	点击展开回复	10 years ago
cxt	ebda1d7d54	测试版课程列表报500	10 years ago
cxt	785f027a63	Merge branch 'cxt_course' into develop	10 years ago
cxt	8743460134	动态与详情的回复叠层调整	10 years ago
yuanke	7713fba2f8	个人留言列表优化	10 years ago
yuanke	2d5fbdfaaa	Merge branch 'develop' into yuanke_objectcache Conflicts: app/views/projects/_project_message_contents.html.erb	10 years ago
yuanke	f4b6cab0d5	项目动态更新缓存修改	10 years ago
cxt	eeacd76aa9	首页班级列表的归档	10 years ago
cxt	4388b7625e	首页班级列表的归档	10 years ago
daiao	d65a062737	所有我的issue功能	10 years ago
daiao	e956d20d6e	我的issue部分功能	10 years ago
daiao	acffe8ec19	我的issue未完	10 years ago
huang	0adde560ba	我的issue路由修改及查询修改	10 years ago
huang	11f8656651	0	10 years ago
huang	5f21b63c41	我的issue框架搭建	10 years ago
yuanke	5908f243bc	Merge branch 'develop' into yuanke_objectcache	10 years ago
huang	3561009efc	Merge branch 'develop' into dev_newproject	10 years ago
cxt	edf8ceed7c	取消收藏的班级和项目动态不显示	10 years ago
huang	f08b04d645	My Issue未完	10 years ago
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	10 years ago
huang	d1f9ce3ab2	课程中资源库导入不能用	10 years ago
huang	0f328c9c58	解决用户ID转换成用户名后引发的问题	10 years ago
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	10 years ago
cxt	f921c8cccc	发布作业时默认教师优先、迟交扣分为0、缺评扣分为0	10 years ago
yuanke	2a6713db4e	班级收藏、项目收藏、班级动态时间、项目动态时间增加	10 years ago
yuanke	da81c56899	教师、学生数缓存更新	10 years ago
huang	3ef90a3c62	Merge branch 'dev_newproject' into develop Conflicts: db/schema.rb	10 years ago
huang	ec5645fc66	完成项目动态中样式别别的地方冲突问题	10 years ago
huang	c4b32438ee	动态样式冲突问题	10 years ago
huang	6b8184ed49	issue模块新版二级回复ajax刷新	10 years ago
cxt	bee1597167	删除的个人主页报500	10 years ago
cxt	269083c4a6	分组作业的评分设置	10 years ago
cxt	6109a1602b	Merge branch 'cxt_course' into develop Conflicts: db/schema.rb	10 years ago
cxt	e102815f60	个人主页	10 years ago
cxt	ce1da89e02	Merge branch 'cxt_replies' into develop	10 years ago
huang	b9d87b1b29	Merge branch 'develop' into rep_quality Conflicts: public/stylesheets/css/project.css	10 years ago
cxt	5f04baf572	博客动态回复显示：“展开更多”、“收起回复”点击无反应	10 years ago
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	10 years ago
cxt	5fb7da4681	Merge branch 'cxt_course' into develop Conflicts: public/stylesheets/css/public.css	10 years ago
cxt	b8296f3e7e	首页的课程列表显示缺漏	10 years ago
huang	dd4d20011d	公共资源库显示优化	10 years ago

1 2 3 4 5 ...

792 Commits (dev_cache)