 huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
2016-03-14 17:31:53 +08:00 |
 ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:29:06 +08:00 |
 yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
2016-03-14 17:16:11 +08:00 |
 cxt
|
d2a8acf87b
|
个人主页--首页显示不全，右下角也应该显示展开按钮
|
2016-03-14 17:11:23 +08:00 |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +08:00 |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
2016-03-14 16:33:16 +08:00 |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
2016-03-14 15:51:50 +08:00 |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
2016-03-14 15:39:45 +08:00 |
|
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
2016-03-14 15:18:56 +08:00 |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
2016-03-14 15:02:37 +08:00 |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
2016-03-14 14:43:30 +08:00 |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
2016-03-14 14:39:58 +08:00 |
 alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
2016-03-14 11:06:29 +08:00 |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
2016-03-14 11:00:55 +08:00 |
|
alan
|
2f5ce553e2
|
refactor user find
|
2016-03-14 10:46:02 +08:00 |
|
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
2016-03-14 10:25:39 +08:00 |
|
alan
|
ce6d63ccaf
|
重构user.find
|
2016-03-14 10:24:50 +08:00 |
|
cxt
|
f174101297
|
数据迁移
|
2016-03-11 20:28:43 +08:00 |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
2016-03-11 19:34:33 +08:00 |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 19:31:22 +08:00 |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
2016-03-11 19:31:06 +08:00 |
|
cxt
|
a845da5c17
|
点赞有延迟
|
2016-03-11 19:25:24 +08:00 |
 guange
|
45c51ef8db
|
merge
|
2016-03-11 18:51:41 +08:00 |
|
guange
|
24a278d7d6
|
加上atall
|
2016-03-11 18:50:37 +08:00 |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
|
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
2016-03-11 16:25:05 +08:00 |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 16:18:10 +08:00 |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
2016-03-11 16:17:51 +08:00 |
|
huang
|
97a7694778
|
访问统计数--views
|
2016-03-11 15:58:16 +08:00 |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 15:51:59 +08:00 |
|
Tim
|
051c9dfd0c
|
Merge branch 'cxt_course' into develop
|
2016-03-11 15:51:45 +08:00 |
|
huang
|
8079254089
|
首页增加访问统计
|
2016-03-11 15:51:45 +08:00 |
|
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 15:49:54 +08:00 |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
2016-03-11 15:49:24 +08:00 |
|
huang
|
c18634be86
|
课程通知。新闻代码优化
|
2016-03-11 15:21:40 +08:00 |
|
luoquan
|
4fa25f68b6
|
Merge branch 'luoquan' into yuanke
|
2016-03-11 14:40:31 +08:00 |
|
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
|
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
luoquan
|
1e256add7f
|
媒体播放默认样式
|
2016-03-11 13:17:15 +08:00 |
|
luoquan
|
033c7991e1
|
修改媒体播放
|
2016-03-11 13:16:44 +08:00 |
|
alan
|
1f5c90185a
|
修复《顶部搜索“分析”报404错误》
|
2016-03-11 13:14:32 +08:00 |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
2016-03-11 11:34:16 +08:00 |
|
luoquan
|
ec4b7e3744
|
视频默认图标
|
2016-03-11 11:24:10 +08:00 |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
2016-03-11 11:23:16 +08:00 |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
2016-03-11 11:17:44 +08:00 |
|
huang
|
47ca79c317
|
news消息已读修改
|
2016-03-11 10:49:17 +08:00 |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
2016-03-11 10:45:29 +08:00 |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
2016-03-11 10:21:59 +08:00 |