Commit Graph

8715 Commits

Author SHA1 Message Date
sw 6d768100f8 输入为空不提交表单 2015-08-29 16:14:02 +08:00
sw 63c7ea8d4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 15:42:11 +08:00
sw 0c731a39e6 Merge branch 'develop' into szzh 2015-08-29 15:34:35 +08:00
sw 98d533e8f9 1、整理迁移文件
2、个人动态添加与更新判断不正确
2015-08-29 15:34:18 +08:00
lizanle 244d5165e2 登录之后跳到个人主页 2015-08-29 15:25:58 +08:00
lizanle 2962408c06 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 15:08:00 +08:00
lizanle 3a21c4e2fa 登录之后跳到个人主页 2015-08-29 15:07:47 +08:00
cxt 65756967ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:50:42 +08:00
cxt 41ba874749 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:50:05 +08:00
cxt 250d7a48dc 主页动态页面的刷新 2015-08-29 14:49:50 +08:00
sw b8bc32c127 Merge branch 'szzh' into develop 2015-08-29 14:49:30 +08:00
sw 6cb21d3430 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:49:01 +08:00
sw 17e9b2d293 编辑个人简介文本框 2015-08-29 14:48:47 +08:00
sw 73ffbb7dfb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:46:44 +08:00
sw c0daebd75c 上传图片js 2015-08-29 14:46:30 +08:00
suntao 0d8624a642 颜色更新 2015-08-29 14:43:28 +08:00
sw b65243ba62 添加关注、取消关注js刷新 2015-08-29 14:37:53 +08:00
sw a2ec65a0c9 添加关注与取消关注 2015-08-29 14:34:59 +08:00
cxt b30a07d651 个人主页动态 2015-08-29 14:27:16 +08:00
sw 498775b0a8 登录界面多了一个<
教授职称
2015-08-29 14:24:54 +08:00
suntao 9b38d4d2bd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:22:51 +08:00
suntao 886a00e18d footer间距调整 2015-08-29 14:22:29 +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
sw e455f93ee1 上传图片;浏览图片按钮 2015-08-29 12:04:35 +08:00
lizanle ca2b20bd99 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 11:58:52 +08:00
lizanle 92298160a7 搜索后的资源总数在搜索框右边展示 2015-08-29 11:58:44 +08:00
sw c5b0b4164c 迁移文件back 2015-08-29 11:54:28 +08:00
suntao 1351742919 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 11:41:29 +08:00
suntao 977f81e031 关注和取消关注,导航圆角 2015-08-29 11:41:12 +08:00
lizanle 577376a037 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 11:36:01 +08:00
lizanle 2b7beaeae8 上次登录的地址用户id变为当前用户id 2015-08-29 11:35:33 +08:00
sw f01b5681a5 增加项目、课程的收起 2015-08-29 11:33:58 +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 e5bf355a17 导航栏搜索支持enter键 2015-08-29 11:28:02 +08:00
suntao 5f3532ac14 头像部分修改 2015-08-29 11:25:49 +08:00
sw 7263598851 访问问卷报500 2015-08-29 11:17:46 +08:00
sw 86e9ec068f 新建作业时,作业截止时间为空 2015-08-29 11:12:18 +08:00
sw 00ab2bcbd4 作业名称过长超出边框 2015-08-29 11:09:19 +08:00
sw 189405f0a9 课程搜索有部分文本重叠 2015-08-29 10:58:45 +08:00
sw 4d1fc0dc45 调整底部导航栏宽度 2015-08-29 10:54:45 +08:00
lizanle 5e485e5175 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 10:37:02 +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