 yuanke
|
c151a61980
|
把几个gem包位置放下
|
2016-06-29 09:14:53 +08:00 |
|
yuanke
|
233e7d5c91
|
Merge branch 'lingbing' into yuanke_org
Conflicts:
Gemfile
|
2016-06-29 08:51:43 +08:00 |
 Linda
|
c24fdee134
|
个人资料页面新版修改
|
2016-06-29 08:48:13 +08:00 |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
2016-06-29 08:48:07 +08:00 |
 guange
|
222855ea79
|
越过course表的validate,以防save invitecode 失败
|
2016-06-28 19:19:59 +08:00 |
|
guange
|
7fdfc02821
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-28 17:47:32 +08:00 |
|
guange
|
3c425edc3c
|
修复邀请码会变的问题
|
2016-06-28 17:46:27 +08:00 |
 cxt
|
4983d5283b
|
关联成员能多次添加
|
2016-06-28 16:30:33 +08:00 |
|
cxt
|
cbe34ea0a7
|
分组作业提交作品时关联成员列表为空
|
2016-06-28 15:57:56 +08:00 |
|
guange
|
436de8ce5a
|
优先取env中的wechat url
|
2016-06-28 11:33:54 +08:00 |
|
guange
|
57cdc1d5ec
|
协议修改
|
2016-06-28 11:30:06 +08:00 |
|
guange
|
e9f280b4aa
|
.
|
2016-06-28 11:07:15 +08:00 |
|
guange
|
047903ddff
|
重构课程地址
|
2016-06-28 10:57:58 +08:00 |
|
guange
|
0c4f8810c8
|
修改一个centos能安装成功的rmagick
|
2016-06-27 21:36:59 +08:00 |
|
guange
|
1e6454efc0
|
加入我的资源
|
2016-06-27 17:24:06 +08:00 |
|
guange
|
f6f329b00f
|
erge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 16:06:20 +08:00 |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 16:03:55 +08:00 |
 huang
|
845141a189
|
注释掉代码质量分析入口
|
2016-06-27 16:03:43 +08:00 |
|
guange
|
3b383dfa65
|
老师课程界面
|
2016-06-27 16:03:07 +08:00 |
|
yuanke
|
11d38fc3e3
|
Merge branch 'yuanke' into develop
|
2016-06-27 15:58:26 +08:00 |
|
yuanke
|
a83400f233
|
粘贴图片 留言和回复框 保持一直截图都可以粘贴进去
|
2016-06-27 15:57:45 +08:00 |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
2016-06-27 15:52:01 +08:00 |
|
yuanke
|
dd397a060b
|
修改删除组织成员跨域的BUG
|
2016-06-27 15:48:33 +08:00 |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
2016-06-27 15:47:06 +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
|
01bedc4bc2
|
编码问题
|
2016-06-24 19:40:06 +08:00 |
|
huang
|
5aa79defbe
|
迁移问题
|
2016-06-24 19:27:15 +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 |
Your Name
|
c658296e2b
|
config
|
2016-06-24 19:12:07 +08:00 |
|
cxt
|
f984a01cdc
|
跳转协议问题
|
2016-06-24 18:50:47 +08:00 |
|
Your Name
|
537f152562
|
0
|
2016-06-24 18:47:54 +08:00 |
|
cxt
|
b5c9156c10
|
加入课程报403
|
2016-06-24 18:43:12 +08:00 |
|
cxt
|
0d66763026
|
迟交扣分
|
2016-06-24 18:23:00 +08:00 |
|
cxt
|
8d5501615c
|
加入课程的样式调整
|
2016-06-24 18:09:18 +08:00 |
|
cxt
|
492b2f895c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-24 17:58:56 +08:00 |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
2016-06-24 17:58:50 +08:00 |
|
Your Name
|
e5ad64831a
|
0
|
2016-06-24 17:50:26 +08:00 |
|
huang
|
6bc4dec636
|
列表界面
|
2016-06-24 17:46:21 +08:00 |
|
Your Name
|
244c178758
|
666
|
2016-06-24 17:39:10 +08:00 |
|
guange
|
7df9fe7d60
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 17:37:11 +08:00 |
|
guange
|
b5bfe40693
|
.
|
2016-06-24 17:35:55 +08:00 |
|
yuanke
|
e3c094cb07
|
Merge branch 'yuanke' into develop
|
2016-06-24 17:19:25 +08:00 |
|
yuanke
|
f1682edf64
|
修改创建贴吧BUG
|
2016-06-24 17:18:04 +08:00 |
|
guange
|
9e61f2229e
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 17:15:10 +08:00 |
|
guange
|
084b545be9
|
修改为正式版
|
2016-06-24 17:14:58 +08:00 |
|
cxt
|
b2f939fa92
|
代码调整
|
2016-06-24 17:01:35 +08:00 |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:54:19 +08:00 |