 ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
2016-03-14 18:29:50 +08:00 |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
2016-03-14 18:20:19 +08:00 |
|
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:46:47 +08:00 |
 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 |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
luoquan
|
62f91865e0
|
kindeditor视频添加默认图片
|
2016-03-11 10:21:16 +08:00 |
|
luoquan
|
7d70e63f8d
|
代码重置
|
2016-03-11 10:18:10 +08:00 |
|
luoquan
|
e80caf87b2
|
还原行距问题
|
2016-03-11 09:52:36 +08:00 |
|
luoquan
|
2d14b26c11
|
还原行距问题
|
2016-03-11 09:52:11 +08:00 |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
2016-03-10 17:41:53 +08:00 |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
2016-03-10 17:04:26 +08:00 |
|
huang
|
5818860a4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-10 16:44:05 +08:00 |
|
huang
|
08cb7b642c
|
附件上传样式
|
2016-03-10 16:43:25 +08:00 |
|
cxt
|
fa3fd56686
|
题库发送课程的弹框搜索不能用
|
2016-03-10 15:48:39 +08:00 |
|
cxt
|
c255325300
|
添加分班
|
2016-03-10 15:47:03 +08:00 |
|
yuanke
|
28b481cf36
|
修改KE点击上传图片时选择非图片格式时的提示信息
|
2016-03-10 15:37:07 +08:00 |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |