 yutao
|
8e3bc28fa2
|
个人主页
|
10 years ago |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
10 years ago |
 sw
|
66c1dfa77e
|
作品列表增加分班的过滤
|
10 years ago |
|
sw
|
f909fbb835
|
作品列表增加分班过滤
|
10 years ago |
|
sw
|
67c054e3af
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
 huang
|
6890160375
|
issue列表、issue显示页面鼠标经过的时候显示issue类型
|
10 years ago |
|
yutao
|
00c50d8114
|
个人主页->访客
|
10 years ago |
|
yutao
|
b7c4449f4b
|
个人主页
|
10 years ago |
|
huang
|
1a79eaf082
|
issue修改“立刻”状态
|
10 years ago |
|
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
10 years ago |
|
huang
|
b089b973ab
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
e73517cfd0
|
扣分规则显示
|
10 years ago |
|
sw
|
a979b490e2
|
夏季学期课程不可引用其他课程资源
|
10 years ago |
|
yutao
|
02d09c84b4
|
个人主页->留言
|
10 years ago |
 lizanle
|
e39fe372ef
|
作业状态 描述改变
|
10 years ago |
|
lizanle
|
9596746e7c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
15f8e4272e
|
比率保留 1 位
|
10 years ago |
 zhangshenjerry
|
a52b2b37e5
|
课程--问卷调查：建议修复“加入当前分别”、“推出当前分班”按钮样式
|
10 years ago |
|
yutao
|
5c011fd342
|
个人主页
|
10 years ago |
|
zhangshenjerry
|
2b00f65f42
|
课程的开学学期，增加：夏季学期，快！！！
|
10 years ago |
|
huang
|
77091c1af4
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
lizanle
|
716dded9fd
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
6d85dd7ca4
|
app的课程动态界面api修改
添加活跃学生查看，
获取作业的匿评率
|
10 years ago |
|
huang
|
c246405e96
|
issue显示页面添加优先级
|
10 years ago |
|
sw
|
ec051ef929
|
编程作业老师、学生界面的显示
|
10 years ago |
|
huang
|
7ebdf4a08d
|
issue列表增加优先级
修改issue列表界面
|
10 years ago |
|
huang
|
3bb3cbe2bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
898ef29116
|
用户得分：项目得分中添加发帖得分（帖子回复在协同得分）
|
10 years ago |
guange
|
f56e48d60a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
b762ae6bdd
|
报告人员只能克隆，不能提交，其他可以克隆和提交
|
10 years ago |
|
sw
|
e46ccda8e6
|
1111
|
10 years ago |
|
lizanle
|
e85f63831c
|
作业 状态文字
|
10 years ago |
|
lizanle
|
d3d656f3b8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
fe55258349
|
获取匿评状态的解释 api
开启匿评 api
|
10 years ago |
|
sw
|
467da8f01d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
2fe18787a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
sw
|
acc3f6dadf
|
新建作业显示迟交扣分、缺评扣分
|
10 years ago |
|
lizanle
|
416dee2d30
|
课程动态 api改版
|
10 years ago |
|
sw
|
3e6ccf3e50
|
作业截至之前不能启动匿评页面
|
10 years ago |
|
sw
|
19c474e422
|
超级管理员可以查看学生列表、教师列表
|
10 years ago |
|
huang
|
3924bdf338
|
添加编辑缺陷查看差别功能
|
10 years ago |
|
sw
|
469f1c3663
|
1、大于90分显示红色，小于90分显示绿色，未评分，显示灰色
2、迟交显示
|
10 years ago |
|
huang
|
2f8c8ea6ca
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
sw
|
43363e8bcb
|
缺评情况功能
|
10 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
10 years ago |
|
huang
|
761840e0a4
|
修改项目缺陷描述查看差别时404问题
|
10 years ago |
|
yutao
|
0ca913bc83
|
...
|
10 years ago |
|
yutao
|
b4732814e6
|
...
|
10 years ago |
|
sw
|
aa0dc475aa
|
隐藏迟交扣分和缺评扣分
|
10 years ago |
|
sw
|
9f552365c2
|
课程动态数计算报错
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
66c02f0667
|
1、新编辑器增加HomeworkCommon的Type
2、老师创建作业加入老师个人动态
|
10 years ago |
|
sw
|
f2ea879b9b
|
老师和同课程的学生有权限下周作品附件
|
10 years ago |
|
sw
|
837fbe74e8
|
1、老师和同课程的学生有权限下周作品附件
2、作品附件下载成功之后消失
|
10 years ago |
|
sw
|
19bf8ef50d
|
作品修改功能
|
10 years ago |
|
sw
|
4d43cd2765
|
点赞功能
|
10 years ago |
|
sw
|
70f14f851d
|
根据作业不同类型、不同阶段、当前用户身份对作品列表进行过滤，以及相关界面功能的过滤
部分界面样式调整
|
10 years ago |
|
sw
|
8c6ea88504
|
1、作品列表TAB切换
2、作品界面作业详细信息
3、到处Excel名称
|
10 years ago |
|
sw
|
52834d8fa9
|
打分增加打分角色的判定
|
10 years ago |
|
sw
|
a0324f5e39
|
增加评分回复，以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
10 years ago |
|
sw
|
a006e2e462
|
1、实现打分功能
2、打分之后页面刷新
3、获取指定用户对某一作业的评分结果
|
10 years ago |
|
sw
|
f3597d9aa5
|
开启/关闭匿评弹框提示
|
10 years ago |
|
huang
|
4ab6558a5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
379de18cd6
|
修改资源库全站搜索：
1、搜索条件为空的时候，不允许显示全部资源
2、全站搜索，非自己上传的资源不允许查看
3、全站搜索，项目管理员能设置公开权限的资源在全局搜索中也可以
|
10 years ago |
|
yutao
|
5460e98526
|
...
|
10 years ago |
|
yutao
|
53503bffe4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
9c84837492
|
...
|
10 years ago |
|
huang
|
052d293f82
|
新建项目时候：
如果我的项目中有重名的项目不允许新建
|
10 years ago |
|
huang
|
eb539073ec
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a3fd541119
|
优化邮件邀请新用户、已注册用户
|
10 years ago |
|
yutao
|
bfb0a43de1
|
修复bug#2485:项目--问题跟踪相关建议
|
10 years ago |
|
sw
|
56723d106f
|
新建作品功能，以及相关js验证
|
10 years ago |
|
sw
|
86b9daf821
|
1、增加学生新建、修改作品静态页面
2、homework_common_control增加权限判断
3、学生进入作业界面显示作业当前状态不正确
|
10 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
10 years ago |
|
huang
|
19d911cf95
|
缺陷列表搜索栏中添加“我”
|
10 years ago |
|
huang
|
fa563b60d5
|
项目issue添加周报功能
|
10 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
10 years ago |
|
huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
10 years ago |
|
huang
|
3c810a0cee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
3f77e2cdcf
|
资源权限公共方法定义
|
10 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
10 years ago |
|
huang
|
2c568ed370
|
修改主页下载不存在的资源500错误
定义helper方法
|
10 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
10 years ago |
|
huang
|
a62001c892
|
新建版本库--
如果主版本库已存在，新建的时候不允许设置主版本库
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
|
sw
|
2749c4f890
|
课程配置页面，角色改为中文
|
10 years ago |
|
lizanle
|
2b1b1c34a6
|
项目issue翻页后查询条件丢失修改
|
10 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
10 years ago |
whimlex
|
88bbd70102
|
项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示
|
10 years ago |
|
whimlex
|
bbe4c15293
|
问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式
|
10 years ago |
|
whimlex
|
b5b50bef21
|
问题跟踪图片压缩不清晰
|
10 years ago |
|
sw
|
7e833a4727
|
缺陷图片显示小
|
10 years ago |
|
guange
|
449bbc553c
|
修复issue界面js报错
|
10 years ago |
|
guange
|
3299f7e726
|
正式库issue界面图片显示路径错误
|
10 years ago |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
10 years ago |
|
sw
|
1f7f1eff1a
|
课程添加成员输入空格键会搜索出所有任务
|
10 years ago |
|
huang
|
eeaa613c9e
|
项目类型实时刷新功能
|
10 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
10 years ago |
|
huang
|
729d11ebaf
|
修复项目配置中首页显示问题
|
10 years ago |
|
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
10 years ago |
|
huang
|
b6f34045db
|
修改缺陷：缺陷上传附件后，第一条回复中会显示附件。
|
10 years ago |
|
lizanle
|
3b70ab964d
|
issue过滤
|
10 years ago |
|
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
|
10 years ago |
|
sw
|
7239f6a641
|
1、成员列表分页空间翻页不可用
2、当五输入时显示，无用户显示
|
10 years ago |
|
huang
|
fc8dacbd5f
|
引入资源列表界面调整
|
10 years ago |
|
lizanle
|
43442d6f62
|
字符截断
|
10 years ago |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
10 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
10 years ago |
|
huang
|
f1e86ace25
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
54b81bdfb3
|
项目类型图标
|
10 years ago |
|
whimlex
|
54e63cf4d9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/issues/_history.html.erb
public/stylesheets/project.css
|
10 years ago |
|
huang
|
0ea683e1b4
|
修改issue中图片附件的缩略图显示方式
|
10 years ago |
|
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
10 years ago |
|
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
10 years ago |
|
huang
|
890f36a2d5
|
优化缺陷
|
10 years ago |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
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 |
|
whimlex
|
7ce8ae0261
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
9c07976751
|
展开和收起更多信息图片样式修改；跟踪者样式修改
|
10 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
10 years ago |
|
huang
|
fec751608a
|
完成里程碑界面
|
10 years ago |
|
whimlex
|
596e89a14f
|
缺陷更新页面
|
10 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
10 years ago |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
10 years ago |
|
whimlex
|
7fa2338ce6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
10 years ago |
|
huang
|
0023d0610b
|
缺陷主题、描述强制换行
跟踪按钮样式
引用样式修改
|
10 years ago |
|
huang
|
c607bd5cbf
|
定义缺陷中样式
|
10 years ago |
|
whimlex
|
b3b9688072
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
cdf1ce1c17
|
缺陷页面
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
|
huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
10 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
10 years ago |
|
sw
|
1598bf6b4d
|
课程成员搜索忽略大小写
|
10 years ago |
|
huang
|
b98a67f50d
|
完成项目配置-成员模块
|
10 years ago |
|
huang
|
845794675a
|
配置-成员界面休整
|
10 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
10 years ago |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
10 years ago |
|
huang
|
5d249823df
|
修改配置版本库页面
|
10 years ago |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
10 years ago |
|
sw
|
d99910e8a1
|
个人动态列表留言动态url错误
|
10 years ago |
|
sw
|
6b758375f8
|
1、搜索课程报500
2、课程讨论区描述换行显示
|
10 years ago |
|
huang
|
287c767c86
|
缺陷页面样式调整
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
10 years ago |
|
sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
3b84b0417a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
10 years ago |
|
sw
|
0743ac2c78
|
课程成员配置-添加成员：没有搜索条件则显示空
|
10 years ago |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
10 years ago |
|
huang
|
c8f9add566
|
修改项目成员邀请界面（添加按钮点击搜索）
|
10 years ago |
|
sw
|
78b60efbbe
|
导航栏根据配置信息确定是否显示非项目连接
|
10 years ago |
|
huang
|
45a03bac1b
|
缺陷列表新增四种类型样式
|
10 years ago |
|
huang
|
45fa01c773
|
修改缺陷不能显示的bug
|
10 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
10 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
10 years ago |
|
huang
|
bf36da8dcb
|
修改醒目新闻新建页面
退出项目样式
|
10 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
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
10 years ago |
|
lizanle
|
b8cc431f13
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
65030656a6
|
kindeditor上传的资源所属的类型映射关系
|
10 years ago |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
10 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
|
10 years ago |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
10 years ago |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 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 |
|
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 |
|
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
|
083a3b9de6
|
1、课程成员列表显示昵称
2、添加课程成员功能
|
11 years ago |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
11 years ago |
|
sw
|
cc27fca8aa
|
加入当前分班按钮样式
|
11 years ago |
|
z9hang
|
cc2cce22cf
|
讨论区附件样式修改
|
11 years ago |
|
z9hang
|
1c53731966
|
留言框样式调整
|
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
|
61b220c913
|
课程资源库删除资源tag失效问题
|
11 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
11 years ago |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
11 years ago |
|
lizanle
|
0d487efea8
|
添加两个公用的方法。从硬盘上删除对应的资源文件，更新资源文件的owner
|
11 years ago |
|
lizanle
|
72eff3a032
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
90bce76409
|
私有项目的资源数，只要不是本人传的，都看不到
|
11 years ago |
|
sw
|
221276ba1f
|
增加老师布置作业学生访问的列表
|
11 years ago |
|
huang
|
f1b8d74a07
|
修改加入项目字体大小、宽度
|
11 years ago |
|
z9hang
|
f0bc0b2e93
|
项目关注、取消关注、申请加入、取消申请加入返回js修改
|
11 years ago |
|
huang
|
fd9eaa93d6
|
关注添加+号；去掉css文件中多余符号引起的样式问题
|
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 |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
11 years ago |
|
sw
|
69d1fdb699
|
111111111111111
|
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 |
 dingxu
