suntao
|
56644ca173
|
点击展开更多样式
|
10 years ago |
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
suntao
|
ded497a5f2
|
个人主页左侧导航配置按钮
|
10 years ago |
 lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
10 years ago |
 sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
10 years ago |
 huang
|
8b9ee2260a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
10 years ago |
|
suntao
|
00de825050
|
作业界面颜色更改，删掉冗余头部导航css
|
10 years ago |
|
suntao
|
acb46d520c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
10 years ago |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
10 years ago |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
10 years ago |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
sw
|
62360175d1
|
课程通知回复时，所有回复框都会提交
|
10 years ago |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
10 years ago |
 ouyangxuhua
|
fd0e4a7afd
|
项目wiki：输入wiki为非汉字类型且长度够长，显示超出边框问题解决
|
10 years ago |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
10 years ago |
|
suntao
|
e917a68bd3
|
消息页面li间距调整，回复块调整
|
10 years ago |
|
ouyangxuhua
|
316f660ca4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
suntao
|
1d1d2f738d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
acf5db7067
|
placeholder显示等
|
10 years ago |
|
ouyangxuhua
|
8403d5365c
|
修改项目新闻提示
|
10 years ago |
|
huang
|
311634abf1
|
修改消息列表样式
|
10 years ago |
 cxt
