 sw
|
bfd13bf98a
|
课程回复按钮样式
|
2015-08-29 17:54:56 +08:00 |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
2015-08-29 17:50:15 +08:00 |
|
sw
|
f81bab6319
|
课程回复
|
2015-08-29 17:19:03 +08:00 |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 17:10:56 +08:00 |
|
sw
|
cc50d0d85e
|
布置作业界面调整删除按钮和文件的距离
|
2015-08-29 17:08:55 +08:00 |
 suntao
|
ecd355df0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_poll.html.erb
|
2015-08-29 17:08:01 +08:00 |
|
suntao
|
fc47b793ee
|
动态块间距调整
|
2015-08-29 17:06:21 +08:00 |
|
sw
|
1e9f5cebd2
|
首页查询问题
|
2015-08-29 17:04:44 +08:00 |
 cxt
|
cb88e406d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 16:59:29 +08:00 |
|
cxt
|
a7f161804e
|
描述和回复超出边框
|
2015-08-29 16:59:13 +08:00 |
|
sw
|
9437188c9b
|
登录界面enter键监听
|
2015-08-29 16:55:49 +08:00 |
|
suntao
|
3776689661
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 16:52:44 +08:00 |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
2015-08-29 16:52:10 +08:00 |
|
cxt
|
d48cc8073a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 16:40:00 +08:00 |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
2015-08-29 16:39:37 +08:00 |
|
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 |