|
79588489e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
11 years ago |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
11 years ago |
|
huang
|
1cdf397bc0
|
修改关注、申请方法中样式
|
11 years ago |
|
sw
|
d92ac2d909
|
1、课程跳到其他页面后没有分块
2、修改course_show界面
|
11 years ago |
|
sw
|
423849ca84
|
加入课程、退出课程、配置、关闭、复制等按钮
|
11 years ago |
|
sw
|
1c30b8c81c
|
1、增加获取某个课程动态数的方法
2、修改首页配置、关闭、复制课程等按钮的样式
|
11 years ago |
|
sw
|
8f5d8c86a3
|
新版样式header调整
|
11 years ago |
|
sw
|
64b0646281
|
base_course基本完成
|
11 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
|
whimlex
|
e8da6ef871
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
50fe8f2bb7
|
项目配置模块
|
11 years ago |
|
lizanle
|
86020804c9
|
ok
|
11 years ago |
|
lizanle
|
33669017bf
|
controller
|
11 years ago |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
11 years ago |
|
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
11 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
11 years ago |
|
z9hang
|
7e7da7e445
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
a05061af73
|
#1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
|
11 years ago |
|
sw
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
11 years ago |
|
sw
|
4b831c9e65
|
#2001 项目--工具集中wiki-“查看差别”中有html标签
|
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
|
ce792f6ce8
|
修改邮件发送界面
|
11 years ago |
|
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
sw
|
5692cbf202
|
#1965 公共贴吧取消软件创客入口
|
11 years ago |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
11 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
11 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
11 years ago |
|
sw
|
73d2e2e5e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
|
sw
|
2ceb21b83b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d913f89a82
|
添加课程动态接口
|
11 years ago |
|
sw
|
859889b750
|
简化查询匿评数量的代码
|
11 years ago |
|
sw
|
4cdb3c83dd
|
增加获取用户在指定课程内作业数量的接口
|
11 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
11 years ago |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
11 years ago |
|
z9hang
|
d8571ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6bd202e80a
|
课程作业列表当当前用户为课程学生时，输出分配给改学生匿评的作业集合
|
11 years ago |
|
sw
|
0d6261dfa7
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
11 years ago |
|
huang
|
29df528af1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
11 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
lizanle
|
b453d16228
|
将controller里的两个方法挪到helper
|
11 years ago |
|
lizanle
|
0232826a6e
|
上次修改引入bug:关键字查询不到任何东西
|
11 years ago |
|
lizanle
|
e761cd5f22
|
关键字查询会丢失样式
|
11 years ago |
|
lizanle
|
852bb940a2
|
过滤掉日志中日志分析的请求
|
11 years ago |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
11 years ago |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
11 years ago |
|
lizanle
|
87b230623b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
950d831108
|
Merge branch 'api' into szzh
|
11 years ago |
|
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
lizanle
|
fd42af1ac4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
d8b5252279
|
调整了注释
|
11 years ago |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
11 years ago |
|
sw
|
649c65fbe2
|
国际化部分代码
|
11 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
lizanle
|
27fde6c641
|
添加注释
|
11 years ago |
|
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
f1693e237b
|
修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言）
|
11 years ago |
|
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
11 years ago |
|
lizanle
|
59a47002ae
|
重构，修正了许多的空指针异常
|
11 years ago |
|
z9hang
|
89e0f98034
|
启动匿评接口
|
11 years ago |
 alan
