 huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
10 years ago |
 alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
8e74712b86
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
5af284e8a4
|
项目资源统计代码优化
|
10 years ago |
 sw
|
1ae8c7d234
|
作业评分、上传评阅结果，以及上传结果的显示样式
|
10 years ago |
|
alan
|
0b6f35055d
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
a7aa83be8c
|
module配置未选时候，禁止其它方式的访问
去掉无用文件代码
|
10 years ago |
|
huang
|
f52058aaf3
|
课程首页新界面（未完成）
|
10 years ago |
|
sw
|
faeb06aae8
|
1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
|
10 years ago |
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
huang
|
e2f0aeb693
|
公共贴吧--帖子里面搜索错误
|
10 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
10 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
10 years ago |
 yutao
|
895058f38e
|
修复bug#2154:成功上传课件，课程资源数统计未自动刷新
|
10 years ago |
|
huang
|
d42fd98dff
|
优化项目类型
|
10 years ago |
|
guange
|
1355dc805f
|
用户界面返回500错误 #2610
|
10 years ago |
|
huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
10 years ago |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
10 years ago |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
06a3ca9fe9
|
IE浏览器中，课程收索为空时显示不正确
|
10 years ago |
|
sw
|
6566a044d2
|
无工作地点就不显示了
|
10 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
10 years ago |
|
guange
|
af2c20f666
|
修复意见反馈不见了的问题
|
10 years ago |
|
sw
|
c2d11140a1
|
意见反馈问题
|
10 years ago |
|
sw
|
dd7140f4fb
|
意见反馈。内容宽没了
|
10 years ago |
|
huang
|
404073d76e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
c148a8a145
|
私有项目版本库全休修改
|
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
|
406d608edc
|
版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
|
10 years ago |
|
huang
|
6f3621f6c0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
6c500109c9
|
修改项目上传资源
|
10 years ago |
|
guange
|
4e6ca53b53
|
jquery-js找不到报错
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
|
alan
|
79c0c6f551
|
修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
86f686efb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
89ea9ddc7b
|
项目讨论区代码还原
样式调整
|
10 years ago |
|
sw
|
05c26aceb6
|
发布新贴按钮跳转
|
10 years ago |
|
huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
10 years ago |
|
huang
|
5167cf374c
|
项目讨论区左侧新建按钮跳转页面修改
通过传参跳入（JS实现）
|
10 years ago |
|
alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
2e26e27298
|
版本库收起后之保存在cookie中，刷新页面后仍保持收起状态
|
10 years ago |
whimlex
|
88bbd70102
|
项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示
|
10 years ago |
|
huang
|
389266e3e5
|
修改不同角色拥有的权限
管理员--配置、项目类型
开发人员-- 配置、退出项目
报告者-- 退出项目（admin可以配）
|
10 years ago |
|
huang
|
dfcc076a7f
|
角色多选的时候权限控制
|
10 years ago |
|
huang
|
84a7bb5907
|
修改超级管理员不能退出项目
|
10 years ago |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
10 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
10 years ago |
|
huang
|
e7d85aad27
|
修改项目配置、关注、加入、类型等不同角色显示
|
10 years ago |
|
huang
|
be9beff0b4
|
解决Roles未定义
|
10 years ago |
|
huang
|
db8b79f3b4
|
退出项目/项目三种模式切换权限控制
|
10 years ago |
|
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
10 years ago |
|
whimlex
|
85e1262769
|
意见反馈
|
10 years ago |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
10 years ago |
|
whimlex
|
b61d76d94e
|
意见反馈
|
10 years ago |
|
whimlex
|
e61822d74a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
b3e0490b90
|
意见反馈
|
10 years ago |
|
guange
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
10 years ago |
|
whimlex
|
b5781ac22b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
5d0d9de6e8
|
意见反馈各主页内保持一致
|
10 years ago |
|
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
10 years ago |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
10 years ago |
|
huang
|
348eae5c45
|
修改项目模式提示样式
版本库
版本
|
10 years ago |
|
sw
|
9a07989917
|
调整header的login的样式
|
10 years ago |
|
sw
|
1985d1c84b
|
调整header下啦列表框位置
|
10 years ago |
|
sw
|
427f26b058
|
header的login显示
|
10 years ago |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
10 years ago |
|
huang
|
bce1006969
|
邀请界面添加权限控制
|
10 years ago |
|
huang
|
eeaa613c9e
|
项目类型实时刷新功能
|
10 years ago |
|
huang
|
49f33dd50c
|
类型bug修复
|
10 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
10 years ago |
|
huang
|
8b77079f44
|
公开。私有标识强制不换行
|
10 years ago |
|
huang
|
2043b963c8
|
添加意见反馈
项目配置权限
|
10 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
10 years ago |
|
alanlong9278
|
0668af4f89
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/bids/_bid_homework_show.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
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 |
|
huang
|
54b81bdfb3
|
项目类型图标
|
10 years ago |
|
sw
|
6983764c44
|
修改课程名称过长时的样式
|
10 years ago |
|
huang
|
b80251a247
|
链接空白处改成不能点击
修复项目标题过长，布局变形
|
10 years ago |
|
huang
|
3c563eaecb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
bb7904b32f
|
引入JS文件
|
10 years ago |
|
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
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 |
|
huang
|
bd800a53e4
|
项目简介显示
|
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
|
bc6ff57de2
|
修改开发组、朋友圈、研发组切换js
|
10 years ago |
|
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
10 years ago |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
10 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
10 years ago |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
10 years ago |
|
alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
10 years ago |
|
huang
|
b3689377a3
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
