 huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
2015-07-03 10:51:54 +08:00 |
|
huang
|
a3070e06e8
|
修改成上传空文件不给出提示
|
2015-07-02 16:03:06 +08:00 |
|
huang
|
5a950b227a
|
课程、项目上传文件为空时给出提醒
|
2015-07-02 15:53:12 +08:00 |
|
huang
|
c0b3e27c1b
|
添加项目文件上传成功提醒
|
2015-07-02 15:02:05 +08:00 |
|
huang
|
288cc5397e
|
添加文件上传提醒样式
|
2015-07-02 14:39:36 +08:00 |
|
huang
|
faf019b326
|
文件上传完成后给出提醒
|
2015-07-02 14:32:06 +08:00 |
 sw
|
fa1a03bef3
|
超级管理员可查看下载私有课程的私有资源
|
2015-07-01 10:30:26 +08:00 |
|
huang
|
cf0e1b3bd5
|
修改缺陷：上传名称较长的资源，文字被截断了
|
2015-06-26 09:47:58 +08:00 |
 guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
2015-06-18 09:13:20 +08:00 |
|
guange
|
25ac0100c7
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-06-10 15:20:52 +08:00 |
|
guange
|
89f71ffa46
|
解决相关资源后的下载图标按钮后就直接预览了，不合适缺陷
|
2015-06-10 15:19:59 +08:00 |
|
sw
|
9d1100a9df
|
项目内资源选人我的项目关闭按钮
|
2015-06-05 10:50:43 +08:00 |
|
sw
|
c31e370ad6
|
课程资源列表：选人我的课程、选入我的其他课程弹出框关闭按钮异常
|
2015-06-05 10:37:24 +08:00 |
|
sw
|
7bab135ac7
|
1、上传资源时公开单选框样式
2、课程上传资源文件有下拉条
|
2015-06-05 10:25:58 +08:00 |
|
guange
|
971755c74a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-06-04 22:39:40 +08:00 |
|
guange
|
36afb4d1f8
|
视频在公共贴吧的帖子回复里发不
|
2015-06-04 13:55:38 +08:00 |
|
sw
|
6b7a60a7e1
|
课程资源列表增加5个像素间隔
|
2015-06-04 10:56:49 +08:00 |
|
guange
|
fb7c65a70d
|
添加下载原始文件链接
|
2015-06-04 10:26:35 +08:00 |
|
guange
|
444658d0b3
|
转换变为既时转换
|
2015-06-04 10:24:05 +08:00 |
|
huang
|
379de18cd6
|
修改资源库全站搜索：
1、搜索条件为空的时候，不允许显示全部资源
2、全站搜索，非自己上传的资源不允许查看
3、全站搜索，项目管理员能设置公开权限的资源在全局搜索中也可以
|
2015-05-23 10:40:15 +08:00 |
 yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
2015-05-20 11:56:34 +08:00 |
|
huang
|
196c3b48b1
|
资源库区分“引入我的项目”和“引入我的其它项目”
修复新建项目冲突
|
2015-05-19 16:11:22 +08:00 |
|
yutao
|
895058f38e
|
修复bug#2154:成功上传课件，课程资源数统计未自动刷新
|
2015-05-19 11:30:31 +08:00 |
|
huang
|
3f77e2cdcf
|
资源权限公共方法定义
|
2015-05-18 11:36:29 +08:00 |
|
huang
|
2c568ed370
|
修改主页下载不存在的资源500错误
定义helper方法
|
2015-05-14 15:37:25 +08:00 |
|
huang
|
97780b7eef
|
私有项目可以引用其他资源
|
2015-05-14 11:14:05 +08:00 |
|
huang
|
f3b46c5823
|
项目资源库权限优化：
管理员、资源上传者拥有设置公开私有权限
私有项目不提供引用其它项目和公开功能
|
2015-05-11 15:50:23 +08:00 |
|
huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
2015-05-06 16:56:08 +08:00 |
|
huang
|
a7b2ac860b
|
修改索引迁移文件不能执行的问题
|
2015-05-06 15:40:13 +08:00 |
|
huang
|
b67f401738
|
引入我的课程居中
|
2015-04-30 09:15:48 +08:00 |
|
sw
|
0a8f3faf6a
|
1、project.css错误代码
2、项目上传资源弹框
|
2015-04-30 09:02:33 +08:00 |
|
huang
|
412052dd0d
|
修改:引入我的文件提示信息
|
2015-04-29 10:44:05 +08:00 |
|
sw
|
03044d0190
|
课程--资源库：加粗上传课件分类字样
|
2015-04-27 15:59:22 +08:00 |
|
huang
|
3bd4f2d0f6
|
修改资源库样式
|
2015-04-20 17:55:07 +08:00 |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-17 15:07:01 +08:00 |
|
sw
|
9814a859c3
|
项目添加TAG页面不刷新
|
2015-04-17 14:09:58 +08:00 |
|
huang
|
fc8dacbd5f
|
引入资源列表界面调整
|
2015-04-17 12:56:54 +08:00 |
|
huang
|
fb06571918
|
项目讨论区引用强制换行
|
2015-04-16 17:56:45 +08:00 |
|
sw
|
57a5191fe5
|
课程资源列表样式调整
|
2015-04-16 16:55:24 +08:00 |
|
sw
|
65bcaef911
|
修改TAG云样式
|
2015-04-16 16:39:58 +08:00 |
|
sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
2015-04-16 16:10:24 +08:00 |
|
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
|
2015-04-16 15:01:37 +08:00 |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
2015-04-16 14:01:58 +08:00 |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-16 10:26:03 +08:00 |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
2015-04-15 19:57:16 +08:00 |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
2015-04-15 17:16:28 +08:00 |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
2015-04-15 16:00:45 +08:00 |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
2015-04-15 14:53:07 +08:00 |
|
sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
2015-04-14 16:36:03 +08:00 |
|
sw
|
eca32ca625
|
课程资源库标签搜索不正确
|
2015-04-10 11:44:13 +08:00 |