 huang
|
fb06571918
|
项目讨论区引用强制换行
|
10 years ago |
 sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
10 years ago |
|
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
|
10 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
10 years ago |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
10 years ago |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
10 years ago |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
10 years ago |
|
sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
10 years ago |
|
sw
|
eca32ca625
|
课程资源库标签搜索不正确
|
11 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
11 years ago |
|
sw
|
5ad1028c49
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
11 years ago |
guange
|
89af4b451b
|
#2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了
|
11 years ago |
|
huang
|
c1fea1c7e2
|
课程资源新界面
项目动态分页调整
|
11 years ago |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
11 years ago |
 z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
11 years ago |
|
z9hang
|
c4e9321e14
|
将attachment_candown方法提取到application_help里面
|
11 years ago |
|
z9hang
|
e2eaae63f4
|
资源模块，默认按时间降序排列
|
11 years ago |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
11 years ago |
|
z9hang
|
41e372c16a
|
上传资源按钮样式调整
|
11 years ago |
|
sw
|
8ee6f8a6f9
|
解决冲突丢失问题
|
11 years ago |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
11 years ago |
|
z9hang
|
b3acbec2e1
|
上传资源弹框样式修改
|
11 years ago |
|
z9hang
|
ddecd61926
|
课程资源添加标签时无样式问题
|
11 years ago |
|
z9hang
|
09991b9cf7
|
课程资源模块弹框样式调整
|
11 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
11 years ago |
|
z9hang
|
799fa776ee
|
#2091 测试版--课程/项目--资源库：上传资源后 后缀无论是大写还是小写，点击返回的都是下载
|
11 years ago |
|
z9hang
|
bcfdac37a7
|
课程资源中的图片点击下载有弹框改为预览图片
|
11 years ago |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
11 years ago |
|
z9hang
|
26feaba6e8
|
去掉旧的资源样式的引用
|
11 years ago |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
11 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
11 years ago |
|
whimlex
|
7e8ee49298
|
资源库国际化
|
11 years ago |
|
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
11 years ago |
|
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
11 years ago |
|
sw
|
1e262ec731
|
修改项目上传资源链接
|
11 years ago |
|
huang
|
078d2fa488
|
解决项目中文档为空情况显示异常
新建文件文件术语改变
|
11 years ago |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
11 years ago |
|
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
11 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
11 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
11 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
11 years ago |
 lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
11 years ago |
|
z9hang
|
cf1cd9201c
|
修改上传资源弹框样式
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
|
z9hang
|
7741e7bd37
|
非当前老师提交的资源显示引入我的其他课程
|
11 years ago |
|
z9han
|
67ffc03fee
|
#1708 课程--资源库：非课程成员可以引用私有课程里面的公开资源,改为提示没有权限引用
|
11 years ago |
|
z9han
|
b143093e49
|
1、#1707 课程--资源库：全站搜索得到当前作业模块的资源，应显示为“选入我的课程”.2、公开私有字样未居中问题
|
11 years ago |
