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

838 Commits

Author SHA1 Message Date
Tim 6e93b0dc0d 项目去掉右侧白色块后，样式调整 2016-10-08 17:08:07 +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
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