guange
|
45dd48069e
|
submit不能提交的问题
|
10 years ago |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
10 years ago |
 sw
|
e42b6d65db
|
导入作业之后显示所有的作业信息
|
10 years ago |
|
sw
|
b0060fc03b
|
请选择发送的课程选择
|
10 years ago |
 ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
10 years ago |
suntao
|
e3b0eae427
|
作业界面展开更多间距
|
10 years ago |
 huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
10 years ago |
|
suntao
|
a7ba6b5da2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
7276b5685e
|
表情框按钮间距调整
|
10 years ago |
|
sw
|
dd3fe5915e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
9e7323539f923b5387b9ec9239b5aeb, reversing
changes made to da9c374ed9.
Conflicts:
app/views/users/_user_homework_form.html.erb
|
10 years ago |
 cxt
|
80b97c5692
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21cb59a7ae
|
点击发布作业的取消按钮时收起输入框
|
10 years ago |
 lizanle
|
a8652cbe43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
262f013b51
|
发送资源到项目课程 名称要显示完全
|
10 years ago |
|
cxt
|
7aef734113
|
点击发布作业的取消按钮时还原截止日期和课程列表下拉框的默认值
|
10 years ago |
|
sw
|
d0743e4dbf
|
缺陷显示界面描述增加html_safe
|
10 years ago |
|
cxt
|
de1708b8df
|
选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期
|
10 years ago |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21565b74fe
|
冲突
|
10 years ago |
|
guange
|
fcd7506181
|
修正一个样式
|
10 years ago |
|
sw
|
e4559dce78
|
作业列表样式调整，作业列表取消自动加载，增加加载更多按钮
|
10 years ago |
|
suntao
|
59bbfeb0b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
56644ca173
|
点击展开更多样式
|
10 years ago |
|
cxt
|
735c374f73
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_activities.html.erb
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
sw
|
c01b71739a
|
增加加载更多按钮
|
10 years ago |
|
cxt
|
756d703b5a
|
选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期
|
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 |
|
sw
|
0994ae9f07
|
项目讨论区回复功能
|
10 years ago |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
10 years ago |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
10 years ago |
|
lizanle
|
a5e39a1049
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
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 |
|
cxt
|
a008d9d834
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
8a286bb8a8
|
去掉截止日期的标签
|
10 years ago |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
10 years ago |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
10 years ago |
|
lizanle
|
a78128f5ac
|
搜不到资源的时候 改为没有数据可以展示
|
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 |
|
cxt
|
b89a80d04e
|
截止日期
|
10 years ago |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
10 years ago |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
10 years ago |
|
ouyangxuhua
|
86ced0e290
|
讨论区回帖消息应该在RE:后面显示回帖内容
|
10 years ago |
|
ouyangxuhua
|
284d33b096
|
讨论区回帖消息显示回帖内容
|
10 years ago |
|
sw
|
147afc09a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
b3919256fa
|
111
|
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 |
|
cxt
|
90b8d25424
|
鼠标点入“请输入作业标题”后，才显示kindeditor及其下面的内容，及导入作业右侧的时间框，应该显示“提交截止日期”的tip
|
10 years ago |
|
huang
|
90d93202cd
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
b5c0d03590
|
添加迁移
代码优化
|
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 |
|
cxt
|
7d6f952737
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
118b731dc4
|
点击动态链接进入相关列表
|
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 |
|
cxt
|
8345a9d94e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
fedc125731
|
附件名称在可用的范围内尽可能显示全
|
10 years ago |
|
lizanle
|
5b40628a5b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e9b501058b
|
上传以后资源数改变
|
10 years ago |
|
huang
|
f6baf03470
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
3807c4ea2a
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
e652e92217
|
新增消息迁移
|
10 years ago |
|
sw
|
ab173fb704
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
c416a312cf
|
取消发布作业时间
|
10 years ago |
|
cxt
|
96021bee73
|
项目讨论区的回复不显示用户名称
|
10 years ago |
|
cxt
|
6c09e41a09
|
个人主页课程讨论区动态报错
|
10 years ago |
|
sw
|
bfd13bf98a
|
课程回复按钮样式
|
10 years ago |
|
sw
|
f81bab6319
|
课程回复
|
10 years ago |
|
suntao
|
ecd355df0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_poll.html.erb
|
10 years ago |
|
suntao
|
fc47b793ee
|
动态块间距调整
|
10 years ago |
|
cxt
|
a7f161804e
|
描述和回复超出边框
|
10 years ago |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
10 years ago |
|
huang
|
2a17cfc741
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
353e2f5d18
|
添加课程消息迁移
|
10 years ago |
|
cxt
|
250d7a48dc
|
主页动态页面的刷新
|
10 years ago |
|
cxt
|
b30a07d651
|
个人主页动态
|
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 |
|
lizanle
|
acbf58837a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
ad8bd379a1
|
用户资源过滤
|
10 years ago |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
4e1766d578
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
5f4b879fb7
|
修改消息过滤条件
|
10 years ago |
|
lizanle
|
92298160a7
|
搜索后的资源总数在搜索框右边展示
|
10 years ago |
|
ouyangxuhua
|
1957100062
|
用户关注ajax刷新
|
10 years ago |
|
ouyangxuhua
|
f99097f3d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
a111b9a3fd
|
用户关注ajax刷新
|
10 years ago |
|
sw
|
00ab2bcbd4
|
作业名称过长超出边框
|
10 years ago |
|
lizanle
|
878f48079d
|
全选框在翻页后也应该重置为不选
|
10 years ago |
|
lizanle
|
eef96701dd
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
60b429b13d
|
发送成功不给提示
课程资源过少的时候不给滚动条
|
10 years ago |
|
cxt
|
bcec8eb35e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
10 years ago |
|
lizanle
|
bc186776d8
|
资源移动弹出框减少留白
|
10 years ago |
|
sw
|
51bf1cd678
|
作业搜索支持enter键
|
10 years ago |
|
lizanle
|
53b150486d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
789b62940b
|
资源名称过长会覆盖的问题
搜索按钮 手在上边的时候呈手型
筛选资源后 自选资源清零的问题
|
10 years ago |
|
huang
|
c1851a74c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
170cdad3e3
|
解决消息过滤404问题
|
10 years ago |
|
cxt
|
69178f1522
|
个人主页
|
10 years ago |
|
cxt
|
27b8d85cc5
|
个人主页
|
10 years ago |
|
sw
|
7ec10d7b39
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
3f61a908d1
|
部分界面样式调整
|
10 years ago |
|
cxt
|
36860e8c4f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
e448d2c05f
|
个人主页
|
10 years ago |
|
sw
|
aa06c3ac03
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
49972ca476
|
样式调整，取消资源库选择资源
|
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
|
148a4e2479
|
发布作业样式
|
10 years ago |
|
sw
|
bbb8e5a062
|
老师发布作业取消功能
|
10 years ago |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
10 years ago |
|
huang
|
331592d78a
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
10 years ago |
|
suntao
|
4392ecdcd7
|
消息格式更改
|
10 years ago |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
d9df8aae28
|
1。缺陷状态更新后，不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
|
10 years ago |
|
suntao
|
02120c778f
|
样式修改
|
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
|
43d9697195
|
发布作业增加块的显示
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
lizanle
|
6dde8d1ea6
|
资源库弹出框位置优化
|
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 |
|
huang
|
1b9da8d963
|
消息添加分页功能
|
10 years ago |
|
lizanle
|
149ac07cf9
|
去掉重复的css，
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
sw
|
cc76c13700
|
资源库样式
|
10 years ago |
|
lizanle
|
b7daa643c8
|
资源库空白处单击也要隐藏弹出框
|
10 years ago |
|
lizanle
|
a4e30d119d
|
删不掉资源的提示
|
10 years ago |
|
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
10 years ago |
|
sw
|
ed3be27687
|
消息界面样式
|
10 years ago |
|
cxt
|
a7ce1168db
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
caec5e5490
|
个人主页动态
|
10 years ago |
|
sw
|
5b9c9312f5
|
留言界面样式修改
|
10 years ago |
|
sw
|
afeaecc478
|
作业列表增加标题
|
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 |
|
cxt
|
7c3544dfec
|
个人主页动态
|
10 years ago |
|
cxt
|
706415dc6e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
2124b3c392
|
个人主页动态缺陷修复
|
10 years ago |
|
huang
|
ef74d129c5
|
消息通知回复链接样式
|
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 |
|
lizanle
|
f43e312fbb
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
10 years ago |
|
lizanle
|
a53b9f9049
|
留言模块
|
10 years ago |
|
sw
|
af2434809b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
7340a664f2
|
链接颜色
|
10 years ago |
|
cxt
|
eed1939d2f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
048319ef8e
|
个人主页
|
10 years ago |
|
sw
|
4fe3ba2442
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
e2869faa08
|
日历选择器的样式调整
|
10 years ago |
|
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
1dce1a2a4c
|
老师更新作品评阅消息通知
区分第一次评阅和后面的评阅
|
10 years ago |
|
lizanle
|
d500ea0790
|
关注人数变化
|
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
|
aa28b5ba6a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
0007b720b3
|
修改描述
|
10 years ago |
|
cxt
|
cccc0577c7
|
个人动态
|
10 years ago |
|
cxt
|
fce523606c
|
个人主页
|
10 years ago |
|
sw
|
ab7fd7bc8f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
sw
|
18029fcb22
|
111
|
10 years ago |
|
sw
|
ad524f5a6c
|
取消课程、项目、贴吧等独自的搜索条，搜索统一使用导航栏搜索条
|
10 years ago |
|
huang
|
627ca059ca
|
解决issue的更新
和新建问题
|
10 years ago |
|
cxt
|
e4c9f05c7b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
bd00870eba
|
个人主页
|
10 years ago |
|
sw
|
d8b87ccc37
|
作业列表滚动到底部显示下面10条作业
|
10 years ago |
|
ouyangxuhua
|
10e39a6967
|
发帖的消息内容显示的是帖子的主题
|
10 years ago |
|
ouyangxuhua
|
0056fa9db3
|
修改了课程问卷的link_to以及对应的course_messages的viewed字段
|
10 years ago |
|
sw
|
e2af9e26f8
|
个人主页报错
|
10 years ago |
|
ouyangxuhua
|
67c31d59d0
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
03ac1ca37c
|
消息人物头像链接
|
10 years ago |
|
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
4915f7977e
|
个人动态
|
10 years ago |
|
huang
|
716ffcfdc9
|
修改留言多余内容
|
10 years ago |
|
huang
|
3170fb2377
|
相关问题
|
10 years ago |
|
huang
|
36c855cc65
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
90c199f15a
|
缺陷更新区别新建
|
10 years ago |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
10 years ago |
|
ouyangxuhua
|
49af0cdea7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
d7de5fc480
|
更改消息样式
|
10 years ago |
