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 |
|
huang
|
4c974266b8
|
没消息显示！
|
10 years ago |
|
huang
|
b1ed9deba1
|
内容框对齐
|
10 years ago |
|
huang
|
3ecdb2940b
|
去掉统计信息
|
10 years ago |
|
huang
|
0da75afc88
|
消息排序（公共表）
|
10 years ago |
|
sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
10 years ago |
|
cxt
|
9320cd18d3
|
个人动态的项目讨论动态
|
10 years ago |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
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
|
45d90639c9
|
静态页面的间距
|
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 |
|
huang
|
d575ce5e5f
|
消息公共表
|
10 years ago |
|
cxt
|
51c2f595d1
|
个人主页动态
|
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 |
|
huang
|
4d0abbc4d3
|
添加消息总数和未读控制
|
10 years ago |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
10 years ago |
|
lizanle
|
12b89e2c81
|
可拖动的框暂时做不了。
|
10 years ago |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
10 years ago |
|
huang
|
17b06963dd
|
添加未读样式
|
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
|
fe8924443c
|
html_safe显示
|
10 years ago |
|
sw
|
36152d19e8
|
个人show界面下面有一块空白界面
|
10 years ago |
|
sw
|
0287a0f3b4
|
个人积分弹出框
|
10 years ago |
|
huang
|
4fd90464d9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
|
huang
|
1e6db593d6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
9f664d8172
|
修改表情无法显示问题
|
10 years ago |
|
ouyangxuhua
|
ab37372dad
|
增加消息用户链接
|
10 years ago |
|
sw
|
08ab08d064
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
huang
|
ff3816e97d
|
添加链接，修复留言无法显示问题
|
10 years ago |
|
lizanle
|
67c5a8e9c5
|
分页改为了15条
|
10 years ago |
|
huang
|
b9980d4ab1
|
消息没显示问题！
|
10 years ago |
|
huang
|
17aae7c79d
|
解决CSS冲突
|
10 years ago |
|
cxt
|
011184b537
|
个人主页
|
10 years ago |
|
lizanle
|
53c28a9b39
|
新成员注册的时候报错
|
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 |
|
lizanle
|
051c921108
|
资源库 多选发送给出提示
|
10 years ago |
|
huang
|
5594295c9e
|
添加问题更新策略
显示更新内容
|
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 |
|
huang
|
a53e66d4b0
|
消息中同事显示 评论和 打分
|
10 years ago |
|
lizanle
|
4928d5976e
|
资源库 上传以后逻辑修改
|
10 years ago |
|
huang
|
2473849a6b
|
作品只打分不留言的情况！
|
10 years ago |
|
huang
|
241d525e2c
|
问卷名为空的显示“未命名问卷”
|
10 years ago |
|
huang
|
3f3c55cb52
|
修复名字为空的缺陷
|
10 years ago |
|
lizanle
|
3feff49ca3
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
lizanle
|
cf243d47e5
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
lizanle
|
3c6484269d
|
资源库 只能删除上传者为自己的资源
|
10 years ago |
|
huang
|
9b827a698c
|
鼠标经过的时候显示完整的标题
|
10 years ago |
|
huang
|
ef45e41a40
|
新消息提醒。表情插入
|
10 years ago |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
10 years ago |
|
cxt
|
4c87071765
|
个人动态
|
10 years ago |
|
huang
|
29b8a9dd9d
|
添加项目新闻回复 消息通知
|
10 years ago |
|
lizanle
|
0e8c1d1b66
|
资源库 分页
|
10 years ago |
|
huang
|
ff53840029
|
修改消息中存在的页面bug
|
10 years ago |
|
lizanle
|
7ddf6d1e7d
|
资源库 多选发送
|
10 years ago |
|
huang
|
93f44287aa
|
jounal状态
|
10 years ago |
|
huang
|
b40122c9ee
|
跟新issue状态！
|
10 years ago |
|
lizanle
|
f97a55e164
|
资源库 删除
|
10 years ago |
|
huang
|
404a6f4bca
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
6b847e27d9
|
修正问题
|
10 years ago |
|
ouyangxuhua
|
cb773e37ea
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ee09a105d2
|
贴吧帖子改名
|
10 years ago |
|
huang
|
f829c6ff23
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
|
10 years ago |
|
huang
|
e4dda89c07
|
消息---用户留言界面
|
10 years ago |
|
ouyangxuhua
|
84182171f5
|
消息信息显示
|
10 years ago |
|
lizanle
|
107a5686d1
|
资源库 全选反选
|
10 years ago |
|
ouyangxuhua
|
88fe0a69f4
|
消息显示判断
|
10 years ago |
|
lizanle
|
76c2c47adf
|
资源库
|
10 years ago |
|
ouyangxuhua
|
d387a529d7
|
增加公共贴吧消息
|
10 years ago |
|
lizanle
|
929da7512d
|
资源库最新界面修改
|
10 years ago |
|
sw
|
a536af8fa3
|
用户show界面更新
|
10 years ago |
|
huang
|
425e0dd89a
|
公共讨论区消息页面添加
部分界面修改
|
10 years ago |
|
ouyangxuhua
|
ff3edf4d5e
|
消息显示
|
10 years ago |
|
lizanle
|
3836cfb40b
|
资源库
|
10 years ago |
|
lizanle
|
43d57074e5
|
资源库
|
10 years ago |
|
lizanle
|
ae6260571b
|
资源库
|
10 years ago |
|
huang
|
90661066d3
|
区分课程/项目讨论区
课程项目/新闻 的消息显示方式
|
10 years ago |
|
huang
|
5f29655406
|
issue状态更新显示
|
10 years ago |
|
lizanle
|
375c016783
|
资源库
|
10 years ago |
|
lizanle
|
32aef6f289
|
资源库
|
10 years ago |
|
huang
|
f9fc63402b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
6b55474623
|
作品被评阅
作品被回复
消息通知
|
10 years ago |
|
lizanle
|
7219586b1e
|
资源库
|
10 years ago |
|
ouyangxuhua
|
9c4e89177f
|
留言
|
10 years ago |
|
ouyangxuhua
|
3e4f726855
|
增加留言、指派给我
|
10 years ago |
|
lizanle
|
76be15f79b
|
资源库
|
10 years ago |
|
sw
|
752fe93d72
|
已登录用户header完成
|
10 years ago |
|
huang
|
4bc0e0eb69
|
项目模块消息添加
讨论区结构优化
|
10 years ago |
|
lizanle
|
25460cd255
|
资源库
|
10 years ago |
|
huang
|
71f6927145
|
issue控制层消息
|
10 years ago |
|
huang
|
dd1dd143f6
|
添加项目缺陷消息显示
|
10 years ago |
|
ouyangxuhua
|
8f23a81261
|
消息显示样式更新
|
10 years ago |
|
huang
|
a677119ba0
|
修改界面样式
|
10 years ago |
|
ouyangxuhua
|
e72eeb37c8
|
通知显示
|
10 years ago |
|
ouyangxuhua
|
fda8c802fb
|
消息显示
|
10 years ago |
|
huang
|
239cba54d9
|
区分未读消息和已读消息
|
10 years ago |
|
huang
|
a71ff944c0
|
消息排序
|
10 years ago |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
421f86cdaf
|
资源库
|
10 years ago |
|
huang
|
4ffdd05a19
|
消息为空给出提示
连接鼠标经过颜色
|
10 years ago |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
10 years ago |
|
huang
|
ed8c4ac906
|
不同类型消息发送
|
10 years ago |
|
huang
|
2cb5292dc1
|
完成课程讨论区消息回复方法
|
10 years ago |
|
huang
|
4013ff486a
|
消息界面调整
|
10 years ago |
|
huang
|
17fad1f291
|
课程（所有消息）--发布作业、新闻、问卷界面
|
10 years ago |
|
huang
|
7ea0fac774
|
1。发布作业消息提醒
2、新建问卷消息提醒
3、消息界面（未完成）
|
10 years ago |
|
huang
|
2c865069d3
|
所有消息显示功能
|
10 years ago |
|
ouyangxuhua
|
11ad8d6d42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
96c4924c89
|
Merge branch 'ouyangxuhua' into szzh
|
10 years ago |
|
ouyangxuhua
|
78ccfe6a03
|
添加关注
|
10 years ago |
|
cxt
|
21f81a931a
|
修改个人主页的“新建课程”“新建项目”“加入课程””加入项目“的按钮样式
|
10 years ago |
|
cxt
|
22985fdbce
|
修复个人主页的课程/项目动态中可点击的私有课程/项目显示为灰色的bug
|
10 years ago |
|
cxt
|
36456f8b2d
|
私有项目/课程的项目动态超链接无法点击，修改样式并给出相应提示信息。
|
10 years ago |
|
sw
|
11afcaf17c
|
没有昵称的用户显示为：匿名用户
个人主页留言换行
|
10 years ago |
|
sw
|
d5e97c6131
|
1、留言界面显示top_view
2、留言界面删除部分留言后报错
|
10 years ago |
|
sw
|
a74409fa04
|
回复子留言不成功
|
10 years ago |
|
sw
|
e2ec37026c
|
不是自己的个人主页也显示top_view
|
10 years ago |
|
sw
|
a52c906217
|
用户留言界面插件问题
|
10 years ago |
|
sw
|
b045b2a648
|
个人主页留言多出的；两个冒号
|
10 years ago |
|
sw
|
b5849ed8b8
|
进入他人个人主页，TA的项目列表，显示TA创建/TA参与
|
10 years ago |
|
sw
|
9dde668742
|
进入他人个人主页，TA的项目列表，对不是成员的项目显示申请项目/取消申请
|
10 years ago |
|
sw
|
32122796f9
|
1、我的课程、我的项目留言js问题
2、编辑资料无法提交
3、访问他人项目不显示加入项目按钮
|
10 years ago |
|
sw
|
692411d327
|
f访问他人个人主页不显示加入课程按钮
|
10 years ago |
|
sw
|
01bdf5fdca
|
访问他人课程列表，非课程成员的课程显示加入课程，加入课程后界面刷新
|
10 years ago |
|
sw
|
7628a53cdc
|
留言回复
|
10 years ago |
|
sw
|
51a7044e05
|
个人主页留言图片最大宽度为100%
|
10 years ago |
|
sw
|
ce89c7d119
|
用户留言后界面的刷新，留言的分页显示
|
10 years ago |
|
sw
|
e4e99df113
|
个人主页留言界面显示以及留言的删除
|
10 years ago |
|
sw
|
9c704b7dc1
|
个人主页留言静态页面
更新css
路由及相关代码整理
|
10 years ago |
|
sw
|
8ef0d0f8a6
|
1、个人主页，布局右侧显示不够左侧长度时自动补充
2、个人主页js、css提取出来
3、css错误整理
|
10 years ago |
|
sw
|
9728277005
|
1、课程动态、每次项目动态显示13条
2、取消动态页面、他的课程、他的项目、留言等显示
|
10 years ago |
|
sw
|
5dc3eba27a
|
我的课程、我的项目、他的课程、他的项目只显示出有权限的课程和项目。以及数量统计不正确
|
10 years ago |
|
cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
10 years ago |
 zhangshenjerry
