suntao
|
9b8270aed1
|
Banner padding调整
|
10 years ago |
 huang
|
a2079dc6e3
|
用户留言消息状态更新
|
10 years ago |
 sw
|
e55b61cb81
|
课程留言回复
|
10 years ago |
|
sw
|
0935a7eab1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
8acc432f91
|
项目讨论区回复刷新
|
10 years ago |
|
sw
|
c4da4b6c09
|
项目缺陷回复刷新
|
10 years ago |
|
sw
|
2538797a52
|
课程论坛回复刷新
|
10 years ago |
|
huang
|
61455bdb4b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
10 years ago |
 ouyangxuhua
|
192c5735cb
|
贴吧帖子已读更新
|
10 years ago |
|
sw
|
bbf4478fc0
|
课程通知回复后不能及时刷新页面
|
10 years ago |
|
sw
|
3b153766f6
|
过滤之后点击展开更多相关BUG
|
10 years ago |
|
suntao
|
023bb3d95f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
9728437953
|
作业界面样式
|
10 years ago |
|
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
10 years ago |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
10 years ago |
|
sw
|
6b1e0b1407
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
guange
|
d5be41eebc
|
merge
|
10 years ago |
|
guange
|
45dd48069e
|
submit不能提交的问题
|
10 years ago |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
10 years ago |
|
sw
|
e42b6d65db
|
导入作业之后显示所有的作业信息
|
10 years ago |
|
huang
|
0e4019be2f
|
修复时间乱的问题
|
10 years ago |
|
sw
|
b0060fc03b
|
请选择发送的课程选择
|
10 years ago |
|
huang
|
469293bc1f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
10 years ago |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
10 years ago |
|
suntao
|
f036b322b9
|
忘记密码页面提示位置调整
|
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
|
77349fc111
|
点击新建课程/项目时显示提示信息
|
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 |
|
sw
|
5b073c5289
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
sw
|
da9c374ed9
|
111
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
huang
|
7361f40b0c
|
修改项目资源时间显示跳转错误页面问题
|
10 years ago |
|
sw
|
c01b71739a
|
增加加载更多按钮
|
10 years ago |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
d0c4bb9470
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
10 years ago |
|
sw
|
eff6d6cafe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
edb7173d83
|
加入课程、新建课程、新建项目按钮样式
|
10 years ago |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
10 years ago |
|
cxt
|
756d703b5a
|
选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期
|
10 years ago |
|
sw
|
c09478c73f
|
作业列表界面和动态列表界面显示不一致
|
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 |
|
cxt
|
dd6e3e5f82
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
1e320e63c6
|
底部导航的论坛反馈改为贴吧交流，帮助中心版权信息的换行修复
|
10 years ago |
|
suntao
|
a277322873
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
10 years ago |
|
ouyangxuhua
|
86ced0e290
|
讨论区回帖消息应该在RE:后面显示回帖内容
|
10 years ago |
|
cxt
|
fdfcefd1ed
|
鼠标移到个人主页的课程列表时，显示tip：课程名，课程学期
|
10 years ago |
|
cxt
|
e128a0e033
|
当鼠标移到新建课程/项目的图标按钮上时，给出相应的tip
|
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 |
|
cxt
|
5472f2d45f
|
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
|
ac419cef87
|
去掉课程/项目搜索列表的搜索框
|
10 years ago |
|
cxt
|
90b8d25424
|
鼠标点入“请输入作业标题”后，才显示kindeditor及其下面的内容，及导入作业右侧的时间框，应该显示“提交截止日期”的tip
|
10 years ago |
|
cxt
|
1113a7938c
|
修复点击空白处返回新建课程/项目的页面
|
10 years ago |
|
huang
|
90d93202cd
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
dbc0688213
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
b5c0d03590
|
添加迁移
代码优化
|
10 years ago |
|
ouyangxuhua
|
4581f9439a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
5ee53b824d
|
项目中上传资源添加至动态中
|
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 |
|
lizanle
|
9ca1234324
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
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
|
7a4d562773
|
课程主页，项目主页 500
|
10 years ago |
|
sw
|
ab173fb704
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
8be7509b33
|
课程、竞赛主页跳转到个人主页
|
10 years ago |
|
sw
|
c416a312cf
|
取消发布作业时间
|
10 years ago |
|
cxt
|
96021bee73
|
项目讨论区的回复不显示用户名称
|
10 years ago |
|
sw
|
09a994f76a
|
职称增加副教授等职称
|
10 years ago |
|
sw
|
ca0c7a4fb0
|
个人主页职称
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
guange
|
85ee2b86cd
|
.
|
10 years ago |
|
cxt
|
6c09e41a09
|
个人主页课程讨论区动态报错
|
10 years ago |
|
sw
|
bfd13bf98a
|
课程回复按钮样式
|
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
|
f81bab6319
|
课程回复
|
10 years ago |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
43170c696c
|
迁移总表时间
|
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 |
|
lizanle
|
ac60fdf0b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
1e9f5cebd2
|
首页查询问题
|
10 years ago |
|
lizanle
|
de5dd08b55
|
登录之后跳到个人主页
|
10 years ago |
|
cxt
|
cb88e406d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a7f161804e
|
描述和回复超出边框
|
10 years ago |
|
sw
|
9437188c9b
|
登录界面enter键监听
|
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 |
|
cxt
|
d48cc8073a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
10 years ago |
|
sw
|
6d768100f8
|
输入为空不提交表单
|
10 years ago |
|
huang
|
2a17cfc741
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
353e2f5d18
|
添加课程消息迁移
|
10 years ago |
|
sw
|
63c7ea8d4e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
98d533e8f9
|
1、整理迁移文件
2、个人动态添加与更新判断不正确
|
10 years ago |
|
lizanle
|
244d5165e2
|
登录之后跳到个人主页
|
10 years ago |
|
lizanle
|
2962408c06
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
3a21c4e2fa
|
登录之后跳到个人主页
|
10 years ago |
|
cxt
|
250d7a48dc
|
主页动态页面的刷新
|
10 years ago |
|
sw
|
6cb21d3430
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
73ffbb7dfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
c0daebd75c
|
上传图片js
|
10 years ago |
|
sw
|
b65243ba62
|
添加关注、取消关注js刷新
|
10 years ago |
|
sw
|
a2ec65a0c9
|
添加关注与取消关注
|
10 years ago |
|
cxt
|
b30a07d651
|
个人主页动态
|
10 years ago |
|
sw
|
498775b0a8
|
登录界面多了一个<
教授职称
|
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 |
|
sw
|
e455f93ee1
|
上传图片；浏览图片按钮
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
lizanle
|
ca2b20bd99
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
92298160a7
|
搜索后的资源总数在搜索框右边展示
|
10 years ago |
|
huang
|
8e70bc22e0
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
f438d300dd
|
消息数据迁移（未完）
|
10 years ago |
|
suntao
|
1351742919
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
977f81e031
|
关注和取消关注，导航圆角
|
10 years ago |
|
lizanle
|
577376a037
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
2b7beaeae8
|
上次登录的地址用户id变为当前用户id
|
10 years ago |
|
ouyangxuhua
|
1957100062
|
用户关注ajax刷新
|
10 years ago |
|
sw
|
f01b5681a5
|
增加项目、课程的收起
|
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
|
e5bf355a17
|
导航栏搜索支持enter键
|
10 years ago |
|
suntao
|
5f3532ac14
|
头像部分修改
|
10 years ago |
|
sw
|
7263598851
|
访问问卷报500
|
10 years ago |
|
sw
|
86e9ec068f
|
新建作业时，作业截止时间为空
|
10 years ago |
|
sw
|
00ab2bcbd4
|
作业名称过长超出边框
|
10 years ago |
|
lizanle
|
5e485e5175
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
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 |
|
sw
|
2d00eb982c
|
取消跳转到个人主页
|
10 years ago |
|
suntao
|
9d638b705a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
cxt
|
bcec8eb35e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
10 years ago |
|
suntao
|
ada04e5e63
|
个人主页头像模块改动
|
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 |
|
sw
|
51bf1cd678
|
作业搜索支持enter键
|
10 years ago |
