 sw
|
67c4561b28
|
我的课程、我的项目图标
|
10 years ago |
|
sw
|
d132c08a11
|
增加footer
|
10 years ago |
|
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
10 years ago |
|
sw
|
26c5592d29
|
用户课程或项目名称过长时的显示
|
10 years ago |
 lizanle
|
39b022f696
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
10 years ago |
|
lizanle
|
86d2f5342c
|
登陆界面
|
10 years ago |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
10 years ago |
 huang
|
f26ccac3b9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
|
sw
|
5fcb97b990
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
10 years ago |
|
sw
|
dabef542fe
|
更新css文件，并实现未登陆用户时静态页面显示
|
10 years ago |
|
sw
|
fe91442c96
|
课程列表已关闭课程标识出来
|
10 years ago |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
10 years ago |
|
huang
|
3919f15806
|
调整消息提示样式及连接
|
10 years ago |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
10 years ago |
|
lizanle
|
9a2e9a4ad2
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
5628a43578
|
资源库和新版个人中心整合
|
10 years ago |
|
huang
|
4fd90464d9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
|
huang
|
98b6c090c6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
374c596a50
|
添加新图标，新base
|
10 years ago |
|
sw
|
15c44297cc
|
用户base关联user_base.js
|
10 years ago |
|
huang
|
e129404b4c
|
解决图标点两次的问题
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
lizanle
|
2589179fca
|
管理员登陆报错
|
10 years ago |
|
lizanle
|
f6b01b300d
|
资源库 全部里能看到课程资源，但是分类里边却没有。
|
10 years ago |
|
sw
|
2a522f144e
|
编辑个人简介
|
10 years ago |
|
sw
|
d942cc3123
|
性别的判断
|
10 years ago |
|
sw
|
8ef6225084
|
个人主页，添加、取消关注及相关效果
|
10 years ago |
|
sw
|
73854cc35c
|
右侧静态页面如果没有内容时增加默认最小高度
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
lizanle
|
7deafac280
|
资源库 修改
|
10 years ago |
|
sw
|
f48e77901a
|
用户上传头像功能
|
10 years ago |
|
sw
|
e64c15a026
|
个人主页基本页面布局完成
|
10 years ago |
|
sw
|
a536af8fa3
|
用户show界面更新
|
10 years ago |
|
sw
|
b6a2be72e4
|
调整CSS，修改图片，实现部分功能动态效果
|
10 years ago |
|
sw
|
d8da74a0d4
|
更新css，增加个人主页公共部分的动态效果
|
10 years ago |
|
sw
|
752fe93d72
|
已登录用户header完成
|
10 years ago |
|
sw
|
b27944fad7
|
增加css文件以及个人主页静态页面、缺失图片
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
huang
|
4ffdd05a19
|
消息为空给出提示
连接鼠标经过颜色
|
10 years ago |
|
huang
|
64e1d88285
|
去掉项目消息提示
未登录情况下访问跳转至403
|
10 years ago |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
10 years ago |
|
huang
|
2c865069d3
|
所有消息显示功能
|
10 years ago |
|
huang
|
510613f9a4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
c903325352
|
缺陷状态更新消息提醒
留言消息提醒
|
10 years ago |
|
huang
|
69050b4271
|
指派给自己的缺陷不发送消息提示
|
10 years ago |
|
sw
|
b036d5b63d
|
网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序
|
10 years ago |
|
huang
|
fbf21fc51b
|
清除旧版本消息提示
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
huang
|
a51b532a0b
|
个人主页CSS
|
10 years ago |
|
huang
|
69adc98fe4
|
个人主页左侧显示不正常
|
10 years ago |
|
huang
|
ba84e19048
|
修正底部问题
|
10 years ago |
|
huang
|
15b3d527dc
|
footer
|
10 years ago |
|
sw
|
cb536057c7
|
Merge branch 'develop' into szzh
|
10 years ago |
 cxt