|
f01d164295
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6ccb154cc3
|
课程留言，发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
b949f70c64
|
修改数据格式转换方法
|
11 years ago |
|
z9hang
|
abcf06ccc7
|
课程资源不能引用问题。原因：15年1-3月能属于2014年秋季学期，代码却将其判断为15年秋季学期了
|
11 years ago |
|
lizanle
|
2431fea63e
|
日志查看Helper
|
11 years ago |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
huang
|
e8cca08f40
|
多选查询去重，修改样式
|
11 years ago |
|
huang
|
6bba6b2b76
|
weiwan
|
11 years ago |
|
huang
|
6e698d45bb
|
修改了html边界超出问题
|
11 years ago |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
11 years ago |
|
huang
|
3acec4b7c1
|
修改了总统计数
|
11 years ago |
|
huang
|
59c21d81e9
|
修改了分母不能为0的bug
统计结果精确到两位
|
11 years ago |
|
huang
|
7177303eeb
|
问卷统计最终效果
|
11 years ago |
|
z9hang
|
dc2c96f59a
|
提交后的问卷禁止查看与编辑
|
11 years ago |
|
alan
|
5191411508
|
<邮件加密自动登录功能，邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
77dc9607df
|
简答题答题
|
11 years ago |
|
z9hang
|
d684acf527
|
多选题答题功能
|
11 years ago |
|
z9hang
|
6d82e79e7f
|
答题相关方法添加
|
11 years ago |
|
lizanle
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
11 years ago |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
huang
|
293b3a3b42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
11 years ago |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
11 years ago |
|
alan
|
9bbc8d64eb
|
课程母版页加载缓慢
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2262997c31
|
修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b17d4840b1
|
《作业优化》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
0e7f7a4254
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
11 years ago |
|
alan
|
2a94c61a3e
|
修改bug(项目--缺陷：更新图片时在历史记录中没有相关记录，删除图片只显示一个更新时间也不合理)
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
f834759d84
|
#1709测试版--课程--加入课程：成功加入课程，还是显示为“加入”，需手动刷新页面
|
11 years ago |
|
alan
|
683acfcafc
|
优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
36967eeec0
|
修改注册接口、添加作业列表接口
|
11 years ago |
|
z9hang
|
9abe730dff
|
恢复私有课程的公开资源不能引用问题（导致搜索速度慢）
|
11 years ago |
|
z9hang
|
e4439daf3b
|
全站搜索bug
|
11 years ago |
|
z9hang
|
c0a0c41e14
|
私有课程的公开资源能下载bug
|
11 years ago |
|
sw
|
cf5b03a379
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
sw
|
d9250231e5
|
#1698 1.修改标签查询结果中点击课程/项目列表报错的BUG
2.修改页面代码
|
11 years ago |
|
alan
|
90a01c8d84
|
对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d8a568e685
|
增加《分班搜索学生》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d5de3dcb56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/courses_controller.rb
|
11 years ago |
|
sw
|
f2cfa6d4a1
|
修改课程老师、学生数量显示为实际数字，而不是+
|
11 years ago |
|
alan
|
078639b35a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
cfb8edbfe2
|
分组功能样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a64cae5da3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2b3edbc8fb
|
#1663 课程资源库--全站搜索：老师不能引用其他资源至我的课程了
|
11 years ago |
|
alan
|
c9b84d0a35
|
增加《学生加入，退出分组》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
66f93150f6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
9765f11f7e
|
增加<修改，添加分组>功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
4bbc76a217
|
1.重写homework_attach的show方法，优化弹出框的弹出效率
2.修改相关的view层代码
3.增加获取指定评分的评论的方法
|
11 years ago |
|
z9hang
|
2a7e0365b8
|
注册修改
|
11 years ago |
|
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
19b61118ac
|
修改加入按钮失败后变为加入课程按钮
|
11 years ago |
|
sw
|
f934824175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d9c3103e6e
|
1.修改留言列表得分显示样式
2.修改获取指定用户对作业评分的方法
|
11 years ago |
|
z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
298b767fc4
|
资源显示，对于课程外人员不在显示私有资源
|
11 years ago |
|
z9hang
|
514dcb97a0
|
完成资源按时间、下载次数排序功能
|
11 years ago |
|
z9hang
|
c2d618ce9c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
71e7d2c872
|
修改全站搜索结果显示策略：私有资源属于当前课程，且当前用户为当前课程的成员时可见，其他情况私有资源不可见
|
11 years ago |
|
sw
|
cd3f4ef8d3
|
修改标签的显示js
|
11 years ago |
|
sw
|
2b5160f2d9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9898e1650b
|
1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改
|
11 years ago |
|
z9hang
|
b0db7dfece
|
添加判断课程是否为当前学期或下一学期方法
|
11 years ago |
|
z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
11 years ago |
|
sw
|
e68900b9a0
|
#1616 修改课程时开课日期选项错误
|
11 years ago |
|
z9hang
|
8a3669ba3b
|
引用次数统计包括多级引用
|
11 years ago |
|
z9hang
|
5a20945e0d
|
选入我得课程列表中添加课程学期的显示
|
11 years ago |
|
sw
|
5bcc76d399
|
修改作业提交项目第一项为请选择
|
11 years ago |
|
sw
|
23da0a6dad
|
修改作业提交项目时默认问空
|
11 years ago |
|
z9hang
|
feccad8fa5
|
用户为创建课程，或没有作为教师的课程时，不显示引入我的课程按钮
|
11 years ago |
|
sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
436cf1175f
|
修改课程资源模块相关问题
|
11 years ago |
|
sw
|
06a513b2ee
|
修改不选择项目时的<<NULL>>为 NO PROJECT
|
11 years ago |
|
z9hang
|
36e7b222bb
|
课程资源修改为公开的也需登录才能下载
|
11 years ago |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
|
z9hang
|
2348e063d1
|
调整选入课程弹框中列表的显示策略
|
11 years ago |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
3215786538
|
修改非课程成员能看到提交作业按钮
|
11 years ago |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
11 years ago |
|
sw
|
80e3e44f13
|
修复学生不能退出私有课程的BUG
|
11 years ago |
|
sw
|
9d971069b5
|
Merge branch 'Homework' into szzh
|
11 years ago |
|
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9bd1af9541
|
#1480 项目留言区回复时间显示问题
|
11 years ago |
|
alan
|
1468f4a8df
|
修改《修改资料》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
54aae26cbe
|
被除数为0时弹框报错
|
11 years ago |
|
sw
|
b8c9651079
|
111
|
11 years ago |
|
sw
|
14db93c10a
|
教师作业列表增加当前作业提交信息,匿评信息提示
|
11 years ago |
|
sw
|
7d97889261
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
app/views/layouts/base_homework.html.erb
|
11 years ago |
 gonglexin