|
1113a7938c
|
修复点击空白处返回新建课程/项目的页面
|
10 years ago |
|
suntao
|
2804d7d730
|
resource图片替换
|
10 years ago |
|
cxt
|
4ab91984f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
fa57a6c889
|
主页动态的样式修改
|
10 years ago |
|
suntao
|
ac353841b0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
d3869b03cd
|
资源库版面样式调整
|
10 years ago |
|
lizanle
|
9a1fa316bb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
19dfd77cad
|
将资源发送至 会换行，调宽
|
10 years ago |
|
suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
10 years ago |
|
cxt
|
23c1ac5a4a
|
项目问题的动态内容显示超出边框
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
guange
|
85ee2b86cd
|
.
|
10 years ago |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
10 years ago |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
cc50d0d85e
|
布置作业界面调整删除按钮和文件的距离
|
10 years ago |
|
suntao
|
3776689661
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
10 years ago |
|
sw
|
17e9b2d293
|
编辑个人简介文本框
|
10 years ago |
|
suntao
|
0d8624a642
|
颜色更新
|
10 years ago |
|
suntao
|
886a00e18d
|
footer间距调整
|
10 years ago |
|
suntao
|
a22727efb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
5e25b64004
|
提交按钮对齐
|
10 years ago |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
e455f93ee1
|
上传图片；浏览图片按钮
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
suntao
|
977f81e031
|
关注和取消关注，导航圆角
|
10 years ago |
|
suntao
|
5f3532ac14
|
头像部分修改
|
10 years ago |
|
sw
|
189405f0a9
|
课程搜索有部分文本重叠
|
10 years ago |
|
sw
|
4d1fc0dc45
|
调整底部导航栏宽度
|
10 years ago |
|
suntao
|
9d638b705a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
60b429b13d
|
发送成功不给提示
课程资源过少的时候不给滚动条
|
10 years ago |
|
suntao
|
2342d1c23a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
suntao
|
ada04e5e63
|
个人主页头像模块改动
|
10 years ago |
|
lizanle
|
afd7beebac
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
f2a909f0e5
|
资源移动弹出框搜索处鼠标悬浮要手型光标
|
10 years ago |
|
huang
|
6287f9b39e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
bc186776d8
|
资源移动弹出框减少留白
|
10 years ago |
|
lizanle
|
553e35281a
|
资源弹出框的边框色
|
10 years ago |
|
lizanle
|
53b150486d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
789b62940b
|
资源名称过长会覆盖的问题
搜索按钮 手在上边的时候呈手型
筛选资源后 自选资源清零的问题
|
10 years ago |
|
huang
|
938d0e2bbd
|
解决消息换行显示问题
|
10 years ago |
|
suntao
|
5c960c798e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
46ac491b5b
|
上传图片
|
10 years ago |
|
sw
|
3f61a908d1
|
部分界面样式调整
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
suntao
|
d536c81a8a
|
提交作业样式修改
|
10 years ago |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
e193cb0f2d
|
消息列表界面新样式
|
10 years ago |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
48419573ac
|
底部导航栏有2条线
|
10 years ago |
|
suntao
|
4392ecdcd7
|
消息格式更改
|
10 years ago |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
10 years ago |
|
suntao
|
e12bef1126
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
a19692a0c6
|
个人主页左侧修改
|
10 years ago |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
d9df8aae28
|
1。缺陷状态更新后，不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
|
10 years ago |
|
suntao
|
fb91958a3f
|
导航栏修改
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
suntao
|
c0477fda99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
b6d58b1b58
|
样式调整
|
10 years ago |
|
sw
|
711b21070f
|
上传附件样式调整
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
lizanle
|
d3f441d4da
|
可拖动的资源弹出框
|
10 years ago |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
149ac07cf9
|
去掉重复的css，
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
sw
|
1f87c4adf5
|
重复CSS删除
|
10 years ago |
|
lizanle
|
41a8f9d6a2
|
底部去掉marginBottom:10px
登录界面加底部
|
10 years ago |
|
lizanle
|
82b86ea14f
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
733876743e
|
服务协议 忘记密码
|
10 years ago |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
049e27f15f
|
发布作业功能
|
10 years ago |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
10 years ago |
|
lizanle
|
ccfd69602c
|
服务协议
|
10 years ago |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
10 years ago |
|
huang
|
6a986b98d9
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
lizanle
|
5ec24913bb
|
留言背景色 留言头
|
10 years ago |
|
sw
|
e2869faa08
|
日历选择器的样式调整
|
10 years ago |
|
huang
|
334e6dbd55
|
消息未读样式
|
10 years ago |
|
sw
|
686af68026
|
关注、粉丝、编辑资料页面样式问题
|
10 years ago |
|
sw
|
f0a4d364b0
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
ccfa93be66
|
老师布置作业界面
|
10 years ago |
|
lizanle
|
d735eee4a3
|
关注和取消关注
|
10 years ago |
|
sw
|
757da1ec0a
|
调整编辑资料样式
|
10 years ago |
|
cxt
|
cccc0577c7
|
个人动态
|
10 years ago |
|
sw
|
767fc67686
|
已过期课程显示为darkgrey
|
10 years ago |
|
sw
|
59fe95bf33
|
去掉部分重复的CSS
|
10 years ago |
|
sw
|
994a4188ce
|
未登录情况下，导航栏样式问题
|
10 years ago |
|
sw
|
4ca3d8be03
|
搜索栏样式
|
10 years ago |
|
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
10 years ago |
|
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
87ee2e744f
|
公共贴吧、课程、项目相关界面导航栏和底部导航栏修改
|
10 years ago |
|
lizanle
|
8917a67c7c
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
d25971f546
|
登陆界面
|
10 years ago |
|
sw
|
bcd12e7e48
|
课程、项目相关页面 顶部导航栏和底部导航栏修改
|
10 years ago |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
10 years ago |
|
sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
10 years ago |
|
sw
|
d132c08a11
|
增加footer
|
10 years ago |
|
sw
|
38f8aa5ba4
|
更新css文件
|
10 years ago |
|
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
10 years ago |
|
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
10 years ago |
|
lizanle
|
5bf7aeb430
|
资源库css小改动
|
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 |
|
lizanle
|
614743d8d4
|
登陆界面
|
10 years ago |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
10 years ago |
|
sw
|
e746a7764f
|
处理被还原的css
|
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
|
7f2f2c5d40
|
个人主页，项目更多功能
|
10 years ago |
|
lizanle
|
12b89e2c81
|
可拖动的框暂时做不了。
|
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 |
|
sw
|
0287a0f3b4
|
个人积分弹出框
|
10 years ago |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
10 years ago |
|
sw
|
86b151979b
|
js相关
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
10 years ago |
|
huang
|
17aae7c79d
|
解决CSS冲突
|
10 years ago |
|
sw
|
2a522f144e
|
编辑个人简介
|
10 years ago |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
e1fb2a6bab
|
个人主页动态
|
10 years ago |
|
sw
|
d942cc3123
|
性别的判断
|
10 years ago |
|
sw
|
8ef6225084
|
个人主页，添加、取消关注及相关效果
|
10 years ago |
|
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
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 |
|
huang
|
2473849a6b
|
作品只打分不留言的情况！
|
10 years ago |
|
huang
|
947fcc160c
|
修改列表显示样式！
|
10 years ago |
|
ouyangxuhua
|
2f21b4663d
|
消息颜色更改
|
10 years ago |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
10 years ago |
|
sw
|
2f43296854
|
更新课程样式
|
10 years ago |
|
sw
|
f48e77901a
|
用户上传头像功能
|
10 years ago |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
10 years ago |
|
sw
|
e64c15a026
|
个人主页基本页面布局完成
|
10 years ago |
|
sw
|
b6a2be72e4
|
调整CSS，修改图片，实现部分功能动态效果
|
10 years ago |
|
sw
|
d8da74a0d4
|
更新css，增加个人主页公共部分的动态效果
|
10 years ago |
|
ouyangxuhua
|
ff3edf4d5e
|
消息显示
|
10 years ago |
|
sw
|
752fe93d72
|
已登录用户header完成
|
10 years ago |
|
sw
|
b27944fad7
|
增加css文件以及个人主页静态页面、缺失图片
|
10 years ago |
|
huang
|
4bc0e0eb69
|
项目模块消息添加
讨论区结构优化
|
10 years ago |
|
huang
|
9c8679eda8
|
铃铛样式
|
10 years ago |
|
ouyangxuhua
|
8f23a81261
|
消息显示样式更新
|
10 years ago |
|
huang
|
a677119ba0
|
修改界面样式
|
10 years ago |
|
ouyangxuhua
|
e72eeb37c8
|
通知显示
|
10 years ago |
|
ouyangxuhua
|
276653d9a2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
e6cf2f400c
|
添加样式
|
10 years ago |
|
huang
|
239cba54d9
|
区分未读消息和已读消息
|
10 years ago |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
lizanle
|
421f86cdaf
|
资源库
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
huang
|
fc244982bc
|
处理冲突
修改浏览器兼容问题
|
10 years ago |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
10 years ago |
|
huang
|
4ffdd05a19
|
消息为空给出提示
连接鼠标经过颜色
|
10 years ago |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
10 years ago |
|
huang
|
ed8c4ac906
|
不同类型消息发送
|
10 years ago |
|
huang
|
4013ff486a
|
消息界面调整
|
10 years ago |
|
sw
|
9b424a5b17
|
课程问卷调查----点击问卷列表中如图空白处也返回相关问卷详情页面
|
10 years ago |
|
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面（未完成）
|
10 years ago |
|
sw
|
16aea5ef42
|
迟交扣分0-50分
|
10 years ago |
|
huang
|
b958340ab6
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
sw
|
09b1c03ef2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
10 years ago |
|
huang
|
a51b532a0b
|
个人主页CSS
|
10 years ago |
|
sw
|
3d2a91c6be
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
