 huang
|
e3d815b51d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
0c90f2361d
|
项目用户反馈页面调整
|
11 years ago |
 sw
|
837fe88545
|
还原冲突，增加项目配置切换js
|
11 years ago |
whimlex
|
ccff6c27b0
|
#2170项目--新闻：评论新闻返回异常undefined method `split' for nil:NilClass
|
11 years ago |
|
whimlex
|
f79132e9be
|
项目新闻评论不显示无评论的查看
|
11 years ago |
|
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
11 years ago |
|
sw
|
db0cc88142
|
静态页面添加
|
11 years ago |
|
whimlex
|
5936d8d8e9
|
评论显示
|
11 years ago |
|
huang
|
8f6b095fdb
|
新闻页面调整
|
11 years ago |
|
whimlex
|
23a6408c9f
|
评论数为0时不显示“查看所有评论”
|
11 years ago |
|
sw
|
1c19114252
|
去掉发布竞赛的权限判断
|
11 years ago |
guange
|
8454e56ff4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
123fa079b3
|
smtp配置放入production
|
11 years ago |
|
huang
|
7577f4cbbc
|
项目缺陷显示页面样式调整
|
11 years ago |
|
whimlex
|
0427032cbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
874dcc2b89
|
附件上传国际化调整
|
11 years ago |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
11 years ago |
|
sw
|
434415343c
|
课程留言图片显示问题
|
11 years ago |
|
sw
|
b2b3aeb20b
|
课程讨论区评论图片问题
|
11 years ago |
|
whimlex
|
e148917865
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
11 years ago |
 lizanle
