 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 |
 huang
|
8365042399
|
Merge branch 'rep_quality' into develop
|
2016-07-08 19:47:50 +08:00 |
 cxt
|
73619ca696
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 19:47:39 +08:00 |
|
huang
|
6b8b20e127
|
logger to puts
|
2016-07-08 19:45:15 +08:00 |
|
cxt
|
1a15c0f567
|
新建班级发布作业报500
|
2016-07-08 19:25:26 +08:00 |
|
cxt
|
d25f401afa
|
管理员界面修改班级名称
|
2016-07-08 19:16:53 +08:00 |
 yuanke
|
f8eb150530
|
新增班级不完成点返回班级会出现再课程列表的BUG
|
2016-07-08 19:12:26 +08:00 |
|
huang
|
23ba289adf
|
Merge branch 'develop' into rep_quality
|
2016-07-08 19:02:38 +08:00 |
|
yuanke
|
5ccde8e433
|
修改课程列表显示不对的BUG
|
2016-07-08 18:52:21 +08:00 |
|
yuanke
|
189e641d23
|
课程列表改下
|
2016-07-08 18:32:30 +08:00 |
|
cxt
|
6115b7fa4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 18:23:05 +08:00 |
|
cxt
|
3362ebe321
|
线下作业
|
2016-07-08 18:22:59 +08:00 |
|
yuanke
|
1df1368214
|
修改课程名修改无效的BUG
|
2016-07-08 18:12:22 +08:00 |
|
yuanke
|
cce503f32f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 18:08:55 +08:00 |
|
yuanke
|
f1f61c304a
|
修改课程列表显示有误的问题
|
2016-07-08 18:08:31 +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
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
2016-07-08 17:18:09 +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 |
|
huang
|
011b7ef4d4
|
Merge branch 'rep_quality' into develop
|
2016-07-08 16:59:05 +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 |
|
huang
|
5a40174910
|
change show data's method
|
2016-07-08 16:19:33 +08:00 |
|
Tim
|
fec1015604
|
在线测验结果列表超出bug修改
|
2016-07-08 15:44:14 +08:00 |
|
cxt
|
5a22e9a147
|
作业启动匿评
|
2016-07-08 15:44:03 +08:00 |
|
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
2016-07-08 15:02:50 +08:00 |
|
huang
|
b0aa3c18c3
|
Merge branch 'rep_quality' into develop
|
2016-07-08 14:43:29 +08:00 |
|
huang
|
8916cc7730
|
update homeworkcommon time
|
2016-07-08 14:40:21 +08:00 |
|
huang
|
040b6d4b9d
|
Merge branch 'rep_quality' into develop
|
2016-07-08 14:26:40 +08:00 |
|
huang
|
b22882aead
|
some data for css
|
2016-07-08 14:22:20 +08:00 |
|
huang
|
fcf32474b6
|
modified days and hours for nil data
|
2016-07-08 13:53:54 +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 |
|
huang
|
406d636aac
|
add error system
|
2016-07-08 11:27:03 +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 |