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
黄井泉	74a20dddc1	Merge branch 'dev_newproject' into 'develop' Issue和commit关联功能 See merge request !49	10 years ago
huang	2a5bb6dcb8	Merge branch 'guange_dev' into develop Conflicts: Gemfile	10 years ago
guange	dcfb9d589e	微信关注提示语优化	10 years ago
huang	6ebaa1c90a	Merge branch 'develop' into dev_newproject	10 years ago
huang	5bc4c779ea	issue和commit_id关联	10 years ago
guange	d351827ba2	at功能实现	10 years ago
daiao	ffce6f074f	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	10 years ago
daiao	b48fc7ba3b	pullrequest发送消息	10 years ago
黄井泉	42775a82f9	Merge branch 'cxt_course' into 'develop' 班级作业增加设置选项：成绩公开范围 See merge request !37	10 years ago
huang	2311731de4	Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop	10 years ago
daiao	77f252b538	Merge branch 'develop' into dai_ao Conflicts: app/controllers/pull_requests_controller.rb app/views/users/_user_message_course.html.erb app/views/users/_user_message_forge.html.erb	10 years ago
huang	aea81f2b10	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	10 years ago
cxt	ff6434d456	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course Conflicts: db/schema.rb	10 years ago
陈晓婷	39258f4ac5	Merge branch 'develop' into 'develop' 课程相关bug修复；叠层回复的“回复”、“赞”的显隐 See merge request !32	10 years ago
cxt	0afed6624d	未参与匿评的缺评扣分	10 years ago
huang	9ee36f05bc	资源库专业分类model创建	10 years ago
huang	bbc8d11f80	项目issue关联commit(未完成)	10 years ago
daiao	2e5cd96bb9	pullrequest发送消息	10 years ago
huang	890b0e80fd	邮件发送至发送邮件重要信息，去掉掉按天发送功能	10 years ago
daiao	e4d43cc163	项目pull request 项目消息框架搭建	10 years ago
cxt	3f35b7f806	贴吧回复改版	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
daiao	85f9f636a2	修复：里程碑关闭，编辑issue，里程碑被清空的情况	10 years ago
yuanke	0efd386475	修改删除班级、项目时缓存的BUG	10 years ago
daiao	0eb6a607b2	项目issue中，附件名称后缀显示不全	10 years ago
huang	de61d699a8	Merge branch 'dev_newproject' into develop	10 years ago
daiao	290a301cee	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop Conflicts: public/stylesheets/css/common.css	10 years ago
daiao	cd32353d91	Merge branch 'dai_ao' into develop	10 years ago
cxt	5510df165d	Merge branch 'cxt_course' into develop Conflicts: db/schema.rb	10 years ago
daiao	19483ee762	新建和编辑issue时，选择里程碑按创建时间的倒序排列	10 years ago
cxt	3ebc3c6492	老师、学生测验列表的调整	10 years ago
cxt	efd0bf6707	删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整	10 years ago
yuanke	c78734c50c	修改分组作业合成成员BUG	10 years ago
huang	5dcb99c3ad	优化projects数据库表，删除不必要的字段	10 years ago
yuanke	5908f243bc	Merge branch 'develop' into yuanke_objectcache	10 years ago
cxt	ef9b389cfc	作业动态报500	10 years ago
huang	ddb747bfcb	解决login中带特殊字符的问题	10 years ago
huang	2b1a73e692	解决用户登录名的.号问题	10 years ago
yuanke	b40da0437c	缓存修改	10 years ago
yuanke	8588f8b818	合并代码漏掉了一段	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
cxt	cb5ca96bb5	Merge branch 'cxt_course' into develop Conflicts: app/views/users/_course_homework.html.erb db/schema.rb	10 years ago
cxt	16c51e1eaa	基于项目的分组作业没有显示项目详情	10 years ago
huang	50a14ad5fe	修改判断整数的方法	10 years ago
cxt	07b97c8eb9	学生列表增加删除功能、删除学生时删除其对应的作品	10 years ago
huang	b633200ab6	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	10 years ago
huang	aab24ea34a	解决顶部fork路由错误，已经fork过该项目的添加提示	10 years ago

1 2 3 4 5 ...

1762 Commits (dev_cache)