|
1b3c6bde69
|
个人主页--留言文本框修改
|
10 years ago |
|
cxt
|
266e936d67
|
3227缺陷已修复
|
10 years ago |
 yutao
|
6df40be30e
|
个人主页：如图“取消”改为“取消关注”
|
10 years ago |
|
yutao
|
b077d94b39
|
个人主页
|
10 years ago |
|
yutao
|
99c1d528ca
|
个人主页
|
10 years ago |
|
yutao
|
59c1810d6b
|
个人主页
|
10 years ago |
|
yutao
|
61b759b739
|
个人主页
|
10 years ago |
|
yutao
|
a1cb6db047
|
个人主页
|
10 years ago |
|
yutao
|
c84b7c9809
|
个人主页
|
10 years ago |
|
yutao
|
8d858cccfc
|
个人主页
|
10 years ago |
|
yutao
|
bb4c8c340a
|
个人主页
|
10 years ago |
|
yutao
|
8e3bc28fa2
|
个人主页
|
10 years ago |
|
yutao
|
11ae8c82d4
|
个人主页
|
10 years ago |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
10 years ago |
|
yutao
|
00c50d8114
|
个人主页->访客
|
10 years ago |
|
yutao
|
b7c4449f4b
|
个人主页
|
10 years ago |
|
yutao
|
7518cdcc9d
|
个人主页
|
10 years ago |
|
yutao
|
17a317a87c
|
个人主页弹出框bug
|
10 years ago |
|
yutao
|
02d09c84b4
|
个人主页->留言
|
10 years ago |
|
yutao
|
5c011fd342
|
个人主页
|
10 years ago |
|
huang
|
3bb3cbe2bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
898ef29116
|
用户得分：项目得分中添加发帖得分（帖子回复在协同得分）
|
10 years ago |
|
zhangshenjerry
|
04f125c7a6
|
张申修改的bug
|
10 years ago |
|
yutao
|
d882a3c5ee
|
bug#2948:在课程和个人主页模块，被留言的人应该能看到留言人的昵称和真实姓名
|
10 years ago |
|
sw
|
218246239b
|
个人主页图片超出
|
10 years ago |
|
yutao
|
be9cf478e5
|
bug#2911:用超级管理员进入admin配置窗口，点击进入“用户列表”，搜索某用户，点击该用户，如图，用户动态中字被截断了
|
10 years ago |
|
guange
|
71ae441bfc
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
10 years ago |
|
yutao
|
3b3b8661c8
|
bug#2827:IE浏览器：讨论区：点击回复时，编辑器下面会出现内容不能为空
|
10 years ago |
|
yutao
|
29b2018a5a
|
bug#2779:搜索用户结果页面项目后没有冒号，课程后又有冒号，建议统一改为没有冒号
|
10 years ago |
|
yutao
|
ab64b38cee
|
留言提交之后清除编辑框内容
|
10 years ago |
|
yutao
|
482df88d70
|
...
|
10 years ago |
|
yutao
|
e138292f2a
|
...
|
10 years ago |
|
yutao
|
46da84cd81
|
...
|
10 years ago |
|
yutao
|
3c515dd077
|
...
|
10 years ago |
|
yutao
|
6929694fb4
|
个人主页留言换编辑器
|
10 years ago |
|
yutao
|
2e7c6c4afb
|
修复bug#2725 :用户搜索--默认用户名和姓名一起匹配
|
10 years ago |
|
sw
|
41db8e9866
|
个人主页 课程报错
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
bd6a057008
|
老师布置作业加入个人动态
|
10 years ago |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
10 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
10 years ago |
 alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
10 years ago |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
10 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
10 years ago |
|
sw
|
83796bfaa0
|
去掉puts
|
10 years ago |
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
10 years ago |
|
whimlex
|
5936d8d8e9
|
评论显示
|
10 years ago |
|
sw
|
ece4a67f97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
d99910e8a1
|
个人动态列表留言动态url错误
|
10 years ago |
|
sw
|
f0ba408a10
|
课程通知、个人动态 大图片超出页面
|
10 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
10 years ago |
|
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
10 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
|
10 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
10 years ago |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
10 years ago |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
10 years ago |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
10 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
|
10 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
10 years ago |
|
sw
|
93410e0d57
|
#1919 取消作业留言的动态显示
|
10 years ago |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
11 years ago |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
933a84f51d
|
项目、课程主页用户搜索后结果界面也支持按姓名、昵称、邮箱搜索
|
11 years ago |
