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

1001 Commits

Author SHA1 Message Date
huang 4bb13a0d3c Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 11:11:40 +08:00
huang a86ad7d99a 项目配置各种局部刷新（新建编辑提示等） 2016-10-25 11:11:25 +08:00
Tim 5f233d2f10 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 09:12:15 +08:00
Tim 1023f5301e 讨论区列表、讨论区详情、讨论区回复宽度扩展 2016-10-25 09:11:56 +08:00
huang 7a78bbdc45 新建版本、新建版本库正则JS撇配 2016-10-24 17:35:26 +08:00
huang 651ea5d189 配置页面，里程碑编辑删除局部刷新以及标题为空JS判断 2016-10-24 16:36:08 +08:00
huang 38d30c1cca 项目配置页面冗余代码清理 2016-10-24 15:42:57 +08:00
huang 76a3686f9f 项目动态message板块回复样式 2016-10-24 13:30:45 +08:00
Tim c44911c54f 項目討論區留言路徑跳轉更改 2016-10-24 11:26:12 +08:00
huang be396d2ead 项目动态中message模块二级回复框架 2016-10-24 10:57:18 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
Tim f4690f0cab 回复，二级回复，删除时，回复框宽度控制 2016-10-21 11:09:54 +08:00
Tim 4156815394 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 09:23:14 +08:00
Tim 45d846ea79 讨论区动态宽度扩展 2016-10-21 09:22:54 +08:00
daiao b45aec9134 项目配置-里程碑，版本库页面调整 2016-10-20 13:33:25 +08:00
daiao 1c80a89b8d 项目配置样式调整 2016-10-19 17:43:05 +08:00
daiao 269c061053 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:56:36 +08:00
daiao a9fa958f7f 项目配置，信息与模块样式调整 2016-10-19 16:56:25 +08:00
Tim 783ef3eae1 创建项目动态宽度调整 2016-10-19 16:29:04 +08:00
daiao c829749849 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:35:49 +08:00
daiao 7499f4659d 项目配置，成员界面，点击操作-编辑按钮，角色出现下拉列表框 2016-10-19 15:35:37 +08:00
Tim e4a6a5f58d 项目issue状态宽度调整 2016-10-19 11:17:34 +08:00
Tim 10e9194032 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 10:18:50 +08:00
Tim 6fbb6629d7 动态issue回复宽度扩展 2016-10-19 10:17:56 +08:00
huang 89292054c8 项目动态讨论区模块独立出来 2016-10-19 09:57:17 +08:00
huang 3750252f39 项目创建信息与用户动态中分支 2016-10-19 09:35:53 +08:00
huang 0305676896 项目动态附件信息分离 2016-10-19 09:30:22 +08:00
daiao daf0263be9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 17:22:52 +08:00
daiao 61ad05a379 项目配置界面 2016-10-18 17:09:00 +08:00
huang 23ff82a8cd Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:24:49 +08:00
huang b8d86fcd42 版本库界面及样式 2016-10-19 15:24:36 +08:00
huang bf3506002b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 14:43:25 +08:00
huang 590e639112 新版项目issue模块 2016-10-19 14:43:07 +08:00
daiao 32c5d7a13b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 15:19:34 +08:00
daiao bdbd2e9cf7 项目配置组织与里程碑界面 2016-10-18 15:17:36 +08:00
Tim 5844af922e 项目动态宽度扩展 2016-10-18 13:34:28 +08:00
Tim 622fa382ca Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 11:30:57 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
huang e276559286 项目show附件类型新版块 2016-10-19 09:24:07 +08:00
huang a0811ec14c project show中添加邀请码 2016-10-19 09:14:32 +08:00
huang 207273839b Merge branch 'dev_newrep' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/settings/_new_repositories.html.erb
 2016-10-19 08:53:38 +08:00
Tim fb9e1a02df 项目动态宽度调整 2016-10-18 11:30:42 +08:00
daiao f8638d173a 项目配置，成员列表功能 2016-10-15 10:48:24 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	db/schema.rb
 2016-10-15 09:00:03 +08:00
daiao 5ae89613ec 项目配置成员界面 2016-10-13 16:57:43 +08:00
huang e2ee75d8c1 项目宽版架构优化（主要是model及与课程等模块的分离） 2016-10-13 10:52:48 +08:00
daiao 07b98bae5e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-13 09:28:47 +08:00
daiao a0aa34b533 项目设置，模块页面 2016-10-13 09:28:33 +08:00
huang b9b20ccc59 项目配置，各个页面高度JS控制 2016-10-12 17:18:35 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
huang 50f9c5244d 项目配置--版本库代码简化及界面 2016-10-12 16:09:17 +08:00
huang fabe6bd999 项目配置过短的时候JS控制底端留白 2016-10-12 14:38:46 +08:00
huang 2126364a19 新版项目配置及JS 2016-10-12 14:13:52 +08:00
huang 7800ba9701 项目动态头部 2016-10-12 11:09:41 +08:00
huang a206a471af Merge branch 'dev_newproject' into dev_newrep 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/base_projects.html.erb
 2016-10-11 10:58:37 +08:00
huang 3c15c4f315 版本库权限，及项目收藏用户列表 2016-10-11 10:03:00 +08:00
huang 188db13c33 项目导航权限判断 2016-10-11 09:31:17 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
huang c03384f122 Merge branch 'develop' into dev_newrep 2016-10-08 17:29:59 +08:00
Tim 6e93b0dc0d 项目去掉右侧白色块后，样式调整 2016-10-08 17:08:07 +08:00
huang 84fd99ced1 项目base优化 2016-10-08 15:09:59 +08:00
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