|
e558251d37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
824208077e
|
老板的hearder界面，点击留言跳转到留言界面
|
10 years ago |
|
sw
|
fe2d621dc3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
|
10 years ago |
|
cxt
|
14673e79d8
|
个人主页标签相关问题的修复
|
10 years ago |
|
sw
|
bed46c050f
|
创建课程、加入课程、创建作业数的显示
|
10 years ago |
|
cxt
|
76ea93c89c
|
修改标签与上面块之间的间距
|
10 years ago |
|
huang
|
ef8a7a7419
|
添加资源后，项目左侧统计数字自动刷新
|
10 years ago |
|
sw
|
e17b834706
|
编辑资料显示在头像的右下角
|
10 years ago |
|
cxt
|
8eb2b72802
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
55a7c168b5
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/users/show.html.erb
|
10 years ago |
|
huang
|
b42d8c6d2c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
8340e9fe1b
|
添加个人主页标签
|
10 years ago |
|
sw
|
f0552ad367
|
他人留言界面进入却是我的留言列表
|
10 years ago |
|
huang
|
93ef63d60d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/layouts/base_users_new.html.erb
|
10 years ago |
|
sw
|
32122796f9
|
1、我的课程、我的项目留言js问题
2、编辑资料无法提交
3、访问他人项目不显示加入项目按钮
|
10 years ago |
|
huang
|
a9a6ef6ee9
|
课程添加箭头
|
10 years ago |
|
cxt
|
47c171dbf0
|
删除老师个人主页的“参加匿评”，添加学生个人主页的“参加匿评”
|
10 years ago |
|
huang
|
88ec9ca0ca
|
修改个人主页---关注
|
10 years ago |
|
huang
|
b61f23e697
|
个人主页left间距调整（湘政）
|
10 years ago |
|
sw
|
023f51260a
|
个人主页相关界面js刷新页面的时候给出等待的提示
|
10 years ago |
|
sw
|
9c704b7dc1
|
个人主页留言静态页面
更新css
路由及相关代码整理
|
10 years ago |
|
sw
|
8ef0d0f8a6
|
1、个人主页，布局右侧显示不够左侧长度时自动补充
2、个人主页js、css提取出来
3、css错误整理
|
10 years ago |
|
sw
|
5dc3eba27a
|
我的课程、我的项目、他的课程、他的项目只显示出有权限的课程和项目。以及数量统计不正确
|
10 years ago |
|
sw
|
03c1099b78
|
个人主页，取消个人主页的箭头
|
10 years ago |
|
huang
|
59bd915cf6
|
Merge branch 'develop' into szzh
Conflicts:
app/views/my/account.html.erb
|
10 years ago |
|
sw
|
9a9658baf3
|
l留言跳转到用户主页
|
10 years ago |
 zhangshenjerry
|
f0e8d545dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
zhangshenjerry
|
6b3882aff8
|
个人主页：如图值为0时，这些字段不要显示
|
10 years ago |
|
huang
|
938d31a761
|
项目得分为0 的时候不显示项目得分
|
10 years ago |
|
cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
10 years ago |
|
zhangshenjerry
|
d639942b82
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
app/views/layouts/base_users_new.html.erb
|
10 years ago |
|
sw
|
6775008b50
|
加入课程数和创建课程数不正确
去除掉无用代码
|
10 years ago |
|
cxt
|
a285c6a536
|
3247缺陷的修复
|
10 years ago |
 yutao
