 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
|
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
|
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 |
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
|
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 |
|
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 |
|
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 |
|
sw
|
1e9f5cebd2
|
首页查询问题
|
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 |
|
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 |
|
suntao
|
1351742919
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
977f81e031
|
关注和取消关注，导航圆角
|
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
|
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 |
|
huang
|
6406d5a284
|
解决邮件内容空的问题
|
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 |
|
guange
|
e8fe397158
|
added
|
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 |
|
sw
|
02f7538200
|
个人描述为英文时不换行
|
10 years ago |
|
huang
|
331592d78a
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
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 |