|
c52e87c74f
|
统计数据
|
11 years ago |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
11 years ago |
|
sw
|
e5874283f1
|
1.修改课程实践列表提交作业按钮链接
2.增加提交作业的控制
3.修改获取在指定课程提交作业的集合的方法判断
|
11 years ago |
|
sw
|
2f8f8593eb
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
11 years ago |
|
z9hang
|
fced7dcb91
|
进入自己的作业不让评分
|
11 years ago |
|
z9hang
|
c2fe1b7c72
|
修正评分不能点问题，作品留言
|
11 years ago |
|
z9hang
|
2628ab4808
|
修改评分列表获取方式
|
11 years ago |
|
z9hang
|
47c8ffd22a
|
作业修改
|
11 years ago |
|
z9hang
|
96626eeb6b
|
恢复respond_path路由并修改部分respond_path
恢复homework_list.html.erb文件
|
11 years ago |
|
sw
|
8a7757f3c2
|
1.整理踩、赞页面代码
2.增加作业点赞功能
3.作业列表界面增加是否已经点赞判断
|
11 years ago |
|
sw
|
58d32bcf2b
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
f5e9528b12
|
修改base_homework界面
|
11 years ago |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
11 years ago |
|
gonglexin
|
811b6383f7
|
初次加载页面时给定一个默认排序
|
11 years ago |
|
gonglexin
|
b2f75d5826
|
给时间和分数排序增加顺序和倒序排序功能
|
11 years ago |
|
gonglexin
|
bb642d320d
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
gonglexin
|
f3d8aebfe4
|
给排序设置正确的路径
|
11 years ago |
|
sw
|
fe65e3619c
|
点击评分增加弹出框
|
11 years ago |
|
z9hang
|
7c331cf49c
|
还原对tags做的修改(上次的修改对一个系统文件做了修改，无法应用到本系统)
|
11 years ago |
|
sw
|
435e5a4d51
|
项目首页用户动态增加悬浮框显示动态所有内容
|
11 years ago |
|
z9hang
|
8cbc4eb938
|
#1318 课程/项目，点击打开该标签，不显示对应的课程/项目名称,原实现逻辑与现存的数据有冲突，扩展了其实现方式，使之兼容现有的数据
|
11 years ago |
|
z9hang
|
0a1713da20
|
课程列表中，自己的课程没星号标志问题
|
11 years ago |
|
z9hang
|
ef15c15605
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
30e355fa35
|
#948 admin配置管理--用户列表--项目列表：如图下拉框显示超出边框且项目问题，解决，说小选项长度，添加title属性，鼠标悬停时显示选项的完整信息
|
11 years ago |
|
sw
|
782098c6e7
|
修改测试版个人修改学校、学校列表跨域访问的问题
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
gonglexin
|
1abcd2a43e
|
#1275 修正课程列表中的动态数
|
11 years ago |
|
sw
|
3a48034fca
|
#1387修复课程--资源库-关联资源查询出来的结果是整个项目中资源的集合的BUG
|
11 years ago |
|
sw
|
87788ab34c
|
代码优化
|
11 years ago |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
|
sw
|
7729a2739f
|
修复课程首页SQL不正确的BUG
|
11 years ago |
|
sw
|
062a1a4879
|
龚乐鑫修改意见1：去除无用文件
|
11 years ago |
|
sw
|
97f66a2b08
|
Merge branch 'develop' into szzh
|
11 years ago |
|
z9hang
|
f957666b25
|
部分网页标题不标准问题，补交之前漏掉未添加的文件
|
11 years ago |
|
sw
|
7529a944cf
|
修改课程首页显示课程：
1.3-8月份为显示春季课程，9-2月份为显示秋季课程
1.当前用户未登录：显示系统中在当前年度、季度中人数最多的10个公开课程
2.当前用户以登录，或者选择指定学校：显示该用户所在学校/指定学校在当前年度、季度中人数最多的10门该用户可见的课程(包括该用户可见的私有课程)，如果该学校课程数量不足，向用户推荐其他课程补充数量
|
11 years ago |
|
sw
|
0f492047a5
|
修复项目首页的用户动态会显示私有项目中的动态的BUG
|
11 years ago |
|
sw
|
2e3ff531f6
|
1.#1181课程描述显示的问题
2.修改项目首页用户动态显示按字符长度截取导致页面不协调的BUG
|
11 years ago |
|
sw
|
ecfcbf1078
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
8ac2640a09
|
#1293修复用户可以通过课程实践页面url进入加入私有课程界面的BUG
解决方案：加入课程按钮增加权限判断；课程实践界面增加权限判断
|
11 years ago |
|
z9hang
|
d1b20dddef
|
添加非空判断
|
11 years ago |
|
alan
|
43e940eb1d
|
修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
57835abb37
|
1.增加管理员不能退出项目
2.增加退出项目时的提示
|
11 years ago |
|
sw
|
8aec3fe8f5
|
新建、修改课程年份从当前年份开始
|
11 years ago |
|
sw
|
ef78066f3e
|
公共贴吧，回复帖子上传附件时回复信息显示不完整:还有一点点被遮住。。
|
11 years ago |
|
sw
|
5a14798290
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
0a02fbf10e
|
修复资源搜索，资源列表显示错误 #1262
链接解析方法不对
|
11 years ago |
|
sw
|
0ab7bfcda9
|
限制上传文件名、文件描述长度 #1252
|
11 years ago |
linhk
|
5824f70fe3
|
输出日志代码
|
11 years ago |
|
sw
|
7c97c0391b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c10eeb1c01
|
项目首页增加新建项目按钮
|
11 years ago |
|
linhk
|
185bbf3cf7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
56c31d6e2f
|
解决版本库网页标题Bug
|
11 years ago |
|
sw
|
5f7052a348
|
修复forge和course网站的讨论区的帖子内容超出边界的BUG
解决方案：强制限制文件名显示最大长度
|
11 years ago |
|
z9hang
|
8cc14546f8
|
公共贴吧附件资源修改为未登录也可以下载，项目列表私有标签错误
|
11 years ago |
|
alan
|
64eb4d362c
|
将contest主页中通知公告的颜色改成蓝色
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
70b079041c
|
修改contests_controller.rb，contest.rb, contest_project.rb,contests_helper.rb,
attachments_helper.rb, application_helper.rb.
主要修改内容: 书写规范， for循环用 each 代替， if 语句的合并， unless 转换成if,
函数名称拼写错误。
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
8a6e19bcad
|
修正项目列表中私有标签国际化丢失问题
|
11 years ago |
|
z9hang
|
e0cdcc0211
|
课程讨论区发帖，添加附件，admin帐户删除附件报错，原因：判断attachment的containers是否为课程的时候少判断了课程讨论区的附件这种情况，解决：加上该判断。问题2 #1002 forge网站的主页项目列表登录前和登陆后，显示的不一样。 解决方法：项目列表、课程列表中的私有项目、私有课程添加私有标志
|
11 years ago |
|
z9hang
|
8fc9e65e66
|
wiki编辑控件粘贴进去的截图不能显示问题
|
11 years ago |
|
sw
|
c614734768
|
#1508 修复课程、项目列表中，点击标签的更多按钮，报错的BUG
|
11 years ago |
|
sw
|
c7caa08c70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5afcb73624
|
1.修改中英提示
2.修改查看差别页面会超出界面的BUG
|
11 years ago |
|
z9hang
|
cb8b0e0f41
|
admin页面中问题追踪项相关错误（课程、项目分离此处代码未改导致的问题）、项目列表中项目提交次数改为从数据库中读取（运行bundle exec rake project_score:calculate统计项目提交次数）
|
11 years ago |
 zhanghaitao
