 huang
|
79fc4b7752
|
Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
Conflicts:
Gemfile
app/controllers/pull_requests_controller.rb
|
2016-12-15 09:26:24 +08:00 |
|
黄井泉
|
74a20dddc1
|
Merge branch 'dev_newproject' into 'develop'
Issue和commit关联功能
See merge request !49
|
2016-12-09 14:17:06 +08:00 |
|
huang
|
2a5bb6dcb8
|
Merge branch 'guange_dev' into develop
Conflicts:
Gemfile
|
2016-12-09 09:35:12 +08:00 |
|
huang
|
66066e6899
|
commit导出方法及显示页面
|
2016-12-05 14:52:46 +08:00 |
 guange
|
d351827ba2
|
at功能实现
|
2016-12-04 19:20:02 +08:00 |
|
guange
|
195f47c306
|
gemfile清理
|
2016-12-02 09:29:51 +08:00 |
|
huang
|
6725d122f8
|
Merge branch 'develop' into dai_ao
Conflicts:
app/controllers/pull_requests_controller.rb
|
2016-11-30 09:42:29 +08:00 |
 daiao
|
43cd4f55ac
|
Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/controllers/pull_requests_controller.rb
|
2016-11-29 12:27:40 +08:00 |
 yuanke
|
9598174180
|
修改grape版本
|
2016-11-09 16:01:59 +08:00 |
 cxt
|
e65f9bd98b
|
issue多级回复的调整
|
2016-10-31 15:56:37 +08:00 |
|
huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
|
yuanke
|
ac4205e08d
|
图片压缩的gemfile改下
|
2016-10-21 14:57:44 +08:00 |
|
yuanke
|
db76ca93d8
|
打开压缩gem包
|
2016-10-20 14:41:54 +08:00 |
|
daiao
|
2324ad31e2
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
public/stylesheets/css/common.css
public/stylesheets/css/project.css
|
2016-10-13 17:00:53 +08:00 |
|
cxt
|
56de0cc0be
|
gemfile还原
|
2016-10-08 18:06:33 +08:00 |
|
cxt
|
12d70c6999
|
分组作业编辑时“基于项目实施”的设置不起作用
|
2016-10-08 18:06:09 +08:00 |
|
huang
|
0dd25c2419
|
gemfile
|
2016-09-28 11:40:00 +08:00 |
|
huang
|
b8ab3dc497
|
点数字不还原
|
2016-09-28 11:39:11 +08:00 |
|
yuanke
|
9b4e146577
|
.
|
2016-09-20 15:00:22 +08:00 |
|
yuanke
|
8bb1323612
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/edit_userinfo.html
|
2016-09-20 14:59:40 +08:00 |
 Tim
|
862bbd1a1f
|
班级名称前增加课程名，一系列更改
|
2016-09-09 15:49:31 +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 |
|
yuanke
|
f9ee56111f
|
.
|
2016-08-14 13:46:46 +08:00 |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
huang
|
5e4a659cba
|
gemfile
|
2016-08-02 13:04:40 +08:00 |
|
huang
|
8a8860bd6c
|
gemfile注释后恢复
|
2016-08-01 09:51:13 +08:00 |
|
huang
|
f7e8c5232c
|
个人主页加入项目，如果已经申请了则提示已申请
|
2016-08-01 09:50:05 +08:00 |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
2016-07-28 15:11:04 +08:00 |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
2016-07-25 16:59:52 +08:00 |
|
guange
|
8c2ae92d31
|
加入性能分析
|
2016-07-15 14:45:01 +08:00 |
|
guange
|
c7bb53d2bd
|
在服务端加上imagemagick
|
2016-07-09 13:39:50 +08:00 |
|
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |
|
huang
|
2f8079e85c
|
版本 库存
|
2016-07-06 16:07:17 +08:00 |
|
guange
|
373e3d3422
|
merge
|
2016-07-04 17:06:26 +08:00 |
|
txz
|
bd1aae07fd
|
微信动态页面样式更新
|
2016-07-04 14:43:51 +08:00 |
|
yuanke
|
c151a61980
|
把几个gem包位置放下
|
2016-06-29 09:14:53 +08:00 |
|
guange
|
222855ea79
|
越过course表的validate,以防save invitecode 失败
|
2016-06-28 19:19:59 +08:00 |
|
guange
|
0c4f8810c8
|
修改一个centos能安装成功的rmagick
|
2016-06-27 21:36:59 +08:00 |
|
guange
|
3b383dfa65
|
老师课程界面
|
2016-06-27 16:03:07 +08:00 |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 11:09:31 +08:00 |
|
guange
|
c501af70ba
|
.
|
2016-06-27 11:09:25 +08:00 |
|
huang
|
012eae9b93
|
gems
|
2016-06-24 19:54:01 +08:00 |
|
huang
|
6f2ce2668c
|
注释掉gem
|
2016-06-24 19:23:13 +08:00 |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
2016-06-24 19:17:26 +08:00 |
|
guange
|
52d4d36097
|
邀请码页面
|
2016-06-24 09:01:12 +08:00 |
|
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
2016-06-21 16:50:45 +08:00 |
Your Name
|
d5631defb5
|
added xml to jenkins and added some gems
|
2016-06-20 17:53:56 +08:00 |
|
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
2016-06-13 15:21:29 +08:00 |
|
huang
|
74ee3205bd
|
淘宝源
|
2016-06-02 15:47:17 +08:00 |
|
cxt
|
617649129e
|
Gemfile
|
2016-05-18 11:20:14 +08:00 |