 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 |
|
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 |
 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 |
|
huang
|
ec32204809
|
sql_index --to chinese
|
2016-07-07 15:53:07 +08:00 |
|
cxt
|
290abeeaa4
|
班级名称的显示
|
2016-07-07 15:36:08 +08:00 |
|
cxt
|
3b91adf689
|
课程大纲内的编辑图标的显示与隐藏
|
2016-07-07 15:28:33 +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 |
 daiao
|
87d99a1908
|
数据迁移
|
2016-07-07 15:10:08 +08:00 |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
2016-07-07 15:04:57 +08:00 |
|
guange
|
a2ba65956c
|
.
|
2016-07-07 15:03:45 +08:00 |
|
daiao
|
c621602050
|
修复当鼠标移至区域内才会显示icon
|
2016-07-07 15:02:02 +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
|
b90c90bc60
|
add model error_list
|
2016-07-07 14:22:48 +08:00 |
|
huang
|
92b6171c36
|
sonar error puts
|
2016-07-07 11:08:29 +08:00 |
|
yuanke
|
a732efa6c6
|
1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复
|
2016-07-07 10:42:51 +08:00 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
|
yuanke
|
9d46040f7a
|
课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直
|
2016-07-06 17:08:22 +08:00 |
|
huang
|
88f8752490
|
添加权限
|
2016-07-06 16:37:19 +08:00 |
|
yuanke
|
9eee510649
|
新建课程时创建的班级设为私有
|
2016-07-06 16:23:12 +08:00 |
|
huang
|
2f8079e85c
|
版本 库存
|
2016-07-06 16:07:17 +08:00 |
|
yuanke
|
6fe8d7ddf5
|
点击图片弹框右下角统一用“关闭”
|
2016-07-06 16:03:50 +08:00 |
|
yuanke
|
796c5d5666
|
修改课程列表还显示已删除班级的BUG
|
2016-07-06 15:58:10 +08:00 |