jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,727 Commits 98 Branches 0 Tags 0 B
Commit Graph

1039 Commits

Author SHA1 Message Date
huang 137d62ae5d Merge branch 'rep_quality' into dev_newrep 2016-10-08 11:14:36 +08:00
daiao acbc94af1a 项目导航栏数字错误 2016-09-30 11:24:04 +08:00
daiao 0ad71e0f64 issue列表及左侧导航栏问题跟踪的issue的所有数字统计错误 2016-09-30 11:07:22 +08:00
Tim 858348298b 项目加载慢时，有白色块显示bug修复 2016-09-29 14:24:42 +08:00
huang bd383f5010 项目历史版本库提示删除一级setting中控制权限判断 2016-09-28 16:04:53 +08:00
yuanke 3b85d9e6bd 课程、项目二级回复样式 2016-09-27 21:03:40 +08:00
huang 27f45b5ea0 Merge branch 'rep_quality' into develop 2016-09-27 20:07:34 +08:00
daiao d57f80e703 用户反馈回复 2016-09-27 20:06:48 +08:00
huang e49f9b49b2 Merge branch 'rep_quality' into develop 2016-09-27 19:48:10 +08:00
daiao 7c76584e14 issue功能优化 2016-09-27 19:44:24 +08:00
yuanke 8b8d878564 项目关注列表和成员列表调整宽度 2016-09-27 19:28:40 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
Tim fa46916ac9 项目各界面宽度修改 2016-09-26 11:20:49 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
Tim a0772332da 项目侧导航快捷按钮样式更改 2016-09-22 17:04:45 +08:00
huang 7ed7129ace 甘特图和日历显示及CSS架构 2016-09-19 14:23:33 +08:00
huang 924db06cbf 项目版本库隐藏代码统计 2016-09-18 15:55:22 +08:00
daiao 41ab10410f 1. PullRequest后面加入请求数目 2016-09-14 13:15:00 +08:00
huang 7899bfe985 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/issues/_form.html.erb
	db/schema.rb
 2016-09-09 16:00:05 +08:00
huang c025e40905 解决正式版管理员界面选择跟踪标签500问题 2016-09-09 09:51:02 +08:00
huang 6dbb2e4e94 Pull request数量为0的时候显示在更多中 2016-09-08 16:03:32 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
daiao bb0bafb0fd 1.修复项目名称太长，导致动态显示名称与issue编辑图标按钮重叠 2016-09-05 13:27:41 +08:00
cxt b588495847 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:26:23 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
huang e798381feb 项目资源数改成实时获取 2016-09-01 16:39:09 +08:00
huang c51f725a78 项目隐藏之 项目动态中讨论区 新闻发送隐藏课程信息 2016-09-01 11:24:16 +08:00
daiao 548a263f0f 1.修复项目新闻发送至其他项目后，位于讨论区下的bug 
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
 2016-08-31 17:09:02 +08:00
cxt a8575f2a15 暂时隐藏个人名片 2016-08-31 14:08:19 +08:00
huang 0c221abd61 PULL REQUEST 默认情况下不显示 2016-08-31 09:18:05 +08:00
cxt 623dadaea1 回复的删除按钮当鼠标放上去才显示 2016-08-30 14:12:50 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
huang 69301a1120 Pull reques登录提示（权限控制） 2016-08-25 10:04:51 +08:00
huang 7efc8ccac6 新建项目，增加项目名称输入例 2016-08-12 14:11:15 +08:00
huang 308b050612 link to路由问题 2016-08-05 14:43:44 +08:00
huang 4ec8cc9a50 PR新建相关功能完善 2016-08-05 11:19:36 +08:00
Tim c679b986d6 侧导航新增请求快捷链接 2016-08-05 11:07:44 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
huang 685f9d8090 项目左侧权限控制 2016-08-01 16:19:15 +08:00
huang 7c4759f3b7 项目左侧添加pull request入口 2016-08-01 15:52:05 +08:00
huang 96b04f39b1 pull requests框架搭建（路由控制器、views） 2016-08-01 15:33:47 +08:00
huang 153efb7eda 局部刷新 2016-07-29 19:42:21 +08:00
huang 48a72ff816 代码分析结果入口放置在版本库 2016-07-29 17:46:24 +08:00
huang 769a07bd94 去掉配置页面的成员申请 2016-07-29 16:00:46 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
huang 8dbdebe02e 修改动态问题 2016-07-22 16:35:03 +08:00
huang 6fea64afe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-22 10:35:44 +08:00
huang ff8cad5cf2 项目动态中添加提交动态 2016-07-21 18:08:13 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合 2016-07-20 17:00:18 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
huang 4e3a7e8df1 新建版本“日期”--》“截止日止” 2016-07-15 14:11:51 +08:00
huang 77e4a66e7e 模式切换刷新后引起的样式问题 2016-07-15 13:50:15 +08:00
huang 8c6fca87c9 项目动态中，新闻添加快捷操作，所有操作默认显示 2016-07-14 13:57:06 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
Tim 65cbf14d72 提交与取消按钮间添加间距；图标不显示等 2016-07-07 17:06:31 +08:00
Tim b02c1b5995 提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减； 2016-07-07 15:08:34 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +08:00
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
 2016-07-05 15:38:56 +08:00
