Commit Graph

739 Commits

Author SHA1 Message Date
ouyangxuhua 5c22b23f3a Merge branch 'develop' into ouyangxuhua 2016-03-18 14:52:51 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后,持续显示用户信息半秒钟,以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
huang 1b0bcd0c05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:37:24 +08:00
huang cefa6efc1b 项目动态中加入附件 2016-03-17 16:36:57 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua
Conflicts:
	app/views/users/_user_message_course.html.erb
2016-03-17 16:18:30 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
2016-03-17 16:06:36 +08:00
huang 03597b85ff 解决项目被淹没问题 2016-03-17 16:02:36 +08:00
alan a4e2fd741e 删除issue,返回页面不变 2016-03-17 14:13:29 +08:00
huang 0d1fc409d1 版本库提示同一高度 2016-03-17 13:58:55 +08:00
huang ab3fc0fb2c 成员提供真实姓名 2016-03-17 13:02:32 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
2016-03-15 13:40:33 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
ouyangxuhua 713c28c0b5 个人页面快捷操作课程/项目的设置公开/私有属性,确定的提示信息要正确 2016-03-09 10:25:57 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
huang 5cf198c61a 课程教师、学生列表添加成员管理入口,项目成员列表入口 2016-03-03 17:59:36 +08:00
huang a10e973c75 版本库配置默认分支 2016-02-26 19:25:12 +08:00
ouyangxuhua f785277d42 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
huang 935ddc053a 解决项目500问题 2016-02-20 17:48:45 +08:00
ouyangxuhua fa08935f68 Merge branch 'develop' into ouyangxuhua
Conflicts:
	app/views/projects/settings/_new_repositories.html.erb
2016-02-20 11:13:38 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
ouyangxuhua 3aaa078a4b 组织动态添加项目动态 2016-01-29 16:26:00 +08:00
ouyangxuhua d4c3cb8777 Merge branch 'develop' into dev_hjq 2016-01-22 17:13:46 +08:00
ouyangxuhua b6219c149a 解决一下bug:1.通知不能回复;2.组织通知作者不能编辑和删除; 2016-01-22 16:10:05 +08:00
huang 0ba724776e 项目版本库左侧添加提交次数统计 2016-01-21 16:06:50 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-20 09:27:29 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
cxt b4521d3582 课程/项目首页的更多默认收起 2016-01-18 16:18:40 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-15 15:42:36 +08:00
cxt 902cfdcbe9 课程/项目的创建动态不需要显示更新时间 2016-01-15 10:29:55 +08:00
cxt c49a290d56 Merge branch 'develop' into cxt_course
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-15 10:24:37 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
ouyangxuhua 5097f19ec8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	app/views/layouts/_user_projects.html.erb
	app/views/projects/set_public_or_private.js.erb
2016-01-14 18:30:05 +08:00
ouyangxuhua 1c62edbed4 项目设为私有title更新 2016-01-14 18:26:36 +08:00
huang a114b7525d Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 18:25:56 +08:00
huang b3e6f6acd5 项目删除附件问题
项目得分添加讨论回复计算
2016-01-14 18:25:42 +08:00
cxt 25cc959576 Merge branch 'szzh' into develop
Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb
2016-01-14 18:22:57 +08:00
ouyangxuhua 0f0f1ae056 Merge branch 'dev_hjq' into szzh
Conflicts:
	db/schema.rb
2016-01-14 17:54:16 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
处理冲突
2016-01-14 17:35:25 +08:00
huang a105ed6e00 项目得分弹出分类显示 2016-01-14 17:29:55 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-01-14 15:59:50 +08:00
huang 440be81587 Merge branch 'develop' into szzh
Conflicts:
	db/schema.rb
处理冲突
2016-01-14 15:02:30 +08:00
huang f3402e4fa4 项目得分新计算 2016-01-14 15:00:21 +08:00
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
2016-01-14 14:40:13 +08:00
huang 49d456bf21 修改数据统计信息 2016-01-14 14:32:19 +08:00