whimlex
|
762c83b26c
|
commit
|
11 years ago |
 sw
|
a320956ccc
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
472ff76c72
|
启动匿评时弹框位置问题
|
11 years ago |
 z9hang
|
ef7949584c
|
课程资源tag点击报错问题，回退后删除无效问题
|
11 years ago |
|
z9hang
|
41e372c16a
|
上传资源按钮样式调整
|
11 years ago |
|
sw
|
8ee6f8a6f9
|
解决冲突丢失问题
|
11 years ago |
|
sw
|
9af60424c2
|
去除错误代码
|
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 |
|
sw
|
c68349803e
|
1、课程讨论区、通知提示信息样式
2、整理js
|
11 years ago |
|
sw
|
83dfcdcc02
|
学生可以发帖
|
11 years ago |
|
z9hang
|
bdaf574266
|
修改发布新帖，发布课程通知链接
|
11 years ago |
|
z9hang
|
61b220c913
|
课程资源库删除资源tag失效问题
|
11 years ago |
|
whimlex
|
7fd77f0354
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
89a001ad9d
|
IE8浏览器及以下低版本浏览器提示
|
11 years ago |
|
sw
|
240fc240e6
|
修改默认图片
修改上传按钮样式
|
11 years ago |
|
sw
|
fcbcdffa44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/courses.css
|
11 years ago |
|
sw
|
519c119543
|
修改上传文件样式
|
11 years ago |
|
z9hang
|
d8da3bb73c
|
课程通知列表显示多一个空行问题
|
11 years ago |
|
z9hang
|
b3acbec2e1
|
上传资源弹框样式修改
|
11 years ago |
|
z9hang
|
ddecd61926
|
课程资源添加标签时无样式问题
|
11 years ago |
|
sw
|
a99dda837a
|
课程动态描述过长超出界面
|
11 years ago |
|
z9hang
|
b8ab3770f1
|
资源样式冲突调整
|
11 years ago |
|
sw
|
9a2f572cf4
|
是否启用匿评功能异常
|
11 years ago |
|
z9hang
|
cb498a44a6
|
去除多出的发布通知按钮
|
11 years ago |
|
z9hang
|
a59677c22e
|
课程通知展开信息按钮显示隐藏控制
|
11 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
11 years ago |
|
sw
|
ed92faaedd
|
关闭课程与重开课程js
|
11 years ago |
|
z9hang
|
2c5c261b70
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
e1afdab988
|
留言样式修改
|
11 years ago |
|
sw
|
0d04eb745f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
cb1fce32fe
|
配置课程
|
11 years ago |
 lizanle
|
c704ba71d9
|
提出按ckeditor
|
11 years ago |
|
lizanle
|
e95e35fdaa
|
替换ckeditor
|
11 years ago |
|
z9hang
|
35eb7e80af
|
讨论区留言分页
|
11 years ago |
|
lizanle
|
7e618e5b4e
|
替换ckeditor
|
11 years ago |
|
lizanle
|
a8205856c9
|
替换ckeditor
|
11 years ago |
|
lizanle
|
5f203ec8c0
|
新建论坛或者回复,如果传图了，要更新资源的owner
|
11 years ago |
|
lizanle
|
b95f479c17
|
级联删除资源
|
11 years ago |
|
sw
|
8f90fed8be
|
新建课程界面完成
|
11 years ago |
|
z9hang
|
57dad3f3c7
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
11 years ago |
|
lizanle
|
a4f1b9c625
|
model中会有许多kindeditor的资源
|
11 years ago |
|
lizanle
|
dc2c458b34
|
替换ckeditor
|
11 years ago |
|
lizanle
|
01146cd7bd
|
替换ckeditor
|
11 years ago |
|
lizanle
|
05cf90062f
|
论坛的描述如果有图片的话，图片会显示。使排版出现问题
|
11 years ago |
|
lizanle
|
cd976f9515
|
如果论坛的description上传了图片，那么这个图片会显示，使得论坛的界面被图片占据。
|
11 years ago |
|
lizanle
|
0d487efea8
|
添加两个公用的方法。从硬盘上删除对应的资源文件，更新资源文件的owner
|
11 years ago |
|
lizanle
|
74029aee46
|
删掉这个form表单
|
11 years ago |
|
lizanle
|
643bfd47cb
|
添加一个隐藏域，用来保存kindeditor上传图片资源后返回的图片id
|
11 years ago |
|
lizanle
|
49148808ec
|
添加一个隐藏域，用来保存上传图片资源后，这个图片资源的id
|
11 years ago |
|
lizanle
|
fba9ced608
|
编辑器在新建论坛和编辑原来的论坛的时候，有所区别，避免在代码里用分支判断，就用了两个页面
|
11 years ago |
|
lizanle
|
19b41c684f
|
编辑器在新建论坛和编辑原来的论坛的时候，有所区别，避免在代码里用分支判断，就用了两个页面
|
11 years ago |
|
lizanle
|
d1d40e1867
|
添加一个输入框的id，在论坛模块里，自动生成的id会和编辑器kindeditor生成的id冲突：都叫memo_content
|
11 years ago |
|
lizanle
|
72eff3a032
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
90bce76409
|
私有项目的资源数，只要不是本人传的，都看不到
|
11 years ago |
|
sw
|
53eef164c9
|
新建课程时layout修改
|
11 years ago |
|
sw
|
58d05689ec
|
加入与退出分班是js跳转不正确
|
11 years ago |
 huang
