 黄井泉
|
266de9ac7d
|
Merge branch 'rep_quality' into 'dev_hjq'
Rep quality
tedy
See merge request !3
|
10 years ago |
 Administrator
|
bda6871a12
|
Merge branch 'hjq_course' into 'dev_hjq'
两个分支作用不是很大
测试状态
See merge request !6
|
10 years ago |
|
huang
|
5e9c27b63d
|
代码封装
|
10 years ago |
|
huang
|
56a444dac0
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
10 years ago |
|
huang
|
3ce1ac80b4
|
pull_request ---> new
|
10 years ago |
 Tim
|
09f25588a8
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
10 years ago |
|
Tim
|
7e440596ab
|
新建请求，js效果
|
10 years ago |
|
huang
|
20bdd23665
|
pull requtst show
|
10 years ago |
|
huang
|
d286d3fe06
|
pullrequest头部
|
10 years ago |
|
Tim
|
3e95b070d0
|
合并请求代码
|
10 years ago |
|
Tim
|
65d4af1307
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
10 years ago |
|
Tim
|
9af8757ceb
|
项目合并请求
|
10 years ago |
|
huang
|
3660f8cbce
|
gitlab相关方法的封装
|
10 years ago |
|
Tim
|
1fc617d5fa
|
pull request页面删除
|
10 years ago |
|
Tim
|
e33bbfff3f
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
10 years ago |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
10 years ago |
|
Tim
|
be36755d95
|
代码合并页面
|
10 years ago |
|
huang
|
685f9d8090
|
项目左侧权限控制
|
10 years ago |
|
huang
|
7c4759f3b7
|
项目左侧添加pull request入口
|
10 years ago |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
10 years ago |
|
huang
|
c7f2ab0415
|
修复创建英文名字的项目标题为“为项目讨论区的问题”
|
10 years ago |
|
huang
|
e41a14fa04
|
Merge branch 'develop' into rep_quality
|
10 years ago |
|
huang
|
8a8860bd6c
|
gemfile注释后恢复
|
10 years ago |
|
huang
|
3feb0680cc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
f7e8c5232c
|
个人主页加入项目，如果已经申请了则提示已申请
|
10 years ago |
 cxt
|
87e3707b52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
0ac906a5cf
|
消息列表报500
|
10 years ago |
 daiao
|
8e805d382a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
daiao
|
6ea829131b
|
单位列表发送消息样式调整
|
10 years ago |
|
huang
|
30ce469483
|
申请加入项目删除邮件
|
10 years ago |
|
daiao
|
15227907ea
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
07ff420a6a
|
退出项目的时候清楚申请信息
|
10 years ago |
|
daiao
|
db690bedab
|
单位名称列表缺陷修复
|
10 years ago |
|
huang
|
21eed9ebb3
|
去掉同意拒绝“：”
|
10 years ago |
|
huang
|
08b1f0c266
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
b1fd7048fe
|
报告人员问题
|
10 years ago |
|
huang
|
97288d4eb4
|
按钮样式
|
10 years ago |
|
cxt
|
bf529f07a5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
23bb010315
|
课程列表的资源数显示不对
|
10 years ago |
|
daiao
|
20195d2496
|
Merge branch 'dev_shcool' into develop
|
10 years ago |
 yuanke
|
7d0d208676
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
10 years ago |
|
yuanke
|
dce84484ff
|
修改单位的省市个人资料省市也得修改
|
10 years ago |
|
daiao
|
8513ae133e
|
Merge branch 'dev_shcool' into develop
|
10 years ago |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
10 years ago |
|
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
|
10 years ago |
|
daiao
|
641ccee631
|
修改名称过长问题
|
10 years ago |
|
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
4a800b67d8
|
消息列表报500
|
10 years ago |
|
cxt
|
a41fbdb985
|
课程大纲报500
|
10 years ago |
|
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
10 years ago |