|
987a8da994
|
个人主页的“访客”先隐藏，仅对超级管理员开放
|
10 years ago |
|
yutao
|
5e643e7316
|
个人主页的学生真实姓名：暂时先隐藏，教师可以公开
|
10 years ago |
|
yutao
|
8c47e6ca1f
|
个人主页--“我的课程”、“我的项目”不是下拉框却做成下拉框的样式
|
10 years ago |
|
cxt
|
3b6d6596c0
|
3218 3219缺陷的修复
|
10 years ago |
|
yutao
|
6df40be30e
|
个人主页：如图“取消”改为“取消关注”
|
10 years ago |
|
yutao
|
d42c643b8c
|
个人主页
|
10 years ago |
|
yutao
|
0ef09fee8a
|
个人主页
|
10 years ago |
|
yutao
|
32ef798b07
|
个人主页
|
10 years ago |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
yutao
|
dd492f37d6
|
个人主页
|
10 years ago |
|
yutao
|
8d858cccfc
|
个人主页
|
10 years ago |
|
sw
|
b6e123e476
|
右上角导航栏问题
|
10 years ago |
|
yutao
|
00c50d8114
|
个人主页->访客
|
10 years ago |
|
yutao
|
b7c4449f4b
|
个人主页
|
10 years ago |
|
huang
|
fd70538584
|
修复老板bese中我的项目、课程倒序
|
10 years ago |
|
yutao
|
02d09c84b4
|
个人主页->留言
|
10 years ago |
|
huang
|
7b6e40f4c3
|
修改导航中“我的项目”和“我的课程”倒排
|
10 years ago |
|
yutao
|
5c011fd342
|
个人主页
|
10 years ago |
|
zhangshenjerry
|
04f125c7a6
|
张申修改的bug
|
10 years ago |
|
sw
|
a6e80ed938
|
部分用户右上角下拉框不显示我的课程
|
10 years ago |
guange
|
23a1f84ae7
|
kindeditor js顺序错误
|
10 years ago |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
10 years ago |
|
sw
|
0053930769
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
fd5f2d9322
|
...
|
10 years ago |
|
sw
|
cc2bd5f7b1
|
作品列表收索时，收索条件内容在课程收索栏
|
10 years ago |
|
sw
|
a600d93630
|
111
|
10 years ago |
|
sw
|
ff159075aa
|
新header课程在项目上面
|
10 years ago |
|
sw
|
427553d4e5
|
老师编辑作业、学生编辑作品时删除附件界面没刷新
|
10 years ago |
|
sw
|
f466084a17
|
地区没有就不显示了
|
10 years ago |
|
sw
|
1c4ca0c913
|
导航栏进入课程、项目、个人主页新打开一页
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
 alan
