 cxt
|
756d703b5a
|
选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期
|
2015-09-01 15:34:08 +08:00 |
 sw
|
c09478c73f
|
作业列表界面和动态列表界面显示不一致
|
2015-09-01 15:32:56 +08:00 |
|
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
|
2015-09-01 15:28:03 +08:00 |
 huang
|
8b9ee2260a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-01 15:24:51 +08:00 |
|
sw
|
0994ae9f07
|
项目讨论区回复功能
|
2015-09-01 15:24:37 +08:00 |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
2015-09-01 15:23:30 +08:00 |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
2015-09-01 15:17:40 +08:00 |
 suntao
|
4bcb6e53f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:13:13 +08:00 |
|
suntao
|
00de825050
|
作业界面颜色更改，删掉冗余头部导航css
|
2015-09-01 15:10:56 +08:00 |
 lizanle
|
a5e39a1049
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:03:36 +08:00 |
|
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
2015-09-01 15:03:24 +08:00 |
|
suntao
|
acb46d520c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
2015-09-01 14:40:24 +08:00 |
|
cxt
|
a008d9d834
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 14:37:59 +08:00 |
|
cxt
|
8a286bb8a8
|
去掉截止日期的标签
|
2015-09-01 14:37:46 +08:00 |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
2015-09-01 14:37:34 +08:00 |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
2015-09-01 14:18:44 +08:00 |
|
lizanle
|
a78128f5ac
|
搜不到资源的时候 改为没有数据可以展示
|
2015-09-01 14:11:04 +08:00 |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 11:29:53 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
sw
|
62360175d1
|
课程通知回复时，所有回复框都会提交
|
2015-09-01 11:25:52 +08:00 |
|
cxt
|
b89a80d04e
|
截止日期
|
2015-09-01 11:12:47 +08:00 |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
2015-09-01 10:43:30 +08:00 |
|
cxt
|
dd6e3e5f82
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 10:20:23 +08:00 |
|
cxt
|
1e320e63c6
|
底部导航的论坛反馈改为贴吧交流，帮助中心版权信息的换行修复
|
2015-09-01 10:20:12 +08:00 |
 ouyangxuhua
|
fd0e4a7afd
|
项目wiki：输入wiki为非汉字类型且长度够长，显示超出边框问题解决
|
2015-09-01 09:56:59 +08:00 |
|
suntao
|
a277322873
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 09:42:27 +08:00 |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
2015-09-01 09:42:03 +08:00 |
|
ouyangxuhua
|
86ced0e290
|
讨论区回帖消息应该在RE:后面显示回帖内容
|
2015-09-01 09:40:04 +08:00 |
|
cxt
|
fdfcefd1ed
|
鼠标移到个人主页的课程列表时，显示tip：课程名，课程学期
|
2015-09-01 09:34:03 +08:00 |
|
cxt
|
a7e19be657
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 09:22:53 +08:00 |
|
cxt
|
e128a0e033
|
当鼠标移到新建课程/项目的图标按钮上时，给出相应的tip
|
2015-09-01 09:22:44 +08:00 |
|
ouyangxuhua
|
284d33b096
|
讨论区回帖消息显示回帖内容
|
2015-09-01 09:18:30 +08:00 |
|
sw
|
147afc09a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 09:17:31 +08:00 |
|
cxt
|
5472f2d45f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 09:17:17 +08:00 |
|
sw
|
b3919256fa
|
111
|
2015-09-01 09:17:12 +08:00 |
|
suntao
|
e917a68bd3
|
消息页面li间距调整，回复块调整
|
2015-09-01 09:13:34 +08:00 |
|
ouyangxuhua
|
316f660ca4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-01 08:47:57 +08:00 |
|
suntao
|
1d1d2f738d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 17:51:08 +08:00 |
|
suntao
|
acf5db7067
|
placeholder显示等
|
2015-08-31 17:50:50 +08:00 |
|
ouyangxuhua
|
8403d5365c
|
修改项目新闻提示
|
2015-08-31 17:49:48 +08:00 |
|
cxt
|
ac419cef87
|
去掉课程/项目搜索列表的搜索框
|
2015-08-31 17:49:18 +08:00 |
|
huang
|
6dff29f931
|
添加时间迁移
|
2015-08-31 17:45:14 +08:00 |
|
cxt
|
90b8d25424
|
鼠标点入“请输入作业标题”后，才显示kindeditor及其下面的内容，及导入作业右侧的时间框，应该显示“提交截止日期”的tip
|
2015-08-31 17:35:47 +08:00 |
|
huang
|
311634abf1
|
修改消息列表样式
|
2015-08-31 16:53:54 +08:00 |
|
cxt
|
1113a7938c
|
修复点击空白处返回新建课程/项目的页面
|
2015-08-31 16:53:41 +08:00 |
|
huang
|
90d93202cd
|
Merge branch 'szzh' into dev_hjq
|
2015-08-31 16:44:00 +08:00 |
|
huang
|
dbc0688213
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-31 16:42:40 +08:00 |
|
huang
|
b5c0d03590
|
添加迁移
代码优化
|
2015-08-31 16:41:52 +08:00 |
|
ouyangxuhua
|
4581f9439a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-08-31 16:02:50 +08:00 |
|
ouyangxuhua
|
5ee53b824d
|
项目中上传资源添加至动态中
|
2015-08-31 16:01:31 +08:00 |