yuanke 5ecb99196e 修改新建项目时公开后面的提示语 2016-07-05 14:48:54 +08:00
yuanke a7ecfba23b Merge branch 'yuanke_org' into develop 2016-07-01 17:52:23 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
cxt 8b87c141cc bug修复 2016-07-01 17:47:35 +08:00
yuanke 8db5852a61 激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决 2016-07-01 15:49:25 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality 
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
 2016-06-29 14:18:17 +08:00
Your Name a08edcca8a quanxian 2016-06-28 17:18:50 +08:00
Your Name c658296e2b config 2016-06-24 19:12:07 +08:00
huang 09b78fc546 中文 2016-06-24 15:13:09 +08:00
Your Name 06fe02890f index for sonar result 2016-06-24 14:59:17 +08:00
Tim 8a6bbf50a9 css文件替换 2016-06-24 09:30:46 +08:00
cxt 3f8beaf97c 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
huang 0eb6dbe48a Merge branch 'huang_temp2' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 08:30:31 +08:00
huang fb1a13a522 隐藏版本库功能 2016-06-02 17:05:51 +08:00
cxt 32dca93b59 统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名 2016-06-01 15:35:26 +08:00
yuanke d08809bfbd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/project.css
 2016-05-27 15:34:55 +08:00
cxt 8257770ec9 课程和项目留言的点赞 2016-05-25 16:20:01 +08:00
cxt c8467a50a0 自己可以给自己点赞 2016-05-25 16:19:41 +08:00
yuanke e7d20c2b98 1.项目用户反馈、课程留言区增加自动识别URL功能 
2.所有自动识别URL区域的链接颜色都改为#15bccf
 2016-05-24 09:11:50 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
huang faf5e89cc2 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
 2016-05-19 16:04:27 +08:00
cxt 28edaf2246 课程/项目留言：快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
huang c28c947abc 项目动态中添加作者 2016-05-10 17:07:47 +08:00
txz 9b55d8b527 微信版标题显示不完整 2016-05-10 14:06:34 +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 42076a137d 项目统计添加判断 2016-04-21 11:19:21 +08:00
huang a21200ab14 动态中添加分支 2016-04-15 15:53:29 +08:00
huang 4a8d572cb1 项目动态中版本库统计样式 2016-04-15 15:38:08 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
huang 2a00c4ddd7 版本库统计show权限统计 2016-04-14 13:39:19 +08:00
huang c87611dfec 动态中添加版本库统计 2016-04-14 11:18:17 +08:00
huang adf6cca435 完成代码行数的提交和统计 2016-04-13 20:39:20 +08:00
huang 57716e7efc 解决项目添加成员没选中而导致点击确定发消息的问题 2016-04-08 12:31:40 +08:00
huang 64f13a04cc 动态500问题 2016-03-28 17:09:42 +08:00
huang e02ad85bbb 项目动态关联优化（主要优化查询次数） 2016-03-25 15:58:17 +08:00
huang a9ef2c28e2 项目创建类型迁移 2016-03-24 13:57:52 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
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
cxt e889f798d7 项目创建动态报500 2016-01-13 17:26:36 +08:00
ouyangxuhua 582880e54d 设置课程/项目的公开私有属性，使用局部刷新 2016-01-13 16:59:48 +08:00
huang 4b26e77478 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/models/issue.rb
	app/models/message.rb
	app/models/news.rb
处理冲突
 2016-01-13 16:28:00 +08:00
huang 8f989a962d 修改项目总分统计 2016-01-13 16:22:25 +08:00
huang 24df6d30d6 项目得分弹出页面 2016-01-13 16:15:46 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
huang 165d5f50c8 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/files_controller.rb
	db/schema.rb