|
70330f0f4b
|
Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
app/views/layouts/_user_project_list.html.erb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
3967b632b5
|
去除导航的缓存
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
0eace6e598
|
cached导致的个人项目列表问题
|
10 years ago |
|
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
alan
|
98f38b0a5b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
10 years ago |
|
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、老师新建作业时增加文件的保存
|
11 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
huang
|
e2f0aeb693
|
公共贴吧--帖子里面搜索错误
|
11 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
11 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
11 years ago |
|
yutao
|
895058f38e
|
修复bug#2154:成功上传课件，课程资源数统计未自动刷新
|
11 years ago |
|
huang
|
d42fd98dff
|
优化项目类型
|
11 years ago |
|
guange
|
1355dc805f
|
用户界面返回500错误 #2610
|
11 years ago |
|
huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
11 years ago |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
11 years ago |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
06a3ca9fe9
|
IE浏览器中，课程收索为空时显示不正确
|
11 years ago |
|
sw
|
6566a044d2
|
无工作地点就不显示了
|
11 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
11 years ago |
|
guange
|
af2c20f666
|
修复意见反馈不见了的问题
|
11 years ago |
|
sw
|
c2d11140a1
|
意见反馈问题
|
11 years ago |
|
sw
|
dd7140f4fb
|
意见反馈。内容宽没了
|
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 |
|
huang
|
406d608edc
|
版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
|
11 years ago |
|
huang
|
6f3621f6c0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
6c500109c9
|
修改项目上传资源
|
11 years ago |
|
guange
|
4e6ca53b53
|
jquery-js找不到报错
|
11 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
11 years ago |
|
alan
|
79c0c6f551
|
修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
86f686efb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
89ea9ddc7b
|
项目讨论区代码还原
样式调整
|
11 years ago |
|
sw
|
05c26aceb6
|
发布新贴按钮跳转
|
11 years ago |
|
huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
11 years ago |
|
huang
|
5167cf374c
|
项目讨论区左侧新建按钮跳转页面修改
通过传参跳入（JS实现）
|
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 |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
2e26e27298
|
版本库收起后之保存在cookie中，刷新页面后仍保持收起状态
|
11 years ago |
whimlex
|
88bbd70102
|
项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示
|
11 years ago |
|
huang
|
389266e3e5
|
修改不同角色拥有的权限
管理员--配置、项目类型
开发人员-- 配置、退出项目
报告者-- 退出项目（admin可以配）
|
11 years ago |
|
huang
|
dfcc076a7f
|
角色多选的时候权限控制
|
11 years ago |
|
huang
|
84a7bb5907
|
修改超级管理员不能退出项目
|
11 years ago |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
11 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
11 years ago |
|
huang
|
e7d85aad27
|
修改项目配置、关注、加入、类型等不同角色显示
|
11 years ago |
|
huang
|
be9beff0b4
|
解决Roles未定义
|
11 years ago |
|
huang
|
db8b79f3b4
|
退出项目/项目三种模式切换权限控制
|
11 years ago |
|
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
11 years ago |
|
whimlex
|
85e1262769
|
意见反馈
|
11 years ago |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
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
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
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 |
|
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
11 years ago |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
11 years ago |
|
huang
|
348eae5c45
|
修改项目模式提示样式
版本库
版本
|
11 years ago |
|
sw
|
9a07989917
|
调整header的login的样式
|
11 years ago |
|
sw
|
1985d1c84b
|
调整header下啦列表框位置
|
11 years ago |
|
sw
|
427f26b058
|
header的login显示
|
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 |
|
huang
|
bce1006969
|
邀请界面添加权限控制
|
11 years ago |
|
huang
|
eeaa613c9e
|
项目类型实时刷新功能
|
11 years ago |
|
huang
|
49f33dd50c
|
类型bug修复
|
11 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
11 years ago |
|
huang
|
8b77079f44
|
公开。私有标识强制不换行
|
11 years ago |
|
huang
|
2043b963c8
|
添加意见反馈
项目配置权限
|
11 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
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
|
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 |
|
huang
|
54b81bdfb3
|
项目类型图标
|
11 years ago |
|
sw
|
6983764c44
|
修改课程名称过长时的样式
|
11 years ago |
|
huang
|
b80251a247
|
链接空白处改成不能点击
修复项目标题过长，布局变形
|
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
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
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
|
bc6ff57de2
|
修改开发组、朋友圈、研发组切换js
|
11 years ago |
|
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
11 years ago |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
11 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
11 years ago |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
11 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>
|
11 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
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
|
8c122a35f7
|
项目类型切换到其他类型后，再切回开发组，更多按钮不可用
|
11 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
11 years ago |
|
sw
|
7b60998952
|
修改点击课程名称，url连接错误
|
11 years ago |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
11 years ago |
|
sw
|
ece4a67f97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
11 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
11 years ago |
|
sw
|
b8760c6403
|
个人描述最长为200
|
11 years ago |
|
sw
|
4fbbd7ceb7
|
公共贴吧，描述显示问题
|
11 years ago |
|
sw
|
4b83296a97
|
课程作业列表开启、关闭匿评
|
11 years ago |
|
sw
|
a737342a66
|
完成个人信息下拉、首页下标的隐藏非项目信息的定制
|
11 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
11 years ago |
|
sw
|
d192a564b4
|
课程作业列表、课程动态页面描述出现html标签
|
11 years ago |
|
huang
|
bf36da8dcb
|
修改醒目新闻新建页面
退出项目样式
|
11 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
11 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
11 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
11 years ago |
|
sw
|
a84af9d138
|
课程私有资源不显示在没有权限查看的用户上
|
11 years ago |
|
sw
|
e7da022564
|
课程界面默认图片路径修改
|
11 years ago |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
11 years ago |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
11 years ago |
|
whimlex
|
54908423bc
|
课程--作业附件显示问题;问题跟踪附件显示问题
|
11 years ago |
|
whimlex
|
3d2fc8e5ef
|
IE8
|
11 years ago |
|
whimlex
|
762c83b26c
|
commit
|
11 years ago |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
11 years ago |
|
sw
|
83dfcdcc02
|
学生可以发帖
|
11 years ago |
 z9hang
