 cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
2016-07-11 15:16:27 +08:00 |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
 huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
2016-07-11 11:34:07 +08:00 |
|
huang
|
93e79d9419
|
add hidden to css
|
2016-07-11 11:23:59 +08:00 |
|
cxt
|
8e8d6a8439
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
2016-07-11 08:48:03 +08:00 |
 guange
|
135b6ca64b
|
assets
|
2016-07-08 20:04:24 +08:00 |
|
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |
|
guange
|
2b17828844
|
rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 19:59:16 +08:00 |
|
guange
|
2604f3f0c7
|
资源搜索中只匹配name
|
2016-07-08 19:59:10 +08:00 |
 yuanke
|
f8eb150530
|
新增班级不完成点返回班级会出现再课程列表的BUG
|
2016-07-08 19:12:26 +08:00 |
|
guange
|
1413fe82dc
|
merge
|
2016-07-08 17:44:13 +08:00 |
|
yuanke
|
c2166811eb
|
修改管理课程界面刷新显示问题
|
2016-07-08 17:35:14 +08:00 |
|
yuanke
|
8d8de084ac
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 17:23:44 +08:00 |
|
yuanke
|
c6099177a4
|
修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等
|
2016-07-08 17:22:58 +08:00 |
 txz
|
ea5bd94e99
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 17:22:50 +08:00 |
|
txz
|
9ae7461501
|
资源列表学生进入时也显示为课件；课程tab页样式替换
|
2016-07-08 17:22:44 +08:00 |
|
guange
|
3c36e97ff1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 17:11:41 +08:00 |
|
guange
|
3c23560d77
|
我的资源搜索无效
|
2016-07-08 17:11:16 +08:00 |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
2016-07-08 17:04:17 +08:00 |
|
Tim
|
03bb862e18
|
代码查重页面消息弹框显示样式丢失
|
2016-07-08 16:55:48 +08:00 |
|
yuanke
|
3a2e2c1174
|
未命名课程暂不允许进行课程管理
|
2016-07-08 16:40:24 +08:00 |
|
yuanke
|
d38ce793bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 16:23:29 +08:00 |
|
yuanke
|
bb62ba40b7
|
修改微信权限问题、管理课程界面等
|
2016-07-08 16:23:07 +08:00 |
|
Tim
|
fec1015604
|
在线测验结果列表超出bug修改
|
2016-07-08 15:44:14 +08:00 |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-08 13:18:46 +08:00 |
|
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
2016-07-08 11:33:51 +08:00 |
|
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 11:31:02 +08:00 |
|
huang
|
61e2e427fd
|
Merge branch 'rep_quality' into develop
|
2016-07-08 11:30:53 +08:00 |
|
txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
2016-07-08 11:29:33 +08:00 |
|
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
2016-07-08 09:15:55 +08:00 |
|
cxt
|
3b418bc44c
|
如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。
|
2016-07-07 16:46:41 +08:00 |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
2016-07-07 15:14:11 +08:00 |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
2016-07-07 15:04:57 +08:00 |
|
guange
|
a2ba65956c
|
.
|
2016-07-07 15:03:45 +08:00 |
|
yuanke
|
3a6470b1f3
|
删除班级时增加提示确定信息
|
2016-07-07 14:55:41 +08:00 |
|
guange
|
7859bf9c32
|
.
|
2016-07-07 14:51:54 +08:00 |
|
guange
|
a17a6ed596
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-07 14:35:26 +08:00 |
|
guange
|
10789d2505
|
added alert2
|
2016-07-07 14:35:15 +08:00 |
|
huang
|
92b6171c36
|
sonar error puts
|
2016-07-07 11:08:29 +08:00 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
|
yuanke
|
9d46040f7a
|
课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直
|
2016-07-06 17:08:22 +08:00 |
|
yuanke
|
6fe8d7ddf5
|
点击图片弹框右下角统一用“关闭”
|
2016-07-06 16:03:50 +08:00 |
|
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
2016-07-06 11:06:32 +08:00 |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +08:00 |
|
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
2016-07-05 14:44:50 +08:00 |
|
txz
|
7a9665bbee
|
微信详情页面样式调整
|
2016-07-05 11:18:58 +08:00 |
|
cxt
|
4a5bdc5e48
|
课程列表中的班级显示适当缩进
|
2016-07-05 11:01:50 +08:00 |
|
cxt
|
f83bd3cf63
|
课程英文名称输入框去掉拉动图标
|
2016-07-05 10:52:26 +08:00 |
|
txz
|
8a59623a73
|
项目问题，项目讨论区，博客，留言详情页面样式更新
|
2016-07-05 10:15:32 +08:00 |