 sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
11 years ago |
 huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
11 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
11 years ago |
|
huang
|
b3689377a3
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
b98a67f50d
|
完成项目配置-成员模块
|
11 years ago |
|
sw
|
679620fa51
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
8c122a35f7
|
项目类型切换到其他类型后，再切回开发组，更多按钮不可用
|
11 years ago |
|
huang
|
b3c3693d72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
845794675a
|
配置-成员界面休整
|
11 years ago |
|
sw
|
aee81e8e44
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
11 years ago |
|
huang
|
6b8022cb23
|
清除不需要的子模块
|
11 years ago |
|
huang
|
f3ba393bd4
|
去掉代码审查
修改配置-“版本库”样式
|
11 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
11 years ago |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
11 years ago |
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
11 years ago |
|
huang
|
6ce998bb54
|
去掉新版本库中冗余代码
|
11 years ago |
|
huang
|
5d249823df
|
修改配置版本库页面
|
11 years ago |
|
sw
|
39579331e7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
01f56a761f
|
完成配置---模块
|
11 years ago |
|
whimlex
|
5c96a5322a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
1d8c2d2a3a
|
commit
|
11 years ago |
|
sw
|
fb935f124c
|
完成修改项目界面
|
11 years ago |
|
huang
|
534bd46008
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
36d76cfa07
|
缺陷列表代码整理
|
11 years ago |
|
sw
|
b19bfa5c0a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
7ad3c2d578
|
修改项目配置js
增加项目配置相关子界面
|
11 years ago |
|
huang
|
d2a77b3d41
|
添加issues回复统计
|
11 years ago |
|
sw
|
7b60998952
|
修改点击课程名称，url连接错误
|
11 years ago |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
11 years ago |
|
sw
|
44cb4a8e56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
4adfec5640
|
解决样式冲突
添加新闻展示页面
|
11 years ago |
|
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
|
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 |
|
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 |
|
sw
|
ece4a67f97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d99910e8a1
|
个人动态列表留言动态url错误
|
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 |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
11 years ago |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
11 years ago |
|
sw
|
eca32ca625
|
课程资源库标签搜索不正确
|
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 |
|
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
|
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
|
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 |
|
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 |
|
huang
|
8b379711d9
|
1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
|
11 years ago |
|
huang
|
c1fea1c7e2
|
课程资源新界面
项目动态分页调整
|
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 |
|
sw
|
8e38103bfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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
|
500b54a466
|
讨论区回复引用是html代码
|
11 years ago |
 lizanle
|
5299d2d332
|
删除demo代码
|
11 years ago |
|
sw
|
b971147aa8
|
1、添加通知会alert
2、添加通知描述样式
3、通知添加评论样式
|
11 years ago |
|
sw
|
ec8e609ddc
|
打爆下载增加权限、增加打包下载功能
|
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 |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
11 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
11 years ago |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
11 years ago |
 z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
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
|
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 |
|
sw
|
cee08d9c58
|
修改加入课程弹出框样式
|
11 years ago |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
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
|
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 |
