Commit Graph

8953 Commits

Author SHA1 Message Date
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
suntao 2804d7d730 resource图片替换 2015-08-31 15:42:56 +08:00
cxt 4ab91984f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:33:39 +08:00
cxt fa57a6c889 主页动态的样式修改 2015-08-31 15:33:20 +08:00
suntao ac353841b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:21:28 +08:00
suntao d3869b03cd 资源库版面样式调整 2015-08-31 15:21:09 +08:00
cxt 7d6f952737 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:12:55 +08:00
cxt 118b731dc4 点击动态链接进入相关列表 2015-08-31 15:12:46 +08:00
lizanle 9a1fa316bb Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-31 15:06:38 +08:00
lizanle 19dfd77cad 将资源发送至 会换行,调宽 2015-08-31 15:06:07 +08:00
suntao 3e9bb8a596 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/layouts/new_base_user.html.erb
2015-08-31 14:55:15 +08:00
suntao b0ff7f0ee2 页面间距调整,头像大小调整 2015-08-31 14:52:56 +08:00
cxt 23c1ac5a4a 项目问题的动态内容显示超出边框 2015-08-31 14:28:43 +08:00
cxt 8345a9d94e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 14:13:33 +08:00
cxt fedc125731 附件名称在可用的范围内尽可能显示全 2015-08-31 14:13:17 +08:00
lizanle 5b40628a5b Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-31 11:59:42 +08:00
lizanle e9b501058b 上传以后资源数改变 2015-08-31 11:59:33 +08:00
sw 8763243e31 Merge branch 'develop' into szzh 2015-08-31 10:36:38 +08:00
lizanle 9ca1234324 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 10:23:12 +08:00
guange a142103091 Merge remote-tracking branch 'origin/develop' into guange_homework 2015-08-31 09:33:20 +08:00
huang f6baf03470 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-08-30 11:25:31 +08:00
huang c0067eb616 Merge branch 'szzh' into develop 2015-08-30 11:24:29 +08:00
huang 6dd372863f Merge branch 'dev_hjq' into szzh 2015-08-30 11:22:50 +08:00
huang 3807c4ea2a Merge branch 'szzh' into dev_hjq 2015-08-30 11:21:58 +08:00
huang e652e92217 新增消息迁移 2015-08-30 11:20:37 +08:00
huang 7ed93c1d80 消息总表数据迁移 2015-08-29 19:26:23 +08:00
sw 7a4d562773 课程主页,项目主页 500 2015-08-29 19:15:06 +08:00
sw 6f3bed94d9 Merge branch 'szzh' into develop 2015-08-29 19:05:17 +08:00
sw ab173fb704 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 19:04:36 +08:00
sw 8be7509b33 课程、竞赛主页跳转到个人主页 2015-08-29 19:03:36 +08:00
sw c416a312cf 取消发布作业时间 2015-08-29 19:02:47 +08:00