|
0e84982203
|
开始日期、计划完成日期不合法已发异常判断修改
|
11 years ago |
|
zhanghaitao
|
b1048074ef
|
#1072 发布作业：截止日期不能手动输入修改
|
11 years ago |
|
zhanghaitao
|
5b85aa0961
|
限制日期控件的不可编辑性，解决输入不正确日期返回异常的问题
|
11 years ago |
|
zhanghaitao
|
2be1ac0dbd
|
修改日期选择控件当日操作日期不可以选择的Bug
|
11 years ago |
|
sw
|
7ec103e135
|
#1457 修复课程开课日期无法修改的BUG
优化选择开课时间代码
|
11 years ago |
|
sw
|
d608d092da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d1d2dd0e4b
|
undefined m_coumt问题修正
|
11 years ago |
|
sw
|
f41d3f8b6a
|
修改作业显示真实名字不正确的问题
|
11 years ago |
|
sw
|
234a781342
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5482ba3207
|
后台统计所有用户分数算法优化
|
11 years ago |
|
sw
|
50e1f41345
|
#1307修复作业列表真实姓名只显示名不显示姓的BUG
|
11 years ago |
|
z9hang
|
1e234a9adf
|
优化积分计算速度问题
|
11 years ago |
|
z9hang
|
ed3e9e3a03
|
项目成员列表积分计算的初步优化（降低访问速度）
|
11 years ago |
|
linhk
|
ecae8d1f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
4f0817a146
|
项目--文档--文件--代码评审 中用户头像显示错误
|
11 years ago |
