 huang
|
d832514a55
|
新增项目成员列表
|
2015-04-08 11:24:40 +08:00 |
|
huang
|
bf36da8dcb
|
修改醒目新闻新建页面
退出项目样式
|
2015-04-08 09:57:48 +08:00 |
 sw
|
cc6a9d12f1
|
新建课程时显示明码按钮样式
|
2015-04-08 09:46:05 +08:00 |
|
sw
|
235ba23a62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-07 17:49:21 +08:00 |
|
huang
|
217f62f373
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-07 17:45:13 +08:00 |
|
huang
|
8b379711d9
|
1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
|
2015-04-07 17:45:00 +08:00 |
 lizanle
|
a36d772f37
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-07 16:33:09 +08:00 |
|
lizanle
|
60838460fc
|
课程的创建动态也要显示
|
2015-04-07 16:32:53 +08:00 |
|
sw
|
0bea5dbb4e
|
修改课程动态标题a标签过长
|
2015-04-07 15:45:39 +08:00 |
|
huang
|
c1fea1c7e2
|
课程资源新界面
项目动态分页调整
|
2015-04-07 14:48:36 +08:00 |
|
sw
|
3bedddd190
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-07 13:49:45 +08:00 |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
2015-04-07 13:47:39 +08:00 |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
2015-04-07 12:48:47 +08:00 |
whimlex
|
db2d53aa48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-03 17:34:10 +08:00 |
|
whimlex
|
7b09fd0489
|
作业的时间选择器选择时间后不能自动关闭
|
2015-04-03 17:33:33 +08:00 |
|
lizanle
|
84c2e39e6c
|
新闻评论出现错误。误将safe_attributes换为直接属性comments
|
2015-04-03 17:06:19 +08:00 |
|
sw
|
8e38103bfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-03 16:40:29 +08:00 |
|
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 |