huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
2016-06-29 14:18:17 +08:00 |
Your Name
|
e5b93ac7ed
|
modified main method
|
2016-06-27 18:13:46 +08:00 |
huang
|
5aa79defbe
|
迁移问题
|
2016-06-24 19:27:15 +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
|
537f152562
|
0
|
2016-06-24 18:47:54 +08:00 |
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
2016-06-24 16:12:24 +08:00 |
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-24 15:34:32 +08:00 |
Your Name
|
06fe02890f
|
index for sonar result
|
2016-06-24 14:59:17 +08:00 |
guange
|
d348981721
|
加入邀请码
|
2016-06-24 13:29:36 +08:00 |
Your Name
|
ce6e6116b5
|
get data from sonar API
|
2016-06-22 17:09:54 +08:00 |
Your Name
|
9e7cde6056
|
stable version for sonar
|
2016-06-22 11:25:59 +08:00 |
Your Name
|
d5631defb5
|
added xml to jenkins and added some gems
|
2016-06-20 17:53:56 +08:00 |
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-06-17 11:33:48 +08:00 |
guange
|
8fd4d518b2
|
添加邀请码
|
2016-06-15 13:44:28 +08:00 |
cxt
|
6100abe0da
|
课程大纲
|
2016-06-14 10:38:11 +08:00 |
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-12 17:18:34 +08:00 |
txz
|
719774f159
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 14:52:29 +08:00 |
txz
|
b57f6fbc65
|
微信回复框增加padding
|
2016-06-12 14:52:24 +08:00 |
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改, 配置页面域名长度问题
|
2016-06-12 13:36:35 +08:00 |
huang
|
4ea12a6dc5
|
删除匿名用户数据迁移
|
2016-06-06 14:55:13 +08:00 |
huang
|
27a9170318
|
组织添加设为精品项目,热门课程
|
2016-06-01 17:38:41 +08:00 |
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
2016-05-31 10:31:08 +08:00 |
cxt
|
b065184754
|
删除机器人组织的匿名评论
|
2016-05-27 08:54:31 +08:00 |
huang
|
61eeee702c
|
migrate
|
2016-05-24 09:40:47 +08:00 |
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
2016-05-24 09:40:16 +08:00 |
huang
|
1c400669aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:36:00 +08:00 |
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
cxt
|
b03b9a3c27
|
课程:问卷导入时显示的数据未进行过滤
|
2016-05-20 09:59:41 +08:00 |
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
2016-05-19 16:04:27 +08:00 |
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
2016-05-19 15:26:23 +08:00 |
txz
|
e2f3ba8e7d
|
微信问题修改
|
2016-05-19 15:20:46 +08:00 |
txz
|
278ee66368
|
系统冲突
|
2016-05-19 13:47:08 +08:00 |
txz
|
1b3bc38f8e
|
拖代码改动
|
2016-05-19 13:44:03 +08:00 |
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
2016-05-18 14:49:13 +08:00 |
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
cxt
|
baaff3f988
|
数据迁移
|
2016-05-13 20:12:56 +08:00 |
cxt
|
90a9472e30
|
删除空数据
|
2016-05-13 20:07:43 +08:00 |
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
Tim
|
dc92e821a3
|
名师榜样式调整
|
2016-05-13 14:08:34 +08:00 |
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
2016-05-13 10:29:22 +08:00 |
huang
|
37ee03374e
|
完成设置名师功能
|
2016-05-13 09:53:22 +08:00 |
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-11 16:23:58 +08:00 |
cxt
|
9096ad5eac
|
数据迁移的还原
|
2016-05-11 15:06:12 +08:00 |
cxt
|
2d95885345
|
迁移文件
|
2016-05-11 15:00:26 +08:00 |
cxt
|
77d713a390
|
合并两个相同的作业
|
2016-05-11 14:28:13 +08:00 |
cxt
|
320c3881ef
|
多次点击发送按钮不应新建多个作业
|
2016-05-11 10:48:04 +08:00 |
txz
|
ec3a077b22
|
微信意见反馈按钮文字错误
|
2016-05-10 14:48:40 +08:00 |