 yutao
|
9690dc41f6
|
修复bug#2606 :IE浏览器：测试版—中国高校：搜索学校时ajax链接错误
|
11 years ago |
 huang
|
5432ac4498
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
11 years ago |
|
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
11 years ago |
 alan
|
b4cdd9568e
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
34893db465
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
3c810a0cee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
3f77e2cdcf
|
资源权限公共方法定义
|
11 years ago |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
11 years ago |
guange
|
1226f74750
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
11 years ago |
 sw
|
a44cba2e6a
|
Merge branch 'develop' into guange_dev
|
11 years ago |
|
sw
|
0e6c15c160
|
取消个人头像logo删除功能
|
11 years ago |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
11 years ago |
|
sw
|
b84f6280c2
|
wiki报500
|
11 years ago |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
81ec174387
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 lizanle
|
056d685982
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
e1dd4823d5
|
课程通知发布api
|
11 years ago |
|
sw
|
06a3ca9fe9
|
IE浏览器中，课程收索为空时显示不正确
|
11 years ago |
|
sw
|
ea1a98f8ac
|
测试版--搜狗浏览器中课程名称显示为当前登录用户的用户名
|
11 years ago |
|
sw
|
6566a044d2
|
无工作地点就不显示了
|
11 years ago |
|
sw
|
99e3d09e83
|
IE浏览器中li前面有个点
|
11 years ago |
|
sw
|
404421c745
|
功能贴吧列表，去掉头像的alt属性
|
11 years ago |
|
lizanle
|
3b137dadb8
|
查询未关注需要用户id
|
11 years ago |
|
lizanle
|
47d75fe205
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
a262f86100
|
成绩查询我总是在最上方
|
11 years ago |
|
guange
|
907d89e1cc
|
merge
|
11 years ago |
|
yutao
|
a4cf7bcaad
|
修改问题跟踪列表翻页为局部刷新
|
11 years ago |
|
yutao
|
233c68e965
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yutao
|
68cf5fa55e
|
修复:当1个页面存在多个上传控件时的各种bug
|
11 years ago |
|
huang
|
7db9e2eb7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
2fb5871058
|
缺陷显示新界面
|
11 years ago |
|
guange
|
a1240e8743
|
将过期改为1个月
|
11 years ago |
|
lizanle
|
66f8bed978
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
75643b8181
|
修改一个查询user的bug
|
11 years ago |
|
alan
|
372bf71ca5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
465dbfe3f9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
e51d6684ca
|
发布竞赛页面bug
|
11 years ago |
|
lizanle
|
d2bf8a16de
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
a047bd3d18
|
课程作业发布功能
设置教辅功能
学生列表及成绩查看功能
|
11 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
11 years ago |
|
guange
|
9f3cdba9db
|
merge
|
11 years ago |
|
guange
|
af2c20f666
|
修复意见反馈不见了的问题
|
11 years ago |
|
sw
|
c2d11140a1
|
意见反馈问题
|
11 years ago |
|
sw
|
31d80a0026
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c3a98edca8
|
取消打零分时的弹出框
|
11 years ago |
|
alan
|
e9c1012cbe
|
修改附件上传时公开，删除位置不一致
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b8651606be
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
0db90f98d5
|
wiki的attachment与讨论区冲突
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8a8a46a5d2
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
11 years ago |
|
sw
|
dd7140f4fb
|
意见反馈。内容宽没了
|
11 years ago |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
11 years ago |
|
huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
33365f7ea6
|
修改编辑作业时附件显示移位
|
11 years ago |
|
alan
|
0708279c5e
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
68986fa1cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
2c568ed370
|
修改主页下载不存在的资源500错误
定义helper方法
|
11 years ago |
|
sw
|
8d44ed2189
|
课程--课程通知：取消编辑通知，应该返回通知详情页面，而非一个空白页
|
11 years ago |
|
alan
|
f9d9ffe4d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
963a21283f
|
1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
|
11 years ago |
|
sw
|
b5719aca8e
|
修改首页我要提问后新建帖子显示样式
|
11 years ago |
|
huang
|
97780b7eef
|
私有项目可以引用其他资源
|
11 years ago |
|
huang
|
84efdb16c9
|
解决wiki500错误
show_new代码优化（代码中存在错误）
|
11 years ago |
|
alan
|
0af8c1cc38
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
bd77ad9ac1
|
展开。收起
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
c0e1eb85a1
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
|
guange
|
f53691ceed
|
修复不是News的附件显示出错
|
11 years ago |
|
guange
|
f90278fe73
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
11 years ago |
|
huang
|
404073d76e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
c148a8a145
|
私有项目版本库全休修改
|
11 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
11 years ago |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
11 years ago |
|
guange
|
eb6c3a9377
|
课程搜索很慢，原因是以前成员数计算太复杂
|
11 years ago |
|
alan
|
a8d19a119a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
fe2f6a0d9d
|
修改样式以及添加回复取消功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
406d608edc
|
版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
|
11 years ago |
|
huang
|
68050b7d22
|
版本库页面脚本过长
|
11 years ago |
|
huang
|
90559556c6
|
新建版本库，输入框对齐
|
11 years ago |
|
huang
|
6f3621f6c0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
a62001c892
|
新建版本库--
如果主版本库已存在，新建的时候不允许设置主版本库
|
11 years ago |
|
huang
|
6c500109c9
|
修改项目上传资源
|
11 years ago |
|
lizanle
|
7112d91706
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动
|
11 years ago |
|
guange
|
50575c1c20
|
issue的排序经一线人员使用，还是按创建时间排序好
|
11 years ago |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
11 years ago |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
29114e19f3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
4e6ca53b53
|
jquery-js找不到报错
|
11 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
11 years ago |
|
alan
|
8773842801
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8e61136d7f
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
79c0c6f551
|
修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
ee18ba7051
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/boards/_course_show.html.erb
app/views/boards/_project_show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
328dc828c2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c51794d754
|
提交通知连接
|
11 years ago |
|
huang
|
f3b46c5823
|
项目资源库权限优化：
管理员、资源上传者拥有设置公开私有权限
私有项目不提供引用其它项目和公开功能
|
11 years ago |
|
sw
|
87564eceee
|
修改作业--->修改作品
|
11 years ago |
|
guange
|
11d7c234f7
|
merge
|
11 years ago |
|
guange
|
461d9cc183
|
将autologin默认过期时间改为两个月
|
11 years ago |
|
sw
|
f12a20f85e
|
用户修改资料保存报错
|
11 years ago |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
11 years ago |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
821ceb41cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
11 years ago |
|
huang
|
80e1d1f277
|
去掉讨论区编辑页面虚线
|
11 years ago |
|
huang
|
a5fbccc975
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f7ad600dde
|
发布帖子不能删除
|
11 years ago |
|
sw
|
5a4f477e46
|
课程讨论区编辑、删除按钮互换
|
11 years ago |
|
sw
|
86f686efb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
11 years ago |
|
huang
|
89ea9ddc7b
|
项目讨论区代码还原
样式调整
|
11 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
11 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
11 years ago |
|
sw
|
05c26aceb6
|
发布新贴按钮跳转
|
11 years ago |
|
sw
|
34dbde442d
|
还原课程讨论区
|
11 years ago |
|
sw
|
a24e4d345d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
c21f2c3927
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
2d93cd4bdc
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
11 years ago |
|
alan
|
07ca42b24d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
63351fc049
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
e6fe010bd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
5167cf374c
|
项目讨论区左侧新建按钮跳转页面修改
通过传参跳入（JS实现）
|
11 years ago |
|
alanlong9278
|
087f46bf64
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
huang
|
39fe748da7
|
处理项目讨论区主题、描述内容过长
|
11 years ago |
|
alanlong9278
|
358c9aa019
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alanlong9278
|
65c2c43dcb
|
展开收起回复
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
sw
|
559b5ce7ab
|
打开缺陷在新的页面打开
|
11 years ago |
|
sw
|
78f30344b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
db6218a487
|
教师列表界面增加角色显示、教师显示真实姓名
|
11 years ago |
|
alanlong9278
|
3995c68b96
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
alanlong9278
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
alanlong9278
|
53124710d8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
2749c4f890
|
课程配置页面，角色改为中文
|
11 years ago |
|
alanlong9278
|
49fe15a666
|
论坛js冲突
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
huang
|
7755d54ef1
|
各处中文角色统一
|
11 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>
|
11 years ago |
|
huang
|
c6b1a4af59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
3df8a99408
|
添加中文项目成员角色
|
11 years ago |
|
lizanle
|
3035bf24fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
de921be762
|
学生列表老师列表报key not find:realname
|
11 years ago |
|
alan
|
20cea86ae8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
3cb8962f01
|
登录后域名改为user.truestie.net
|
11 years ago |
|
sw
|
ac976e59df
|
匿评可以打0分并给出提示
|
11 years ago |
|
sw
|
b684f5b361
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e884f58956
|
匿评可以打0分并给出提示
|
11 years ago |
|
alan
|
4bf08e49da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5ea295f8b5
|
1、第一次进入作品列表界面 返回顶部按钮不显示
2、第一次点击返回顶部按钮无用
|
11 years ago |
|
sw
|
5f6f937fcb
|
返回顶部浏览器不兼容
|
11 years ago |
|
sw
|
f5e87451b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
0ec08f9361
|
打零分作品仍在未批作品列表显示
|
11 years ago |
|
sw
|
31f224fd82
|
返回顶部动态显示
|
11 years ago |
|
sw
|
628ffc67dd
|
课程作品列表界面增加返回顶部功能
|
11 years ago |
|
lizanle
|
f7720843a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
2b1b1c34a6
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
alan
|
4546095ed4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
eee0df8d22
|
修改课程，项目的讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
c9d66c7f5f
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
lizanle
|
1cb3dfc833
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
lizanle
|
6c7b92558c
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
lizanle
|
f214a26329
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
700d2985f6
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
whimlex
|
3b5d8f76a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
3c72af69ea
|
版本库刷新页面时“git操作指南”展开收起保持一致
|
11 years ago |
|
huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
11 years ago |
|
sw
|
b456bc0e62
|
评分支持打0分
|
11 years ago |
|
huang
|
fd28310e15
|
修改issue列表太长换行问题
|
11 years ago |
|
sw
|
e32a065c09
|
关闭学生评分界面后会跳到最顶部
|
11 years ago |
|
huang
|
a7b2ac860b
|
修改索引迁移文件不能执行的问题
|
11 years ago |
|
guange
|
9ba55296f5
|
修改密码完成后跳到个人资料
|
11 years ago |
|
sw
|
a5a5ccce41
|
#2452course网站课程资源个数的显示和主页显示的不一致
|
11 years ago |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
11 years ago |
|
sw
|
4c268b13dd
|
#2460匿评分配数量限制长度
|
11 years ago |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
11 years ago |
|
sw
|
c0b7819870
|
修改资料时昵称提示以及样式
|
11 years ago |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
11 years ago |
|
huang
|
615184fc38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
b39e00b5c7
|
项目讨论区--内容必填
添加国际化
|
11 years ago |
|
lizanle
|
3da5fdfa0f
|
课程课件搜索 课程学生搜索
|
11 years ago |
|
lizanle
|
b6993e78a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
74c09f45d3
|
课程课件搜索 课程学生搜索
|
11 years ago |
|
sw
|
2e26e27298
|
版本库收起后之保存在cookie中，刷新页面后仍保持收起状态
|
11 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
11 years ago |
|
alan
|
3f859065f2
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
d73ed9e467
|
项目讨论区改版
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
6b7a17de8c
|
版本库Git说明信息
|
11 years ago |
|
guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
11 years ago |
|
alan
|
a5760afa68
|
项目讨论区界面更改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
8929644ab1
|
课程学生model
|
11 years ago |
|
lizanle
|
96aef6dbe2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
c353398d65
|
课程学生列表功能
|
11 years ago |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c67cfc6b6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into memcached_alan
|
11 years ago |
|
alan
|
c80263a66e
|
Merge branch 'guange_dev' into memcached_alan
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
config/environments/production.rb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
whimlex
|
9707a88790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/project.css
|
11 years ago |
|
whimlex
|
88bbd70102
|
项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示
|
11 years ago |
|
huang
|
888cd508c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
11 years ago |
|
sw
|
74a85e1601
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
huang
|
431c6888a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/project.css
|
11 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
11 years ago |
|
whimlex
|
229d8007fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
538ba33174
|
问题跟踪附件图片显示不拉伸
|
11 years ago |
|
guange
|
49389ebe28
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
dbccf9034d
|
邮件加入日志
|
11 years ago |
|
huang
|
b67f401738
|
引入我的课程居中
|
11 years ago |
|
sw
|
0a8f3faf6a
|
1、project.css错误代码
2、项目上传资源弹框
|
11 years ago |
|
huang
|
389266e3e5
|
修改不同角色拥有的权限
管理员--配置、项目类型
开发人员-- 配置、退出项目
报告者-- 退出项目（admin可以配）
|
11 years ago |
|
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
|
11 years ago |
|
guange
|
ccc004aa03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
8384eff7f2
|
delayed_job条件错误
|
11 years ago |
|
whimlex
|
33fc193e65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
bbe4c15293
|
问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式
|
11 years ago |
|
lizanle
|
cc276c649d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
519eab76bd
|
添加显示课程的课件列表
|
11 years ago |
|
huang
|
dfcc076a7f
|
角色多选的时候权限控制
|
11 years ago |
|
huang
|
84a7bb5907
|
修改超级管理员不能退出项目
|
11 years ago |
|
huang
|
f94c2769e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
11 years ago |
|
sw
|
bef306e94c
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
|
sw
|
750393508a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
33da5b4a44
|
1、作业评论回复删除不即使刷新
2、匿评弹框样式
|
11 years ago |
|
huang
|
412052dd0d
|
修改:引入我的文件提示信息
|
11 years ago |
|
guange
|
e6f8610dea
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
6c6ef757e1
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
guange
|
2afdd57fb6
|
修复服务器打包乱码问题
|
11 years ago |
|
whimlex
|
b5b50bef21
|
问题跟踪图片压缩不清晰
|
11 years ago |
|
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
90c143f047
|
评论上传附件换行
|
11 years ago |
|
sw
|
e6a724d439
|
编辑作业样式
|
11 years ago |
|
sw
|
4c3013f1ac
|
修改作业评价上传附件功能500
作业标题换行
|
11 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
11 years ago |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
11 years ago |
|
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面
|
11 years ago |
|
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
b70ada57e6
|
邮件未处理text发送类型，导致每日发送失败
|
11 years ago |
|
sw
|
261ebb916c
|
1、当login过长，用户匿评界面的星星换行
2、去掉无用的创建作业的代码，与弹出框创建作业代码冲突
|
11 years ago |
|
sw
|
827d99fce4
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
456dcf9d40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d2f1f7d142
|
1、当教师评论为空时，预留一部分显示
|
11 years ago |
|
sw
|
a64b3940dd
|
1、当教师评论为空时，预留一部分
|
11 years ago |
|
whimlex
|
e30c446847
|
项目私有问题提示信息
|
11 years ago |
|
sw
|
0970182cd5
|
当教师只评分不评论时，学生可以进行回复
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
|
11 years ago |
|
whimlex
|
f3fb0115e4
|
版本库git操作文档默认展开，样式调整
|
11 years ago |
|
whimlex
|
4f48bbbfdb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
40fdda0ee2
|
版本库git帮助文档的显示与隐藏
|
11 years ago |
|
huang
|
e7d85aad27
|
修改项目配置、关注、加入、类型等不同角色显示
|
11 years ago |
|
guange
|
86347cab89
|
现在可以通过rake redmine📧test[guange] 发送测试邮件
|
11 years ago |
|
sw
|
03044d0190
|
课程--资源库：加粗上传课件分类字样
|
11 years ago |
|
huang
|
9cb31d75de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
be9beff0b4
|
解决Roles未定义
|
11 years ago |
|
sw
|
a23231ea7b
|
修改学生创建作品时的样式
|
11 years ago |
|
sw
|
2323c821d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f9aaaf38f9
|
打爆下载增加字符集
|
11 years ago |
|
whimlex
|
5670e2755b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
eba638b42e
|
问题跟踪编辑、更新的权限控制
|
11 years ago |
|
guange
|
56f6fa0d86
|
设置zip支持unicode
|
11 years ago |
|
huang
|
020e544b38
|
修改项目--用户反馈--两层回复样式
|
11 years ago |
|
guange
|
24ce5191c3
|
zip打包可能有乱码
|
11 years ago |
|
huang
|
4cdc1d66a2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
db8b79f3b4
|
退出项目/项目三种模式切换权限控制
|
11 years ago |
|
sw
|
64642a51e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
7e833a4727
|
缺陷图片显示小
|
11 years ago |
|
sw
|
1a33510da1
|
我要反馈、我要提问新版Editor没有边框
|
11 years ago |
|
whimlex
|
520627f010
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
cde4a892e0
|
竞赛主页竞赛通知条数对主页样式的调整
|
11 years ago |
|
guange
|
e3dd68ad24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
449bbc553c
|
修复issue界面js报错
|
11 years ago |
|
guange
|
3299f7e726
|
正式库issue界面图片显示路径错误
|
11 years ago |
|
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
11 years ago |
|
whimlex
|
091c6125d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
85e1262769
|
意见反馈
|
11 years ago |
|
sw
|
91e37c7ab8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
54ef7e3325
|
修改课程讨论区报错
|
11 years ago |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
11 years ago |
|
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
11 years ago |
|
whimlex
|
b61d76d94e
|
意见反馈
|
11 years ago |
|
whimlex
|
e61822d74a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
b3e0490b90
|
意见反馈
|
11 years ago |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
11 years ago |
|
guange
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
11 years ago |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
11 years ago |
|
sw
|
b6652ed5e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
10bc470dcf
|
修改课程讨论区
|
11 years ago |
|
huang
|
e38639665b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
7e7ff92f7c
|
issueenter键不能搜索的问题
|
11 years ago |
|
huang
|
4c1259ff92
|
缺陷enter键盘不能搜索（未完成）
|
11 years ago |
|
sw
|
4224e11b52
|
课程讨论区标题换行
|
11 years ago |
|
sw
|
66057b5b4f
|
编辑帖子时的样式
|
11 years ago |
|
whimlex
|
b5781ac22b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
5d0d9de6e8
|
意见反馈各主页内保持一致
|
11 years ago |
|
huang
|
6a19ac4098
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
4da77d8a71
|
wiki页面显示
|
11 years ago |
|
sw
|
12e65ad61f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
c9bfe00a4f
|
修改成员列表的排列
版本库页面色系
|
11 years ago |
|
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
11 years ago |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
11 years ago |
|
sw
|
b1e31ded0e
|
修改公共贴吧样式
|
11 years ago |
|
sw
|
7cd54f07cb
|
我要反馈按钮移位
|
11 years ago |
|
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
11 years ago |
|
sw
|
5b5423b8c5
|
修改贴吧新建帖子、回复显示样式的问题
|
11 years ago |
|
sw
|
1f7f1eff1a
|
课程添加成员输入空格键会搜索出所有任务
|
11 years ago |
|
huang
|
ee1c53bacc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
2070d69d44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
348eae5c45
|
修改项目模式提示样式
版本库
版本
|
11 years ago |
|
whimlex
|
19fe973b5b
|
上传头像
|
11 years ago |
|
whimlex
|
d66af82478
|
新建竞赛页面日历插件显示错误
|
11 years ago |
|
huang
|
0484692b47
|
缺陷显示页面虚线多余
|
11 years ago |
|
sw
|
9a07989917
|
调整header的login的样式
|
11 years ago |
|
huang
|
425f8473b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀（未完成，需切换分支）
|
11 years ago |
|
sw
|
1985d1c84b
|
调整header下啦列表框位置
|
11 years ago |
|
sw
|
427f26b058
|
header的login显示
|
11 years ago |
|
whimlex
|
36f2643ad8
|
上传logo
|
11 years ago |
|
whimlex
|
7ec060cc46
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
4cb22f2437
|
课程、项目、个人头像上传
|
11 years ago |
|
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
11 years ago |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
11 years ago |
|
sw
|
1cced5d7e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
2f2d4257c2
|
调整提交作业按钮样式
|
11 years ago |
|
huang
|
9cfcbc5584
|
项目讨论区--未登录情况下提示界面
|
11 years ago |
|
huang
|
bce1006969
|
邀请界面添加权限控制
|
11 years ago |
|
huang
|
eeaa613c9e
|
项目类型实时刷新功能
|
11 years ago |
|
huang
|
154ee9f38b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
2f021aecee
|
项目成员列表添加角色。用户得分
|
11 years ago |
|
guange
|
d2dd77612b
|
将登录默认值改为自动登录
|
11 years ago |
|
sw
|
09c51d1a87
|
修改创建作业未启用匿评时，所有作业列表看不到
|
11 years ago |
|
sw
|
83796bfaa0
|
去掉puts
|
11 years ago |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
11 years ago |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
11 years ago |
|
sw
|
3d8ec17bb1
|
修改学生作业得分列表弹出框样式
|
11 years ago |
|
huang
|
49f33dd50c
|
类型bug修复
|
11 years ago |
|
huang
|
249c02efff
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
11 years ago |
|
whimlex
|
0f037e78fa
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/public.css
|
11 years ago |
|
whimlex
|
5123ca1047
|
版本库样式调整
|
11 years ago |
|
huang
|
ee4cfb9c89
|
修改流程碑点进去样式
|
11 years ago |
|
sw
|
5385f35aff
|
教师列表删除翻页
|
11 years ago |
|
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
11 years ago |
|
huang
|
729d11ebaf
|
修复项目配置中首页显示问题
|
11 years ago |
|
huang
|
8b77079f44
|
公开。私有标识强制不换行
|
11 years ago |
|
sw
|
57193b077e
|
作品列表取消分页显示
|
11 years ago |
|
huang
|
7c91a40e4f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
1fe35fc063
|
配置中添加角色权限判断
不同角色通过admin配置显示不同模块
|
11 years ago |
|
whimlex
|
51aeb40d31
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
6441d298a2
|
版本库修订SVG图样式修改
|
11 years ago |
|
whimlex
|
9fa3d25e3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
b99f8d8056
|
上传头像，上传课程项目logo提示
|
11 years ago |
|
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
11 years ago |
|
lizanle
|
da7528c780
|
重定向到项目配置里的新建版本页面
|
11 years ago |
|
whimlex
|
0d26f64afd
|
搜索课程——授课时间”与“课程简介”显示异常
|
11 years ago |
|
huang
|
2043b963c8
|
添加意见反馈
项目配置权限
|
11 years ago |
|
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
11 years ago |
|
huang
|
861469e39f
|
1、修改回复帖子和新建帖子标题冲突
2、对齐新建框
3、版本库新建按钮样式
|
11 years ago |
|
huang
|
86027e077f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
5bfef259de
|
去掉缺陷列表空白处的链接
|
11 years ago |
|
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
11 years ago |
|
huang
|
c510f14edb
|
流程碑添加新建版本
|
11 years ago |
|
huang
|
2521e802bf
|
缺陷统计添加冒号
|
11 years ago |
|
huang
|
b6f34045db
|
修改缺陷：缺陷上传附件后，第一条回复中会显示附件。
|
11 years ago |
|
huang
|
5c2fdf7aee
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
11 years ago |
|
lizanle
|
457b86a861
|
版本配置
|
11 years ago |
|
lizanle
|
2987253303
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
3b70ab964d
|
issue过滤
|
11 years ago |
|
huang
|
4cddb214fd
|
修改资源库站内搜索不能搜索的bug
|
11 years ago |
|
huang
|
3bd4f2d0f6
|
修改资源库样式
|
11 years ago |
|
huang
|
692500af2e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
93e3247685
|
项目名称不能为空提示
|
11 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>
|
11 years ago |
|
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
11 years ago |
|
huang
|
8dd0e985a0
|
完成
|
11 years ago |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
11 years ago |
|
whimlex
|
ab39d54b45
|
版本库文件列表样式
|
11 years ago |
|
sw
|
6df1f55ac4
|
添加课程成员后不自动刷新
|
11 years ago |
|
sw
|
d5e71e9803
|
增加课程成员收索功能后、添加课程成员，成员列表不自动刷新
|
11 years ago |
|
huang
|
7340ef793c
|
修改新建项目的显示样式
|
11 years ago |
|
whimlex
|
65e6b41d91
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
22a4bf9216
|
查看修订样式
|
11 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
|
11 years ago |
|
whimlex
|
92bf340786
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
af28461cf0
|
动态中创建项目样式调整
|
11 years ago |
|
lizanle
|
17838acddb
|
提示信息数组 flatten
|
11 years ago |
|
lizanle
|
0ca96a5500
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
ade32aae02
|
列宽修改
|
11 years ago |
|
sw
|
3a8bfbf880
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
3c17492901
|
列宽
|
11 years ago |
|
sw
|
7239f6a641
|
1、成员列表分页空间翻页不可用
2、当五输入时显示，无用户显示
|
11 years ago |
|
lizanle
|
17f9ed52ce
|
Wiki列宽度
|
11 years ago |
|
lizanle
|
15e54dd765
|
版本 输入名字不能为空
|
11 years ago |
|
lizanle
|
b6db00643e
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
532a8cb5c3
|
返回的时候展开输入框
|
11 years ago |
|
whimlex
|
1382f9a0cd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
dc955c7e2d
|
编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了
|
11 years ago |
|
sw
|
9814a859c3
|
项目添加TAG页面不刷新
|
11 years ago |
|
huang
|
14a0d885f0
|
settings
|
11 years ago |
|
huang
|
04af919c77
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fc8dacbd5f
|
引入资源列表界面调整
|
11 years ago |
|
lizanle
|
f8951c0044
|
国际化
|
11 years ago |
|
lizanle
|
5e8848f962
|
国际化
|
11 years ago |
|
lizanle
|
42b798e111
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
3620cd99b6
|
去掉错误的符号
|
11 years ago |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
11 years ago |
|
huang
|
0607cf326c
|
版本库里面页面验证
|
11 years ago |
|
whimlex
|
7e0120e029
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
917701f09d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
c2c9660a46
|
项目得分界面调整
|
11 years ago |
|
whimlex
|
51e0217eb8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
eb1f8acbd3
|
版本库样式修改
|
11 years ago |
|
lizanle
|
8290741746
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
d2b0eae119
|
格式修改
|
11 years ago |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
1ffa447767
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
640f6a1ca7
|
邮件发送框距离
去掉讨论区不必要的*
|
11 years ago |
|
lizanle
|
1902d557c0
|
有日期label
|
11 years ago |
|
lizanle
|
43442d6f62
|
字符截断
|
11 years ago |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
11 years ago |
|
huang
|
1961768031
|
新建问题前去掉不必要的*
去掉跟踪功能
|
11 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
11 years ago |
|
huang
|
f1e86ace25
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
54b81bdfb3
|
项目类型图标
|
11 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
|
11 years ago |
|
huang
|
258a023abd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fec0a7472d
|
新闻换行处理
|
11 years ago |
|
huang
|
fbcd9f9a96
|
wiki页面调整
|
11 years ago |
|
huang
|
0ea683e1b4
|
修改issue中图片附件的缩略图显示方式
|
11 years ago |
|
whimlex
|
8633ba3325
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
11 years ago |
|
huang
|
d1e7777040
|
关注列表样式
|
11 years ago |
|
huang
|
63a457674a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
11 years ago |
|
whimlex
|
fc106fef49
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fb06571918
|
项目讨论区引用强制换行
|
11 years ago |
|
whimlex
|
e9cf61e0f4
|
缺陷状态根据完成度调整
|
11 years ago |
|
huang
|
ce5b2d9996
|
项目讨论区回复按钮
|
11 years ago |
 z9hang
|
47e6d5c909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
11 years ago |
|
sw
|
daef2c455a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
57a5191fe5
|
课程资源列表样式调整
|
11 years ago |
|
whimlex
|
8b89110e41
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
65bcaef911
|
修改TAG云样式
|
11 years ago |
|
whimlex
|
ca1e902a8f
|
#2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐
|
11 years ago |
|
huang
|
c852e72e36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
11 years ago |
|
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 |
