Commit Graph

651 Commits

Author SHA1 Message Date
cxt 5ddefe21b8 个人主页3080账户动态异常bug 2015-08-29 16:39:37 +08:00
cxt 250d7a48dc 主页动态页面的刷新 2015-08-29 14:49:50 +08:00
cxt b30a07d651 个人主页动态 2015-08-29 14:27:16 +08:00
suntao a22727efb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:08:58 +08:00
suntao 5e25b64004 提交按钮对齐 2015-08-29 14:08:38 +08:00
lizanle acbf58837a Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 12:32:08 +08:00
lizanle ad8bd379a1 用户资源过滤 2015-08-29 12:32:00 +08:00
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:04:57 +08:00
huang 4e1766d578 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:07:31 +08:00
huang 5f4b879fb7 修改消息过滤条件 2015-08-29 12:06:57 +08:00
lizanle 92298160a7 搜索后的资源总数在搜索框右边展示 2015-08-29 11:58:44 +08:00
ouyangxuhua f99097f3d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 11:29:27 +08:00
ouyangxuhua a111b9a3fd 用户关注ajax刷新 2015-08-29 11:29:05 +08:00
sw 00ab2bcbd4 作业名称过长超出边框 2015-08-29 11:09:19 +08:00
lizanle 878f48079d 全选框在翻页后也应该重置为不选 2015-08-29 10:36:55 +08:00
lizanle eef96701dd Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 10:33:16 +08:00
lizanle 60b429b13d 发送成功不给提示
课程资源过少的时候不给滚动条
2015-08-29 10:33:04 +08:00
cxt bcec8eb35e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 10:16:15 +08:00
cxt c650c83f82 个人主页报500、动态显示错位的bug修复 2015-08-29 10:16:04 +08:00
lizanle bc186776d8 资源移动弹出框减少留白 2015-08-29 09:56:34 +08:00
sw 51bf1cd678 作业搜索支持enter键 2015-08-29 09:53:16 +08:00
lizanle 53b150486d Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 09:33:33 +08:00
lizanle 789b62940b 资源名称过长会覆盖的问题
搜索按钮 手在上边的时候呈手型
筛选资源后  自选资源清零的问题
2015-08-29 09:33:22 +08:00
huang c1851a74c5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 09:20:51 +08:00
huang 170cdad3e3 解决消息过滤404问题 2015-08-29 09:20:04 +08:00
cxt 69178f1522 个人主页 2015-08-28 17:46:21 +08:00
cxt 27b8d85cc5 个人主页 2015-08-28 17:36:57 +08:00
sw 7ec10d7b39 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 17:28:31 +08:00
sw 3f61a908d1 部分界面样式调整 2015-08-28 17:27:51 +08:00
cxt 36860e8c4f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 17:26:11 +08:00
cxt e448d2c05f 个人主页 2015-08-28 17:25:42 +08:00
sw aa06c3ac03 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 17:14:47 +08:00
sw 49972ca476 样式调整,取消资源库选择资源 2015-08-28 17:11:34 +08:00
huang 3a25f44d83 Merge branch 'dev_hjq' into szzh 2015-08-28 17:07:48 +08:00
huang e193cb0f2d 消息列表界面新样式 2015-08-28 17:05:27 +08:00
sw 014881bd42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	public/stylesheets/new_user.css
2015-08-28 17:02:49 +08:00
sw 148a4e2479 发布作业样式 2015-08-28 16:59:40 +08:00
sw bbb8e5a062 老师发布作业取消功能 2015-08-28 16:56:09 +08:00
sw 76ec0d5d48 资源库导入资源到作业静态页面 2015-08-28 16:47:43 +08:00
huang 331592d78a Merge branch 'szzh' into dev_hjq 2015-08-28 15:53:10 +08:00
huang 5384e7eee8 消息每种类型为空的时候给出提示 2015-08-28 15:51:42 +08:00
suntao 4392ecdcd7 消息格式更改 2015-08-28 15:41:50 +08:00
huang 9bc491227b Merge branch 'szzh' into dev_hjq 2015-08-28 14:49:55 +08:00
huang d9df8aae28 1。缺陷状态更新后,不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
2015-08-28 14:38:46 +08:00
suntao 02120c778f 样式修改 2015-08-28 12:09:31 +08:00
suntao c0477fda99 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	public/stylesheets/new_user.css
2015-08-28 11:58:33 +08:00
sw 462b0a82a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 11:56:52 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
sw 43d9697195 发布作业增加块的显示 2015-08-28 11:55:32 +08:00
sw 2fa03c3102 导入作业功能完成 2015-08-28 11:32:57 +08:00