 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、老师新建作业时增加文件的保存
|
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 |