|
bdaf574266
|
修改发布新帖，发布课程通知链接
|
11 years ago |
|
whimlex
|
7fd77f0354
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
89a001ad9d
|
IE8浏览器及以下低版本浏览器提示
|
11 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
11 years ago |
|
sw
|
8f90fed8be
|
新建课程界面完成
|
11 years ago |
|
lizanle
|
05cf90062f
|
论坛的描述如果有图片的话，图片会显示。使排版出现问题
|
11 years ago |
|
lizanle
|
cd976f9515
|
如果论坛的description上传了图片，那么这个图片会显示，使得论坛的界面被图片占据。
|
11 years ago |
|
lizanle
|
d1d40e1867
|
添加一个输入框的id，在论坛模块里，自动生成的id会和编辑器kindeditor生成的id冲突：都叫memo_content
|
11 years ago |
|
sw
|
53eef164c9
|
新建课程时layout修改
|
11 years ago |
|
whimlex
|
82fb9325c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_point_browser.html.erb
|
11 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
11 years ago |
|
huang
|
eac6f814a8
|
解决浏览器提示关闭按钮与邮件邀请界面冲突
|
11 years ago |
|
sw
|
27e7bc21b5
|
当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示
|
11 years ago |
|
huang
|
792a87dcaf
|
修改提示框引起的首页行距过高的问题
|
11 years ago |
|
huang
|
75567585d2
|
浏览器版本过低提示样式调整！
|
11 years ago |
|
sw
|
61d7d65b55
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/courses/_courses_jours.html.erb
|
11 years ago |
|
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式，制作弹出框demo
|
11 years ago |
|
huang
|
525a6394ca
|
1、公共贴吧邮件提醒
2、浏览器版本过低提醒（样式需要再调试）
|
11 years ago |
|
z9hang
|
13245282d4
|
修正讨论区帖子数量显示不正确问题
|
11 years ago |
|
huang
|
f1b8d74a07
|
修改加入项目字体大小、宽度
|
11 years ago |
|
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
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 |
|
whimlex
|
6995ead66c
|
项目ID
|
11 years ago |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
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 |
|
sw
|
7541a83b16
|
改课程首页用新建问卷
|
11 years ago |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
11 years ago |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
11 years ago |
|
lizanle
|
0424fc55db
|
项目资源数显示错误
|
11 years ago |
|
lizanle
|
966f93012d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
c209bccba0
|
项目资源数显示错误
|
11 years ago |
|
alan
|
cf3d836cf3
|
删除邮件发送时出现《"亲爱的Trustie用户，您好！"》
Signed-off-by: alan <547533434@qq.com>
|
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
|
e7cce1fd28
|
修改项目html错误
|
11 years ago |
|
sw
|
642cf80bf8
|
调整课程主页分块显示
|
11 years ago |
|
sw
|
278854156a
|
调整课程信息样式
|
11 years ago |
|
sw
|
16872597b6
|
实现课程搜索
|
11 years ago |
|
sw
|
ec1ff6dfc3
|
1、修改课程界面未登录时，先显示注册，再显示登录
2、增加课程相关的css引用
3、增加top、left、content的静态页面
|
11 years ago |
|
sw
|
4d60a6dabc
|
1、修改版权
2、增加footer
|
11 years ago |
|
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
11 years ago |
|
sw
|
4c482e1fac
|
完成新的用户反馈界面
|
11 years ago |
|
sw
|
d2c7861706
|
1、添加缺少图片
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
|
11 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
|
sw
|
747a109638
|
1、添加CSS文件
2、调整首页HTML
3、去掉base_header中没用的erb语句
|
11 years ago |
|
sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
11 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
11 years ago |
|
huang
|
cc5a22f2c6
|
修改新建按钮样式
|
11 years ago |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
11 years ago |
|
huang
|
47e1427ead
|
左侧工具栏添加功能：左侧统计数目为零的手不显示
|
11 years ago |
|
huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
11 years ago |
|
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
11 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
11 years ago |
|
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
11 years ago |
|
sw
|
69eecf49d1
|
还原冲突
|
11 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
11 years ago |
|
huang
|
c773e0fd39
|
JS冲突，去掉多余标点
|
11 years ago |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
11 years ago |
|
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
11 years ago |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
11 years ago |
|
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
11 years ago |
|
sw
|
52dfb0b0ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
11 years ago |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
11 years ago |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
11 years ago |
|
huang
|
32a2e7ae1f
|
修改默认情况下 用户反馈框处于关闭状态
|
11 years ago |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
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 |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
11 years ago |
|
huang
|
d947ebff0c
|
添加国际化
|
11 years ago |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
11 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
11 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
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
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
a2d986f70c
|
修改页面代码
|
11 years ago |
|
sw
|
032e28067d
|
#1959 项目评分是0的，就不显示了！
|
11 years ago |
|
sw
|
5bba54432d
|
#1930 项目缺陷显示个数修改
|
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 |
|
lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
11 years ago |
|
sw
|
78d8a0a1c6
|
修改意见反馈折叠后背景为透明
|
11 years ago |
|
alan
|
b5e49e2e1c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
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
|
2978d9020f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
11 years ago |
|
sw
|
bf75f32903
|
修改个人留言界面，左侧个人信息样式显示不正确
|
11 years ago |
|
whimlex
|
b7c7cc4c64
|
意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致
|
11 years ago |
|
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
11 years ago |
|
whimlex
|
0ff22b1ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
e5e24c1163
|
resolve conflict
|
11 years ago |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
11 years ago |
|
alan
|
0944cc4ca8
|
< 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
472ccc45bf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
a3cf79db96
|
修改编码问题
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
sw
|
bb64dc9452
|
修改问卷调查按钮的样式
|
11 years ago |
|
sw
|
89ee38481b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
huang
|
c65bab8c38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
c6deffe245
|
修改首页样式显示异常
|
11 years ago |
|
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
11 years ago |
|
whimlex
|
3fcb2f14a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/mailer/issue_edit.html.erb
|
11 years ago |
|
whimlex
|
1e36ca504a
|
多种邮箱邮件样式调整，回复内容样式更改
|
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 |
|
huang
|
388ddac96b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
84bfd30fc5
|
修改问题反馈弹框！
|
11 years ago |
|
sw
|
e72ed1054e
|
修改问卷调查按钮的样式
|
11 years ago |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
11 years ago |
|
alan
|
3315116832
|
修改《课程--留言：给课程留言却返回404》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
49ff5659d9
|
系统日志查看相关代码，资源
|
11 years ago |
|
alan
|
0b0b6c9b6e
|
修改《托管平台中点击某项目进入该项目主页，右上角的搜索处不输入内容点击搜索按钮，给出的提示信息显示不合理》
增加《课程平台进入某一课程搜索风格保持与项目及竞赛的一致》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
092265d53c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
sw
|
2f9e658697
|
增加问卷调查按钮的样式
|
11 years ago |
|
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
b3f37f5154
|
111
|
11 years ago |
|
sw
|
bba213dec9
|
1.#1802 修复页面下方有很大一片空白
2.修复系统文本框的padding、margin都为0
|
11 years ago |
|
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9c45e372b4
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
alan
|
479a1249ae
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
90925edce2
|
修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d2dfff33d0
|
课程页面增加问卷调查的链接
|
11 years ago |
|
huang
|
2cd805ef4c
|
去掉课程单独的弹框
|
11 years ago |
|
alan
|
74af44a826
|
修改《修改个人资料页面》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
