 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 |
 yuanke
|
a4281b4934
|
Merge branch 'develop' into weixin_guange
|
2016-08-02 15:51:29 +08:00 |
|
yuanke
|
13c46fc938
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-02 15:50:27 +08:00 |
|
yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
2016-08-02 15:50:15 +08:00 |
|
huang
|
d286d3fe06
|
pullrequest头部
|
2016-08-02 15:44:25 +08:00 |
|
Tim
|
3e95b070d0
|
合并请求代码
|
2016-08-02 15:00:05 +08:00 |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
2016-08-02 14:53:33 +08:00 |
|
huang
|
5e4a659cba
|
gemfile
|
2016-08-02 13:04:40 +08:00 |
|
huang
|
94b36e227c
|
申请加入项目消息刷新，同时更新其它管理员的消息状态
|
2016-08-02 13:03:33 +08:00 |
|
huang
|
0b113bb985
|
项目邀请码识别小写
|
2016-08-02 11:25:19 +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 |
 daiao
|
7d7c8bcd8c
|
Merge branch 'develop' into dev_shcool
|
2016-08-01 19:55:40 +08:00 |
 guange
|
a1d3bbbfa9
|
解决ruby2.3执行sql出错的bug
|
2016-08-01 19:17:16 +08:00 |
|
guange
|
fc38ef6a3f
|
增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip
|
2016-08-01 19:16:51 +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 |
|
daiao
|
24783705b5
|
Merge branch 'dev_shcool' into develop
|
2016-08-01 16:11:47 +08:00 |
|
daiao
|
0ffeec64e3
|
单位审核bug修复
|
2016-08-01 16:10:57 +08:00 |
|
huang
|
7c4759f3b7
|
项目左侧添加pull request入口
|
2016-08-01 15:52:05 +08:00 |
|
yuanke
|
dde89b72fa
|
加入项目二维码修改
|
2016-08-01 15:50:21 +08:00 |
|
daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
2016-08-01 15:44:18 +08:00 |
|
yuanke
|
f016027e8f
|
微信加入项目修改
|
2016-08-01 15:35:29 +08:00 |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
2016-08-01 15:33:47 +08:00 |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
2016-08-01 15:21:23 +08:00 |
|
yuanke
|
2c86ae3eb2
|
二维码识别 项目和班级区分
|
2016-08-01 15:09:36 +08:00 |
|
yuanke
|
c1bd3b6bf1
|
增加日志测试
|
2016-08-01 14:30:31 +08:00 |
 cxt
|
5b66489b61
|
Merge branch 'develop' into cxt_course
|
2016-08-01 14:06:16 +08:00 |
|
cxt
|
18539b45de
|
Merge branch 'dev_shcool' into develop
|
2016-08-01 14:03:58 +08:00 |
|
cxt
|
6d17329a6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-01 13:58:02 +08:00 |
|
cxt
|
3bc696a597
|
申请学校的更改
|
2016-08-01 13:57:55 +08:00 |
|
daiao
|
5272f20de8
|
单位审核bug的修复
|
2016-08-01 13:56:37 +08:00 |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
2016-08-01 13:54:10 +08:00 |
|
huang
|
c7f2ab0415
|
修复创建英文名字的项目标题为“为项目讨论区的问题”
|
2016-08-01 13:51:11 +08:00 |
|
yuanke
|
84f0069cbd
|
打开项目邀请码信息
|
2016-08-01 11:30:25 +08:00 |
|
yuanke
|
4c9e183cd0
|
微信菜单点击加入项目修改
|
2016-08-01 11:24:27 +08:00 |
|
yuanke
|
bb0bfa21cc
|
加入项目邀请码修改
|
2016-08-01 11:18:01 +08:00 |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
2016-08-01 11:14:03 +08:00 |
|
huang
|
e41a14fa04
|
Merge branch 'develop' into rep_quality
|
2016-08-01 10:02:19 +08:00 |
|
Tim
|
1eff394498
|
Merge branch 'develop' into cs_optimize_txz
|
2016-08-01 09:52:16 +08:00 |
|
huang
|
8a8860bd6c
|
gemfile注释后恢复
|
2016-08-01 09:51:13 +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 |
|
yuanke
|
f3ae53dc97
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
2016-08-01 09:21:31 +08:00 |