处理冲突
 2016-01-13 13:01:26 +08:00
huang 64088f5a21 项目数据存入数据库（统计数据直接从数据库获取） 2016-01-13 10:08:48 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
huang f3b732460c 添加项目统计字段 2016-01-11 14:57:52 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
cxt a0afe6ccbf 动态显示附件并统一附件样式 2016-01-08 16:05:36 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等 2016-01-07 15:58:22 +08:00
huang 738acad211 展开、收缩 2016-01-05 16:52:34 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
cxt 1623d846f4 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
lizanle 06734d86ca attachment_acts页面变量错误 2015-12-18 11:19:55 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
ouyangxuhua acb604883d 项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。 2015-12-17 10:01:28 +08:00
guange 8d797c5c0b 项目动态添加at 2015-12-15 09:09:41 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
huang 75fecc0402 项目删除功能 
项目删除权限
课程列表用户颜色
 2015-12-11 12:53:01 +08:00
huang 01b21ceda1 项目留言重复提交问题 2015-12-11 09:52:17 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
ouyangxuhua 2855c0e409 修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等 2015-12-04 10:59:09 +08:00
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-11-27 14:49:49 +08:00
ouyangxuhua b05708f6e8 解决一下三个bug: 
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
 2015-11-27 10:43:21 +08:00
houxiang c6b5abba4e hide the the count of project'repo 2015-11-27 10:10:59 +08:00
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
	db/schema.rb
处理冲突
 2015-11-24 09:55:26 +08:00
huang 85a219f7e9 项目动态\清除 2015-11-23 17:16:05 +08:00
Gan Yi.ang ea47a8085a 修复新建版本库无响应 2015-11-19 09:20:25 +08:00
ouyangxuhua af981f841e 添加组织时，翻页提醒功能改善 2015-11-18 16:52:03 +08:00
houxiang 4a9da97f9b modify by hx add commit_count_detail_show 2015-11-18 16:23:02 +08:00
houxiang fe3fbacdbc modify commit count show 2015-11-18 16:11:51 +08:00
ouyangxuhua fc7e41ebf9 1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表，建立相应模型及控制器； 
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
 2015-11-17 17:34:50 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
ouyangxuhua 022c656db6 修复项目加入组织的bug 2015-11-13 17:19:17 +08:00
ouyangxuhua d508cfa381 组织模块功能实现 2015-11-12 14:55:31 +08:00
ouyangxuhua a3443ba968 组织模块功能实现 2015-11-12 09:32:00 +08:00
lizanle d13205bd3d 文件正在上传提示 2015-11-11 11:39:02 +08:00
lizanle 508ca7f823 文件提交进度条 
文件提交提示
 2015-11-11 11:19:10 +08:00
lizanle 82c377a60a 在导航处上传文件不可用 2015-11-10 15:18:13 +08:00
huang 334de6444a 去掉点击复制title 2015-11-06 14:57:16 +08:00
huang 4608190529 增加点击选择历史版本记录 2015-11-05 14:31:43 +08:00
huang 496aeb4456 添加“新版本库” 2015-11-04 16:23:08 +08:00
huang a4209bc9f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-03 10:52:49 +08:00
lizanle 594a1b01ef Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-03 10:37:21 +08:00
huang edf9b4a6b5 修改样式 2015-11-02 20:01:19 +08:00
huang e0d5c948fa 修改版本库提示 2015-11-02 19:27:23 +08:00
huang afd9d435c2 新建版本库样式 2015-11-02 19:20:59 +08:00
huang 1c45afac89 增加提示 
修改链接参数
 2015-11-02 19:14:55 +08:00
huang 4d5d012ecf 版本库相关界面调整 2015-11-02 16:41:15 +08:00
lizanle 4c174781b1 项目 主页 资源上传 不要翻页，直接弹出资源弹出框 2015-11-02 15:21:53 +08:00
huang 83486c745e 1、如果没有新增版本库，点击链接跳至配置--新增 
2、已创建过gitlab项目则跳至gitlab 版本库
 2015-11-02 15:04:17 +08:00
huang eb3c65f1c6 项目管理员---项目左侧添加新建版本库入口 2015-11-02 14:26:23 +08:00
huang 8ec2dc3196 多版本库情况： 
1、没有新增项目提供接口
2、新建页面历史版本库列表
 2015-11-02 13:53:35 +08:00
