 huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
2016-03-15 11:09:11 +08:00 |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
2016-03-15 09:26:26 +08:00 |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
2016-03-14 18:25:26 +08:00 |
 yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
2016-03-14 18:19:23 +08:00 |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
2016-03-14 17:31:53 +08:00 |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
2016-03-14 17:16:11 +08:00 |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
2016-03-14 15:51:50 +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
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
|
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
2016-03-11 16:25:05 +08:00 |
 Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
2016-03-11 15:49:24 +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 |
|
luoquan
|
ec4b7e3744
|
视频默认图标
|
2016-03-11 11:24:10 +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 |
|
yuanke
|
28b481cf36
|
修改KE点击上传图片时选择非图片格式时的提示信息
|
2016-03-10 15:37:07 +08:00 |
|
yuanke
|
6fa2fd8b47
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
2016-03-10 15:11:33 +08:00 |
|
yuanke
|
9b5cd8f880
|
KE表格修改
|
2016-03-10 11:28:56 +08:00 |
|
yuanke
|
5ea618b520
|
修改KE插入图片没显示完全的问题
|
2016-03-10 11:16:39 +08:00 |
|
luoquan
|
a6da304b56
|
修改KE编辑换行后发布对不齐问题
|
2016-03-10 11:10:05 +08:00 |
|
luoquan
|
1c6deadfd7
|
修改KE编辑的内容与发布的样式对其不一致问题
|
2016-03-10 10:58:43 +08:00 |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |
|
yuanke
|
0805bfce6a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
2016-03-09 15:32:24 +08:00 |
|
yuanke
|
5dcd3b6826
|
解决KE工具栏一行与两行显示不一致的情况
|
2016-03-09 15:32:08 +08:00 |
|
yuanke
|
e073d58169
|
KE的几个问题修改
1.我要回复
2.段落颜色
3.变粗滚动条移动
4.没默认字体
|
2016-03-09 10:16:27 +08:00 |
|
cxt
|
1cccf79bd8
|
课程资源库菜单中的删除资源无法点击
|
2016-03-09 09:20:53 +08:00 |
|
cxt
|
f0e3fe8ff7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-08 09:13:27 +08:00 |
|
cxt
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
2016-03-07 17:01:10 +08:00 |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
2016-03-07 16:50:30 +08:00 |
|
huang
|
d30e73795d
|
积分规则
|
2016-03-06 12:15:57 +08:00 |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
2016-03-04 11:11:25 +08:00 |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
2016-03-04 11:07:53 +08:00 |
|
huang
|
596d4e17e9
|
解决样式冲突
|
2016-03-04 09:57:54 +08:00 |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-03-04 09:33:38 +08:00 |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
2016-03-04 09:32:49 +08:00 |
|
cxt
|
9b573248d8
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_show_user_homework_form.html.erb
app/views/users/_show_user_homeworks.html.erb
|
2016-03-03 17:07:35 +08:00 |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
2016-03-03 17:04:38 +08:00 |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
2016-03-03 10:38:37 +08:00 |
|
Tim
|
f51d16c538
|
资源库样式调整
|
2016-03-02 18:20:36 +08:00 |
|
huang
|
21244a5657
|
资源库导入功能
|
2016-03-02 17:46:10 +08:00 |
|
huang
|
8edaa9d2bd
|
资源库
|
2016-03-01 17:33:44 +08:00 |
|
Tim
|
11592bdbcc
|
导入题库题目弹框样式更改
|
2016-03-01 17:28:49 +08:00 |
|
cxt
|
f6f84b564e
|
在线测验的选项和候选答案的正确显示
|
2016-03-01 15:18:38 +08:00 |