 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
|
65d4af1307
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-02 10:03:57 +08:00 |
|
Tim
|
9af8757ceb
|
项目合并请求
|
2016-08-02 10:03:42 +08:00 |
|
huang
|
3660f8cbce
|
gitlab相关方法的封装
|
2016-08-01 17:38:37 +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
|
c7f2ab0415
|
修复创建英文名字的项目标题为“为项目讨论区的问题”
|
2016-08-01 13:51:11 +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
|
8e805d382a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 23:50:39 +08:00 |
|
daiao
|
6ea829131b
|
单位列表发送消息样式调整
|
2016-07-29 23:48:12 +08:00 |
|
huang
|
30ce469483
|
申请加入项目删除邮件
|
2016-07-29 23:37:31 +08:00 |
|
daiao
|
15227907ea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 23:23:11 +08:00 |
|
huang
|
07ff420a6a
|
退出项目的时候清楚申请信息
|
2016-07-29 23:23:04 +08:00 |
|
daiao
|
db690bedab
|
单位名称列表缺陷修复
|
2016-07-29 23:22:32 +08:00 |
|
huang
|
21eed9ebb3
|
去掉同意拒绝“：”
|
2016-07-29 23:03:18 +08:00 |
|
huang
|
08b1f0c266
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 22:58:43 +08:00 |
|
huang
|
b1fd7048fe
|
报告人员问题
|
2016-07-29 22:58:24 +08:00 |
|
huang
|
97288d4eb4
|
按钮样式
|
2016-07-29 22:51:13 +08:00 |
|
cxt
|
bf529f07a5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-29 22:49:46 +08:00 |
|
cxt
|
23bb010315
|
课程列表的资源数显示不对
|
2016-07-29 22:49:39 +08:00 |
 yuanke
|
7d0d208676
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-07-29 22:10:06 +08:00 |
|
yuanke
|
dce84484ff
|
修改单位的省市个人资料省市也得修改
|
2016-07-29 22:09:03 +08:00 |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
|
daiao
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
2016-07-29 22:03:45 +08:00 |
|
daiao
|
641ccee631
|
修改名称过长问题
|
2016-07-29 22:02:23 +08:00 |
|
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
2016-07-29 21:54:33 +08:00 |