 sw
|
a0c6a09e7d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
11 years ago |
 huang
|
be97e4732d
|
目标版本为空的不显示
|
11 years ago |
|
sw
|
9819e1ce45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 lizanle
|
61a938ef39
|
添加真名
|
11 years ago |
|
lizanle
|
e4597f9ccc
|
添加真名
|
11 years ago |
|
lizanle
|
45d5f9e58b
|
课程搜索按时间倒序排序
|
11 years ago |
|
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
11 years ago |
|
sw
|
6983764c44
|
修改课程名称过长时的样式
|
11 years ago |
|
huang
|
9fa7b04ce5
|
组织不需要必填
|
11 years ago |
|
huang
|
b92767bbb5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
b80251a247
|
链接空白处改成不能点击
修复项目标题过长，布局变形
|
11 years ago |
|
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
|
11 years ago |
|
lizanle
|
10bd7c2855
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
huang
|
3c563eaecb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
bb7904b32f
|
引入JS文件
|
11 years ago |
whimlex
|
19cbc34b2b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
11 years ago |
|
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
11 years ago |
|
huang
|
890f36a2d5
|
优化缺陷
|
11 years ago |
|
sw
|
a2b529b38b
|
课程添加TAG后删除TAG按钮消失
|
11 years ago |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
11 years ago |
|
huang
|
4afd9afd08
|
解决冲突。修改版本页面
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/project.css
|
11 years ago |
|
huang
|
08fb04aff4
|
修改版本库样式
|
11 years ago |
|
whimlex
|
20b17f5503
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
301e44c695
|
修改附件上传功能无效
|
11 years ago |
|
huang
|
8803942a02
|
项目讨论区，引用样式调整
|
11 years ago |
|
huang
|
e34a00f66e
|
讨论区列表样式冲突
|
11 years ago |
|
sw
|
e334dd69f8
|
上传课件后TAG云消失
|
11 years ago |
|
huang
|
c1d997379f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
11 years ago |
|
huang
|
284e4938f6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
38672458b0
|
新建版本 更改页面
|
11 years ago |
|
huang
|
dc81db1d8b
|
处理讨论区、缺陷列表样式显示异常
|
11 years ago |
|
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
11 years ago |
|
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
fe94efeb39
|
新建版本更改页面
|
11 years ago |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
11 years ago |
|
huang
|
e2f7da5b99
|
修改里程碑代码
|
11 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
|
11 years ago |
|
huang
|
bd800a53e4
|
项目简介显示
|
11 years ago |
|
whimlex
|
7ce8ae0261
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
9c07976751
|
展开和收起更多信息图片样式修改；跟踪者样式修改
|
11 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
11 years ago |
|
huang
|
bc6ff57de2
|
修改开发组、朋友圈、研发组切换js
|
11 years ago |
|
huang
|
61ce44af76
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
c11fdc7273
|
版本库调整：未完成
|
11 years ago |
|
whimlex
|
1d8dee15f4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
11 years ago |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
11 years ago |
|
huang
|
fec751608a
|
完成里程碑界面
|
11 years ago |
|
huang
|
8e7b4868ca
|
wiki页面调整
|
11 years ago |
|
huang
|
6229acac71
|
完成wiki新建界面
|
11 years ago |
|
whimlex
|
d79de0a354
|
课程日期控件样式冲突
|
11 years ago |
|
sw
|
94580ba040
|
11
|
11 years ago |
|
whimlex
|
596e89a14f
|
缺陷更新页面
|
11 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
11 years ago |
|
huang
|
45c234bf9c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
aff58dd3a7
|
添加关注者
|
11 years ago |
|
sw
|
73ed8b9558
|
全站搜索是不输入条件搜索结果为空
|
11 years ago |
|
sw
|
0f6d2676e5
|
tag云显示搜索结果的TAG云
|
11 years ago |
|
whimlex
|
30dae089c6
|
新建缺陷页面主题不能为空
|
11 years ago |
|
whimlex
|
521e000c74
|
commmit
|
11 years ago |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
11 years ago |
|
whimlex
|
d68b0283eb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
a10ced61ec
|
缺陷跟踪者
|
11 years ago |
|
huang
|
3825252327
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
104075b3fd
|
修改缺陷留言方式
|
11 years ago |
|
whimlex
|
7fa2338ce6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
11 years ago |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
11 years ago |
|
huang
|
4d0a9bd35c
|
部分描述增加强制换行
|
11 years ago |
|
huang
|
0023d0610b
|
缺陷主题、描述强制换行
跟踪按钮样式
引用样式修改
|
11 years ago |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
11 years ago |
|
sw
|
e579157604
|
更新public.css
课程讨论区文件按钮和editor靠的太近
|
11 years ago |
|
huang
|
c607bd5cbf
|
定义缺陷中样式
|
11 years ago |
|
huang
|
afa5c3a4f9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
bfe0176b74
|
修改附件显示样式
|
11 years ago |
|
lizanle
|
c42a63ea4e
|
添加判空
|
11 years ago |
|
lizanle
|
c2ccf6a1f8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
a7f1026828
|
current_user判空
|
11 years ago |
|
sw
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
11 years ago |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
11 years ago |
|
sw
|
d1f42a3954
|
教师只评论不评分的作品在未批和已批列表中都有
|
11 years ago |
|
sw
|
78dff36d7a
|
老师只评论不评分的学生作业却在已评列表
|
11 years ago |
|
sw
|
ee68828132
|
创建课程后跳转URL报错
|
11 years ago |
|
huang
|
4acad8088e
|
缺陷最新显示最上面
代码优化
|
11 years ago |
|
huang
|
e0695fa51d
|
讨论区。描述、主题换行
|
11 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
11 years ago |
|
whimlex
|
b3b9688072
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
cdf1ce1c17
|
缺陷页面
|
11 years ago |
|
sw
|
81cbb76d78
|
课程/项目--添加成员：用真实姓名搜索用户时，需要在姓和名之间加个空格才可以搜到
|
11 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
11 years ago |
|
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
11 years ago |
|
sw
|
e4b2092c7f
|
实现项目成员列表增加成员，以及用户/角色留空时的提示信息
|
11 years ago |
|
sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
11 years ago |
|
huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
11 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
11 years ago |
|
sw
|
1598bf6b4d
|
课程成员搜索忽略大小写
|
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 |
|
lizanle
|
76d7bd267c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
68a54b9368
|
app评论
|
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
|
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 |
