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

9584 Commits

Author SHA1 Message Date
Tim 33467d3152 已处理页面样式；新建时选择项目刷新分支js 2016-08-04 15:04:27 +08:00
huang 54a9fadbd1 判断合并和未合并的pr 2016-08-04 14:24:32 +08:00
huang 362e95d103 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:11:53 +08:00
huang 7084a3fed9 新建pull request的时候JS控制标题不能为空 2016-08-04 14:11:24 +08:00
Tim 6f1b7f827e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:05:07 +08:00
Tim b8a40862ce 改变行代码格式化，不折行 2016-08-04 14:04:55 +08:00
huang 1f5c4a800f 代码没有改动时候提示 2016-08-04 11:35:04 +08:00
huang 0b3e1f558c Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/show.html.erb
 2016-08-04 11:15:38 +08:00
huang 21747d02a2 新建PR成功后JS跳转HTML跳转，相关页面局部刷新，及错误提示 2016-08-04 11:13:31 +08:00
Tim f444d6fab0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/_form.html.erb
 2016-08-04 10:46:18 +08:00
Tim cedff021ad 分支下拉框样式；改动样式；无合并内容提示 2016-08-04 10:44:48 +08:00
huang a62ede1a33 先建pull request及局部刷新 2016-08-04 10:08:13 +08:00
huang 2e91da4f28 项目分支获取 2016-08-03 17:37:37 +08:00
huang c20b679c22 PR new调整 2016-08-03 17:04:02 +08:00
huang f8b53b8dfc Pull request列表页面分类 2016-08-03 16:54:37 +08:00
huang 9f9eed2e27 隐藏编辑功能 2016-08-03 16:05:29 +08:00
huang 22a8adb64e 添加统计数目 2016-08-03 16:02:42 +08:00
huang b8cccdffda 完成changes数据获取及展示 2016-08-03 15:56:07 +08:00
huang 8e329db4d8 pull request commits样式调整 2016-08-03 15:16:28 +08:00
huang 27e755a0a9 数据获取及展示 2016-08-03 15:06:10 +08:00
huang 0a9224d036 每次请求提交的代码 2016-08-03 14:43:27 +08:00
huang be081f5c66 添加Api（提交内容，改动）及相关方法路由 2016-08-03 13:57:59 +08:00
huang 1cb6809bdf Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/pull_requests/new.html.erb
 2016-08-03 11:09:14 +08:00
huang 182c861b30 创建pull request 2016-08-03 11:07:49 +08:00
Tim e7fa38e52c pull request show页面 2016-08-03 11:00:31 +08:00
huang 5e9c27b63d 代码封装 2016-08-02 16:38:56 +08:00
Tim b91bb1f0d2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:37:41 +08:00
Tim c8dce2c2fc 请求处理页面 2016-08-02 16:37:30 +08:00
huang 56a444dac0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:34:31 +08:00
huang 3ce1ac80b4 pull_request ---> new 2016-08-02 16:34:20 +08:00
Tim 09f25588a8 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:10:34 +08:00
Tim 7e440596ab 新建请求，js效果 2016-08-02 16:10:25 +08:00
huang 20bdd23665 pull requtst show 2016-08-02 16:06:51 +08:00
huang d286d3fe06 pullrequest头部 2016-08-02 15:44:25 +08:00
Tim 3e95b070d0 合并请求代码 2016-08-02 15:00:05 +08:00
Tim 9af8757ceb 项目合并请求 2016-08-02 10:03:42 +08:00
Tim 1fc617d5fa pull request页面删除 2016-08-01 16:57:55 +08:00
Tim e33bbfff3f Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-01 16:53:44 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00
Tim be36755d95 代码合并页面 2016-08-01 16:53:33 +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 3feb0680cc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 09:50:31 +08:00
huang f7e8c5232c 个人主页加入项目，如果已经申请了则提示已申请 2016-08-01 09:50:05 +08:00
cxt 87e3707b52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:54:17 +08:00
cxt 0ac906a5cf 消息列表报500 2016-07-29 23:54:10 +08:00
daiao 6ea829131b 单位列表发送消息样式调整 2016-07-29 23:48:12 +08:00
daiao 15227907ea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:23:11 +08:00
daiao db690bedab 单位名称列表缺陷修复 2016-07-29 23:22:32 +08:00