|
26ed40f7e1
|
学生作业列表样式调整
|
11 years ago |
|
sw
|
2bb7153131
|
去掉作业打包下载功能
|
11 years ago |
|
sw
|
090190f3e6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
c8a08d5a56
|
1、切换分班功能
2、非老师用户不能编辑、删除分班
|
11 years ago |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
11 years ago |
|
z9hang
|
94fd3060ae
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
132287d6e1
|
课程通知界面完善
|
11 years ago |
|
whimlex
|
82fb9325c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_point_browser.html.erb
|
11 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
11 years ago |
|
huang
|
dac4ffe66e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
eac6f814a8
|
解决浏览器提示关闭按钮与邮件邀请界面冲突
|
11 years ago |
|
sw
|
cfe487e217
|
搜素学生后内容清空
|
11 years ago |
|
sw
|
41b4d96173
|
修改作业积分排序
|
11 years ago |
|
sw
|
ab3a3a8573
|
学生收索功能
|
11 years ago |
|
z9hang
|
30cb622abd
|
评论显示页面修改
|
11 years ago |
|
sw
|
92808fe8ea
|
完成学生列表界面
|
11 years ago |
|
sw
|
3c224f0ff9
|
修改编辑分组时的样式
|
11 years ago |
|
whimlex
|
05d17361e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
11 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
11 years ago |
|
huang
|
b27e7919c3
|
新建版本添加导航
版本库提交按钮样式异常
|
11 years ago |
|
sw
|
5f41c92cb3
|
学生列表界面静态显示
|
11 years ago |
|
sw
|
9a08daa1d2
|
教师列表界面
|
11 years ago |
|
sw
|
07623a1e02
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
7399c5b55a
|
调整js
|
11 years ago |
|
sw
|
7b379456ed
|
课程作业描述很长时才显示更多按钮
|
11 years ago |
|
z9hang
|
09991b9cf7
|
课程资源模块弹框样式调整
|
11 years ago |
|
sw
|
27e7bc21b5
|
当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示
|
11 years ago |
|
huang
|
792a87dcaf
|
修改提示框引起的首页行距过高的问题
|
11 years ago |
guange
|
4b636d8be6
|
#1801 打包上传分个数下载完成
|
11 years ago |
|
sw
|
36d168f773
|
调整提交问卷时弹出框样式
|
11 years ago |
|
huang
|
75567585d2
|
浏览器版本过低提示样式调整！
|
11 years ago |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
11 years ago |
|
sw
|
61d7d65b55
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/courses/_courses_jours.html.erb
|
11 years ago |
|
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式，制作弹出框demo
|
11 years ago |
|
huang
|
525a6394ca
|
1、公共贴吧邮件提醒
2、浏览器版本过低提醒（样式需要再调试）
|
11 years ago |
|
sw
|
a2ec15b99c
|
增加单选题选项时增加空格
|
11 years ago |
|
sw
|
09277b8da7
|
问卷关闭按钮会刷新页面，导致js弹框无法显示
|
11 years ago |
|
z9hang
|
95beba05f1
|
课程留言:回复留言的回复时输入框样式异常问题
|
11 years ago |
|
z9hang
|
24b22fce9e
|
修正课程留言样回复式与项目等模块留言回复样式冲突问题
|
11 years ago |
|
z9hang
|
8190d0cecc
|
修改留言页面样式
|
11 years ago |
|
z9hang
|
13245282d4
|
修正讨论区帖子数量显示不正确问题
|
11 years ago |
|
z9hang
|
be46142b3c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
|
11 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
11 years ago |