|
e595f1d445
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
b3b0461a42
|
已经被关注的人就不显示
|
11 years ago |
|
sw
|
858a54267f
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
ece4a67f97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d99910e8a1
|
个人动态列表留言动态url错误
|
11 years ago |
|
guange
|
a344fcdfc7
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
11 years ago |
|
sw
|
f0ba408a10
|
课程通知、个人动态 大图片超出页面
|
11 years ago |
|
sw
|
600003e48c
|
公共贴吧中使用新编辑器上传大图片，图片超出界面
|
11 years ago |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
11 years ago |
|
sw
|
ea0bd7e0dd
|
1、技术支持只有白羽
2、修改鼠标悬浮在白羽上有下划线
|
11 years ago |
|
sw
|
596bc213ca
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
11 years ago |
|
sw
|
6b758375f8
|
1、搜索课程报500
2、课程讨论区描述换行显示
|
11 years ago |
|
sw
|
9ebed65fde
|
课程动态：作业动态url不对
|
11 years ago |
|
lizanle
|
db219205d9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
fc66050413
|
注册失败，提示中英文混合
|
11 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
11 years ago |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
11 years ago |
|
sw
|
eca32ca625
|
课程资源库标签搜索不正确
|
11 years ago |
|
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
5a876d9df1
|
邮件发送时，单个收件人会报错
|
11 years ago |
|
huang
|
287c767c86
|
缺陷页面样式调整
|
11 years ago |
|
whimlex
|
9ef212b6d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
bcf83328f2
|
项目界面国际化
|
11 years ago |
|
huang
|
f2cf46f0a0
|
修改缺陷列表显示bug
|
11 years ago |
|
huang
|
fe7646c764
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
11 years ago |
|
whimlex
|
85400616f1
|
新建缺陷页面
|
11 years ago |
|
lizanle
|
2fc285699e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
5562456a85
|
学生提问数的修改
|
11 years ago |
|
lizanle
|
523e56c1db
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
d0562f1ede
|
编辑课程的时候如果没有输密码，那就用原来的密码
|
11 years ago |
|
sw
|
5ad1028c49
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b8760c6403
|
个人描述最长为200
|
11 years ago |
|
whimlex
|
3b84b0417a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
11 years ago |
|
sw
|
dbc7c7a5c6
|
2846 公共贴吧没有最后回复人就不显示最后回复
|
11 years ago |
|
sw
|
4fbbd7ceb7
|
公共贴吧，描述显示问题
|
11 years ago |
|
sw
|
0743ac2c78
|
课程成员配置-添加成员：没有搜索条件则显示空
|
11 years ago |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
11 years ago |
|
huang
|
95a1c1fe62
|
版本库显示页面调整，分页样式调整
|
11 years ago |
|
sw
|
4b83296a97
|
课程作业列表开启、关闭匿评
|
11 years ago |
|
sw
|
503d1fc2ee
|
开启匿评、关闭匿评js
|
11 years ago |
|
huang
|
c8f9add566
|
修改项目成员邀请界面（添加按钮点击搜索）
|
11 years ago |
|
sw
|
a737342a66
|
完成个人信息下拉、首页下标的隐藏非项目信息的定制
|
11 years ago |
|
sw
|
78b60efbbe
|
导航栏根据配置信息确定是否显示非项目连接
|
11 years ago |
|
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
11 years ago |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
11 years ago |
|
huang
|
45a03bac1b
|
缺陷列表新增四种类型样式
|
11 years ago |
|
huang
|
45fa01c773
|
修改缺陷不能显示的bug
|
11 years ago |
|
guange
|
0325554d24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
11 years ago |
|
lizanle
|
a04122bb8e
|
提示改为中文 2903
|
11 years ago |
|
lizanle
|
d1b5d28ff0
|
2901 工作单位不显示
|
11 years ago |
|
lizanle
|
66a7d267c8
|
工作单位不显示 2901
|
11 years ago |
|
lizanle
|
4c11e166f6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
6612ae357a
|
提示要为中文
|
11 years ago |
|
sw
|
c399ab2e4f
|
项目新闻 评论内容获取不正确
|
11 years ago |
|
sw
|
d08329631a
|
修复项目讨论区引用显示不正确
|
11 years ago |
|
sw
|
ba743c120b
|
1、课程留言回复框大小
2、课程留言有html代码
|
11 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
11 years ago |
|
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
11 years ago |
|
sw
|
663c9aad60
|
1、课程通知列表出现html代码
2、整理课程通知部分js
3、还原编辑器js代码
|
11 years ago |
|
sw
|
d192a564b4
|
课程作业列表、课程动态页面描述出现html标签
|
11 years ago |
|
sw
|
657b022baa
|
修改课程作业显示
|
11 years ago |
|
sw
|
15567e7d7b
|
1、新的编辑起未对其
2、老师新建作业增加marting-bottom
|
11 years ago |
|
guange
|
89af4b451b
|
#2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了
|
11 years ago |
|
huang
|
be07c2c961
|
添加项目关注列表
|
11 years ago |
|
sw
|
ba4894239c
|
1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名
2、修改课程密码显示取消明码显示
|
11 years ago |
|
huang
|
d832514a55
|
新增项目成员列表
|
11 years ago |
|
huang
|
bf36da8dcb
|
修改醒目新闻新建页面
退出项目样式
|
11 years ago |
|
sw
|
cc6a9d12f1
|
新建课程时显示明码按钮样式
|
11 years ago |
|
sw
|
235ba23a62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
217f62f373
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
8b379711d9
|
1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
|
11 years ago |
|
lizanle
|
60838460fc
|
课程的创建动态也要显示
|
11 years ago |
|
huang
|
c1fea1c7e2
|
课程资源新界面
项目动态分页调整
|
11 years ago |
|
sw
|
3bedddd190
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
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
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
11 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
11 years ago |
|
lizanle
|
84c2e39e6c
|
新闻评论出现错误。误将safe_attributes换为直接属性comments
|
11 years ago |
|
sw
|
8e38103bfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
5ee732063d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
1009f7ac07
|
资源id判空
|
11 years ago |
|
whimlex
|
a1b5277fe2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
6e0de61458
|
项目讨论区回复修改
|
11 years ago |
|
sw
|
4044cc6674
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
42124e8ec5
|
开启、关闭匿评是有时候报500
|
11 years ago |
|
sw
|
500b54a466
|
讨论区回复引用是html代码
|
11 years ago |
|
lizanle
|
5299d2d332
|
删除demo代码
|
11 years ago |
|
lizanle
|
717463076c
|
删除democontroller
|
11 years ago |
|
lizanle
|
452e299966
|
删除demo代码
|
11 years ago |
|
sw
|
b971147aa8
|
1、添加通知会alert
2、添加通知描述样式
3、通知添加评论样式
|
11 years ago |
|
lizanle
|
56cbc753eb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
f96fbe5150
|
注释一行不需要的
|
11 years ago |
|
sw
|
ec8e609ddc
|
打爆下载增加权限、增加打包下载功能
|
11 years ago |
|
lizanle
|
b8cc431f13
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
65030656a6
|
kindeditor上传的资源所属的类型映射关系
|
11 years ago |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
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 |
|
guange
|
893f6af856
|
用回rubyzip, zipruby有bug.
|
11 years ago |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
11 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
11 years ago |
|
guange
|
0118b10725
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
lizanle
|
073ef00bb7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
552c27c51d
|
课程作业学生提问问题计数修改
|
11 years ago |
|
guange
|
9cefb9f339
|
每日发送取日期不对
|
11 years ago |
|
guange
|
0099ab9f9a
|
去除以前的邮件规则
|
11 years ago |
|
guange
|
243bac8fed
|
除了mail_notification == all 的，其他都不即时发邮件
|
11 years ago |
|
guange
|
3ea33aa847
|
新建news报500
|
11 years ago |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
11 years ago |
|
guange
|
89e0602983
|
邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到
|
11 years ago |
 z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
