 lizanle
|
5ee732063d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-03 16:35:56 +08:00 |
|
lizanle
|
1009f7ac07
|
资源id判空
|
2015-04-03 16:35:46 +08:00 |
whimlex
|
a1b5277fe2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-03 16:15:10 +08:00 |
|
whimlex
|
6e0de61458
|
项目讨论区回复修改
|
2015-04-03 16:13:31 +08:00 |
 sw
|
4044cc6674
|
Merge branch 'develop' into szzh
|
2015-04-03 16:01:14 +08:00 |
|
sw
|
42124e8ec5
|
开启、关闭匿评是有时候报500
|
2015-04-03 15:54:58 +08:00 |
|
sw
|
500b54a466
|
讨论区回复引用是html代码
|
2015-04-03 15:39:24 +08:00 |
|
lizanle
|
5299d2d332
|
删除demo代码
|
2015-04-03 15:13:51 +08:00 |
|
lizanle
|
717463076c
|
删除democontroller
|
2015-04-03 15:09:46 +08:00 |
|
lizanle
|
452e299966
|
删除demo代码
|
2015-04-03 15:08:52 +08:00 |
|
sw
|
b971147aa8
|
1、添加通知会alert
2、添加通知描述样式
3、通知添加评论样式
|
2015-04-03 15:01:26 +08:00 |
|
lizanle
|
56cbc753eb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-03 14:35:55 +08:00 |
|
lizanle
|
f96fbe5150
|
注释一行不需要的
|
2015-04-03 14:35:50 +08:00 |
|
sw
|
01fed2eab9
|
Merge branch 'szzh' into develop
|
2015-04-03 13:11:11 +08:00 |
|
sw
|
ec8e609ddc
|
打爆下载增加权限、增加打包下载功能
|
2015-04-03 13:10:18 +08:00 |
|
lizanle
|
b8cc431f13
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-03 12:08:43 +08:00 |
|
lizanle
|
65030656a6
|
kindeditor上传的资源所属的类型映射关系
|
2015-04-03 12:08:30 +08:00 |
|
sw
|
04e1ebbc6d
|
Merge branch 'guange_dev' into szzh
|
2015-04-03 11:39:30 +08:00 |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
2015-04-03 11:38:27 +08:00 |
 guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
2015-04-03 11:34:39 +08:00 |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-03 11:31:08 +08:00 |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
2015-04-03 11:30:48 +08:00 |
|
guange
|
893f6af856
|
用回rubyzip, zipruby有bug.
|
2015-04-03 11:29:37 +08:00 |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
2015-04-03 11:19:15 +08:00 |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
2015-04-02 17:20:52 +08:00 |
|
guange
|
0118b10725
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-02 09:45:13 +08:00 |
|
lizanle
|
073ef00bb7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-02 08:48:34 +08:00 |
|
lizanle
|
552c27c51d
|
课程作业学生提问问题计数修改
|
2015-04-02 08:48:01 +08:00 |
|
guange
|
9cefb9f339
|
每日发送取日期不对
|
2015-04-01 17:47:04 +08:00 |
|
guange
|
0099ab9f9a
|
去除以前的邮件规则
|
2015-04-01 16:44:40 +08:00 |
|
guange
|
243bac8fed
|
除了mail_notification == all 的，其他都不即时发邮件
|
2015-04-01 16:41:23 +08:00 |
|
guange
|
3ea33aa847
|
新建news报500
|
2015-04-01 13:14:15 +08:00 |
|
guange
|
b23892e29e
|
在application中去除observer
|
2015-04-01 11:19:49 +08:00 |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
2015-04-01 11:16:57 +08:00 |
|
guange
|
89e0602983
|
邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到
|
2015-04-01 11:12:55 +08:00 |
 z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
2015-03-31 15:57:15 +08:00 |
|
guange
|
27e123f9fd
|
const_defined?小错误
|
2015-03-31 12:02:33 +08:00 |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
2015-03-31 11:51:34 +08:00 |
|
z9hang
|
c4e9321e14
|
将attachment_candown方法提取到application_help里面
|
2015-03-31 10:03:52 +08:00 |
|
z9hang
|
43af61d684
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-31 09:34:48 +08:00 |
|
z9hang
|
e2eaae63f4
|
资源模块，默认按时间降序排列
|
2015-03-31 09:34:27 +08:00 |
|
guange
|
efdfa67c64
|
日报homework created_on to created_at
|
2015-03-30 21:32:48 +08:00 |
|
guange
|
77134c8dde
|
将每日邮件移入crontab
|
2015-03-30 20:56:42 +08:00 |
|
sw
|
a65fd92bf4
|
Merge branch 'szzh' into develop
|
2015-03-30 18:06:03 +08:00 |
|
sw
|
b344bf3ea6
|
分页空间样式调整
|
2015-03-30 18:04:52 +08:00 |
|
sw
|
a84af9d138
|
课程私有资源不显示在没有权限查看的用户上
|
2015-03-30 17:44:40 +08:00 |
|
z9hang
|
5bbc562abd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-30 17:15:07 +08:00 |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
2015-03-30 17:14:52 +08:00 |
|
sw
|
5954ced7a7
|
Merge branch 'develop' into szzh
|
2015-03-30 17:09:20 +08:00 |
|
sw
|
4817e2e1a7
|
新建课程取消后返回host_course
|
2015-03-30 17:04:36 +08:00 |