 huang
|
7c9e20c9bf
|
登录注册样式
|
2016-03-29 16:51:50 +08:00 |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
2016-03-29 16:45:14 +08:00 |
 alan
|
88a4b8ce6c
|
Merge branch 'alan_develop' into develop
|
2016-03-29 16:44:06 +08:00 |
|
alan
|
e4fc9f39e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 16:43:52 +08:00 |
|
alan
|
200561da92
|
修改《私有资源公共资源中不显示》
|
2016-03-29 16:43:14 +08:00 |
 ouyangxuhua
|
2d4296ef96
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 16:07:26 +08:00 |
|
ouyangxuhua
|
74d8dffc14
|
发送功能样式调整
|
2016-03-29 16:07:00 +08:00 |
 yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
2016-03-29 15:56:02 +08:00 |
|
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
2016-03-29 15:54:44 +08:00 |
|
ouyangxuhua
|
9e599da365
|
组织动态，点击展开更多没有反应问题解决
|
2016-03-29 15:47:05 +08:00 |
|
alan
|
03d855f5d5
|
修改资源区分页问题
|
2016-03-29 15:46:13 +08:00 |
|
ouyangxuhua
|
7f0959c972
|
题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式
|
2016-03-29 15:25:22 +08:00 |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-29 13:51:46 +08:00 |
|
huang
|
68edc792e9
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/controllers/organizations_controller.rb
|
2016-03-29 13:48:26 +08:00 |
|
huang
|
2b9ddf3594
|
组织新版
|
2016-03-29 13:43:28 +08:00 |
|
ouyangxuhua
|
2275b367f4
|
在organization控制器的show方法添加layout
|
2016-03-29 13:22:18 +08:00 |
|
ouyangxuhua
|
56f8d4854b
|
恢复代码
|
2016-03-29 12:38:02 +08:00 |
|
alan
|
e9069f0225
|
fix merge bug
|
2016-03-29 12:29:23 +08:00 |
|
alan
|
eb1c6ccf85
|
Merge branch 'alan_develop' into develop
Conflicts:
app/views/users/_resource_share_for_orgs.html.erb
app/views/users/_resource_share_for_project_popup.html.erb
app/views/users/_resource_share_popup.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-03-29 11:36:49 +08:00 |
|
huang
|
b80bc98fcb
|
组织首页
|
2016-03-29 11:31:58 +08:00 |
 cxt
|
d1cb44cff7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 10:39:51 +08:00 |
|
cxt
|
1daf620ed1
|
新建作品点取消时跳到我的作业页面
|
2016-03-29 10:39:44 +08:00 |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-29 10:21:29 +08:00 |
|
alan
|
dfe9cb0c68
|
Merge branch 'develop' into alan_develop
|
2016-03-29 10:16:30 +08:00 |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
2016-03-29 10:15:18 +08:00 |
|
cxt
|
0b0f484a5b
|
更新吴文植的分数
|
2016-03-29 09:50:37 +08:00 |
|
ouyangxuhua
|
598f69abb0
|
组织显示模式暂时隐藏
|
2016-03-29 09:35:07 +08:00 |
|
cxt
|
b9f1ff3cd2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 09:24:24 +08:00 |
|
cxt
|
ed0eb4aff3
|
学生作品详情无法打开
|
2016-03-29 09:24:11 +08:00 |
|
yuanke
|
0217dc0054
|
Merge branch 'yuanke' into develop
|
2016-03-29 09:14:31 +08:00 |
|
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
2016-03-29 09:02:54 +08:00 |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
2016-03-28 22:37:01 +08:00 |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
2016-03-28 19:20:09 +08:00 |
|
cxt
|
8e7d25a483
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-28 17:20:52 +08:00 |
|
cxt
|
f46985c8bc
|
作品点赞报500
|
2016-03-28 17:20:46 +08:00 |
|
huang
|
64f13a04cc
|
动态500问题
|
2016-03-28 17:09:42 +08:00 |
|
huang
|
b8463fcca5
|
北斗
|
2016-03-28 16:51:58 +08:00 |
|
cxt
|
33c9331c7b
|
课程设置为私有/公开 课程头部未刷新
|
2016-03-28 15:35:24 +08:00 |
|
huang
|
74a4e80795
|
Merge branch 'ouyangxuhua' into hjq_beidou
|
2016-03-28 15:11:37 +08:00 |
|
huang
|
9fc227d619
|
资源库问题
|
2016-03-28 14:50:26 +08:00 |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
2016-03-28 14:11:40 +08:00 |
|
ouyangxuhua
|
67ff9fb6e2
|
组织显示模式功能
|
2016-03-28 13:03:13 +08:00 |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
2016-03-28 11:24:31 +08:00 |
|
huang
|
326730f6b1
|
北斗框架
|
2016-03-28 10:39:09 +08:00 |
|
yuanke
|
5ee36148a4
|
Merge branch 'develop' into yuanke
|
2016-03-26 16:00:15 +08:00 |
|
yuanke
|
668de3ce4c
|
Merge branch 'yuanke' into develop
|
2016-03-26 15:44:54 +08:00 |
|
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
2016-03-26 15:44:28 +08:00 |
|
yuanke
|
879a34a1a5
|
Merge branch 'develop' into yuanke
|
2016-03-26 15:43:52 +08:00 |
|
yuanke
|
1b4f525ad0
|
Merge branch 'yuanke' into develop
|
2016-03-26 15:00:30 +08:00 |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
2016-03-26 14:59:51 +08:00 |