11 years ago |
|
guange
|
27e123f9fd
|
const_defined?小错误
|
11 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
11 years ago |
|
z9hang
|
c4e9321e14
|
将attachment_candown方法提取到application_help里面
|
11 years ago |
|
z9hang
|
43af61d684
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
e2eaae63f4
|
资源模块，默认按时间降序排列
|
11 years ago |
|
guange
|
efdfa67c64
|
日报homework created_on to created_at
|
11 years ago |
|
sw
|
a84af9d138
|
课程私有资源不显示在没有权限查看的用户上
|
11 years ago |
|
z9hang
|
5bbc562abd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
11 years ago |
|
sw
|
4817e2e1a7
|
新建课程取消后返回host_course
|
11 years ago |
|
sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
11 years ago |
|
guange
|
51dbc43ecf
|
修改apache中git认证文件路径，user.passwd ==> htdocs/user.passwd
|
11 years ago |
|
sw
|
de0403580e
|
新增课程成员时增加默认选项
|
11 years ago |
|
sw
|
5640eae39b
|
删除课程成员
|
11 years ago |
|
sw
|
ed02959e00
|
修改成员角色
|
11 years ago |
|
sw
|
2af071a92e
|
课程添加成员后js提示
|
11 years ago |
|
sw
|
083a3b9de6
|
1、课程成员列表显示昵称
2、添加课程成员功能
|
11 years ago |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
11 years ago |
|
sw
|
046536230c
|
增加课程配置界面、成员的基本信息以及相关js
|
11 years ago |
|
sw
|
e7da022564
|
课程界面默认图片路径修改
|
11 years ago |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
11 years ago |
|
sw
|
cee08d9c58
|
修改加入课程弹出框样式
|
11 years ago |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
11 years ago |
|
sw
|
cc27fca8aa
|
加入当前分班按钮样式
|
11 years ago |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
11 years ago |
|
sw
|
21db854adb
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
11 years ago |
|
sw
|
20e80944a5
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
9fcdaee0cc
|
课程讨论区回复后附件消失问题
|
11 years ago |
|
whimlex
|
54908423bc
|
课程--作业附件显示问题;问题跟踪附件显示问题
|
11 years ago |
|
sw
|
10515adc5c
|
课程通知和讨论区回复样式不对
|
11 years ago |
|
z9hang
|
a89826f171
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
1c8b4c5bdd
|
去除导出ATOM
|
11 years ago |
|
sw
|
b55ef84c9c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
7fa8ccad7c
|
课程通知和讨论区编辑、新建时宽度不对
|
11 years ago |
|
z9hang
|
a1e1e2dedf
|
课程讨论区，新建，编辑界面调整
|
11 years ago |
|
sw
|
dc4686d130
|
去掉跟踪功能
|
11 years ago |
|
z9hang
|
e10c747a5f
|
修改通知附件样式
|
11 years ago |
|
z9hang
|
35e0f73345
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
cc2cce22cf
|
讨论区附件样式修改
|
11 years ago |
|
sw
|
61ddfc6363
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
6a9abf12b9
|
1、当问卷描述过长，显示超过页面
2、描述未对齐
|
11 years ago |
|
sw
|
8374ba1995
|
配置课程是对齐单选框
|
11 years ago |
|
z9hang
|
acb01e452b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
1c53731966
|
留言框样式调整
|
11 years ago |
|
sw
|
1e3b28d4bd
|
修改上传图片样式
|
11 years ago |
|
sw
|
9c8d402056
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
52acd8981f
|
修改上传文件样式
|
11 years ago |
|
z9hang
|
5ec28d8fc3
|
置顶贴子显示
|
11 years ago |
|
whimlex
|
3d2fc8e5ef
|
IE8
|
11 years ago |
|
sw
|
7b70369438
|
上传文件样式调整
|
11 years ago |
|
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 |
|
sw
|
2ef10e89ac
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
165977b9bf
|
发布文件是报标题不能为空
|
11 years ago |
|
sw
|
baab3343c8
|
编辑poll界面
|
11 years ago |
|
sw
|
273e82f620
|
修改poll的show界面的样式
|
11 years ago |
|
sw
|
25b3772520
|
增加poll统计结果的显示
|
11 years ago |
|
sw
|
1bba235ca0
|
1、更新poll.css文件
2、修改poll的index界面
|
11 years ago |
|
sw
|
f5059147d2
|
修改学生提交作业界面的layout
|
11 years ago |
|
sw
|
c4cd61c71b
|
修改学生提交作业界面的layout
|
11 years ago |
|
sw
|
7970bd6df0
|
1、增加作业截至时间的js显示
2、截止时间到了之后的显示
|
11 years ago |
|
z9hang
|
e39007d96e
|
新建通知样式更新
|
11 years ago |
|
sw
|
0496c33378
|
添加部分方法的注释
|
11 years ago |
|
z9hang
|
a2ec9c661a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
64d208555e
|
样式调整
|
11 years ago |
|
sw
|
584dcabeaa
|
修改学生作业列表弹出框不正确
|
11 years ago |
|
sw
|
221276ba1f
|
增加老师布置作业学生访问的列表
|
11 years ago |
|
sw
|
0408cc5150
|
去除无用代码
|
11 years ago |
|
sw
|
37bd338311
|
1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
|
11 years ago |
|
sw
|
20d97848e7
|
作业界面增加默认值显示
|
11 years ago |
|
sw
|
f3fefe50f1
|
1、增加flash显示样式
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
|
11 years ago |
|
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
11 years ago |
|
z9hang
|
d44bbe9de1
|
课程通知界面新建通知修改
|
11 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
11 years ago |
|
huang
|
0a43ab67ac
|
编辑器星号匹配问题
|
11 years ago |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
11 years ago |
|
huang
|
a17458f132
|
1、户登录名可以在“修改信息”中修改
2、缺陷统计国家化及显示样式调整。
|
11 years ago |
|
sw
|
36bd04cc7a
|
国际化课程作业列表
|
11 years ago |
|
z9hang
|
12d88d85fc
|
*号不能识别问题
|
11 years ago |
|
z9hang
|
bf5c99321e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
799fa776ee
|
#2091 测试版--课程/项目--资源库：上传资源后 后缀无论是大写还是小写，点击返回的都是下载
|
11 years ago |
|
huang
|
75ae68ffc8
|
项目邀请用户邮箱为空的提示语！
|
11 years ago |
|
huang
|
f1b8d74a07
|
修改加入项目字体大小、宽度
|
11 years ago |
|
huang
|
1e1ee9a248
|
修改邮箱匹配错误后提示语
|
11 years ago |
|
huang
|
9e297609fd
|
项目邮件邀请：正则匹配触发事件改成失去鼠标焦点
（否则输入一个字母也会触发，给人感觉邮箱已经错误）
|
11 years ago |
|
z9hang
|
808d56d47b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f0bc0b2e93
|
项目关注、取消关注、申请加入、取消申请加入返回js修改
|
11 years ago |
|
huang
|
dc0c9417e3
|
修改新提交的作业显示在前面
|
11 years ago |
|
huang
|
65bf98016a
|
新建git添加导航条
|
11 years ago |
|
huang
|
10518afa84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
fd9eaa93d6
|
关注添加+号；去掉css文件中多余符号引起的样式问题
|
11 years ago |
|
z9hang
|
5deca84c12
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
bcfdac37a7
|
课程资源中的图片点击下载有弹框改为预览图片
|
11 years ago |
|
huang
|
5b050b1037
|
解决上传文件名过长问题（作业中部分文件名超出边框）
|
11 years ago |
|
sw
|
aa240a759a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
huang
|
72d41fd07a
|
修改邮件邀请提示信息！
|
11 years ago |
|
huang
|
ec8b7e4128
|
修改项目tag删除判断错误
|
11 years ago |
|
huang
|
99dd66d8de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
e171f7b249
|
项目标签添加删除功能
|
11 years ago |
|
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5e8f29eb5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
11 years ago |
|
z9hang
|
473a8805e2
|
发布取消发布问卷时提示信息有下拉框问题
|
11 years ago |
|
huang
|
885b2092e4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
83d63bf479
|
修改竞赛关注中关注项目读取错误
|
11 years ago |
|
z9hang
|
eebcccd4bb
|
编辑贴吧等不显示附件问题
|
11 years ago |
|
huang
|
cea43cb045
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
69eb7fbd77
|
关注、加入项目样式，处理样式冲突
|
11 years ago |
|
z9hang
|
587a739c76
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
11 years ago |
|
z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好
|
11 years ago |
|
whimlex
|
93838f604d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
11 years ago |