ouyangxuhua 1963434242 解决搜索课程后，点击加入按钮无反应的bug 2015-10-29 16:35:23 +08:00
huang 211b5c2db9 Merge branch 'szzh' into gitlab_guange 2015-10-28 09:27:52 +08:00
ouyangxuhua 8e38fa65aa 1.解决“搜索课程--加入课程：输入正确的课程密码，点击确认按钮无反应”的bug 2015-10-27 15:32:38 +08:00
guange 11d1cac40d 可以通过gitlab创建项目 2015-10-21 17:13:07 +08:00
huang a45722b0f5 一个项目只能建一个版本库 2015-10-15 09:11:26 +08:00
huang 61bcdd4643 只允许创建一个版本库 2015-10-14 17:37:22 +08:00
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange 
Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	lib/trustie.rb

解决冲突
 2015-10-10 16:09:05 +08:00
huang ddac70c9b8 项目成员角色Gitlab一致，单选 
添加成员按钮样式调整
 2015-10-10 10:00:11 +08:00
huang 6a3312230a 邮箱验证不允许中文输入 
姓名允许中文输入
 2015-10-09 14:04:47 +08:00
huang 530d101024 项目邀请--姓名、长度JS验证 2015-10-09 11:25:21 +08:00
huang 654ebfca46 项目邀请添加：姓、名、性别 2015-10-09 10:33:10 +08:00
huang e563354c85 项目删除 2015-10-08 11:13:17 +08:00
huang 44c097dbaf 1、issue回复添加新的编辑器 
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
 2015-09-25 11:45:57 +08:00
huang 032ccdb2b8 先建项目 --项目类型默认提示 2015-09-24 14:01:29 +08:00
huang 99473c6880 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/show.html.erb
 2015-09-24 11:46:33 +08:00
huang 4c71e2c256 项目类型提示JS 2015-09-24 11:44:02 +08:00
huang 6449b2563b 1、去掉项目隐藏代码库的功能 
2、同步圈子的描述
3、圈子JS实现
 2015-09-24 11:19:07 +08:00
huang bb676b697b 新建项目添加“项目类型选择” 
新建项目新样式
 2015-09-24 09:47:40 +08:00
huang b94c57691a 项目新建重构 
项目先建添加项目类型
 2015-09-23 17:36:36 +08:00
cxt a37f39558d 项目和课程的列表符号样式修改 2015-09-22 15:54:50 +08:00
huang 434e223c86 修改标题 2015-09-18 15:57:29 +08:00
huang f041c80d0a Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css

解决冲突
 2015-09-18 13:08:12 +08:00
huang 7a014e1f79 解决bug：自动注册用户时，邮箱名过长超过login限制 
解决方法：login长度和邮箱长度同步
 2015-09-17 15:24:12 +08:00
ouyangxuhua 99d6012718 项目邀请 2015-09-17 14:37:45 +08:00
huang c9d52571f0 1、项目邀请中添加两种特殊情况的判断。 
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
 2015-09-16 17:25:06 +08:00
sw c21cea85f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 14:29:17 +08:00
cxt a714b10860 阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充 2015-09-16 12:39:08 +08:00
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
huang 3bfdff81ba 去掉项目组织 2015-09-11 14:53:42 +08:00
huang 51d964d371 点击消息链接定位到对应页面的某一点 2015-09-08 17:26:10 +08:00
ouyangxuhua ef011ad473 项目--邀请--发送邮件邀请用户,对输入的邮箱名进行判断，同时，修改提示样式 2015-09-07 15:23:34 +08:00
cxt ac419cef87 去掉课程/项目搜索列表的搜索框 2015-08-31 17:49:18 +08:00
guange 631283ae79 remove grack 2015-08-26 20:37:43 +08:00
guange d36da76685 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-15 19:47:53 +08:00
ouyangxuhua feb9125085 Merge branch 'szzh' into ouyangxuhua 2015-08-12 17:49:02 +08:00
ouyangxuhua bb8b1f3f08 修改版本管理git下拉菜单 2015-08-12 17:43:22 +08:00
ouyangxuhua 96c4924c89 Merge branch 'ouyangxuhua' into szzh 2015-08-12 16:39:15 +08:00
ouyangxuhua e5289410dd 项目搜索页码显示问题 2015-08-12 16:35:10 +08:00
ouyangxuhua d67d21eb42 1、解决项目搜素 分页异常问题 2015-08-12 11:28:51 +08:00
huang d3e0282115 去掉版本 -- 不共享功能 2015-08-01 16:58:06 +08:00
huang a915a35819 优化版本代码加提示 2015-08-01 11:35:48 +08:00