 Tim
|
0ff58b7631
|
修复了贴吧图片漂移的问题
|
2015-10-09 09:41:36 +08:00 |
|
Tim
|
f5ff94d888
|
资源库固定宽度、作品描述margin、搜索框文字居中
|
2015-10-08 16:35:08 +08:00 |
 huang
|
326c05d0eb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 11:24:31 +08:00 |
|
huang
|
fd020b56f7
|
细调红点样式
|
2015-09-30 11:24:17 +08:00 |
|
Tim
|
ff18381f64
|
引用资源库弹框调整
|
2015-09-30 10:52:27 +08:00 |
|
Tim
|
78d11b57b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:33:31 +08:00 |
|
Tim
|
42d4a5628d
|
引用资源库的icon修改
|
2015-09-30 10:33:13 +08:00 |
|
huang
|
edf6f8e1f0
|
消息提示，显示新消息数目
|
2015-09-30 10:31:47 +08:00 |
 lizanle
|
4386f3fddf
|
样式问题
|
2015-09-29 17:29:44 +08:00 |
|
Tim
|
1613f41e77
|
点赞判断
|
2015-09-29 15:44:04 +08:00 |
|
Tim
|
971ff1e692
|
贴吧点赞位置调整
|
2015-09-29 15:24:15 +08:00 |
|
Tim
|
21408f3843
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 14:35:02 +08:00 |
|
Tim
|
cc99120f25
|
贴吧样式更改
|
2015-09-29 14:34:39 +08:00 |
|
lizanle
|
de62798d4d
|
点赞按钮位置调整
|
2015-09-29 13:54:54 +08:00 |
|
lizanle
|
4f63f3fd2a
|
导航
|
2015-09-29 12:06:56 +08:00 |
 sw
|
22b9c6a866
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/courses.css
|
2015-09-29 10:40:11 +08:00 |
|
lizanle
|
5002daad52
|
帖子内容显示不对
|
2015-09-29 10:34:05 +08:00 |
|
sw
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
2015-09-28 17:09:07 +08:00 |
 ouyangxuhua
|
29b4e174fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 10:20:27 +08:00 |
|
ouyangxuhua
|
f73865b771
|
1.修改作业消息的样式；
2.解决系统消息时间显示问题。
|
2015-09-28 10:20:14 +08:00 |
 cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-25 16:32:25 +08:00 |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
2015-09-25 16:29:47 +08:00 |
|
ouyangxuhua
|
0b932267c7
|
调整截止日期快到了的宽度
|
2015-09-25 15:26:40 +08:00 |
|
ouyangxuhua
|
1935a9caaa
|
调整消息页面的宽度
|
2015-09-25 14:38:41 +08:00 |
|
ouyangxuhua
|
4d1bc90161
|
匿名用户重新评阅作品，在消息显示中，需要正常显示
|
2015-09-25 11:40:57 +08:00 |
|
Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 10:43:42 +08:00 |
|
Tim
|
e8a7448a7c
|
资源库用户资源图标位置调整
|
2015-09-25 10:43:19 +08:00 |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
2015-09-25 10:35:04 +08:00 |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
2015-09-24 16:46:08 +08:00 |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
2015-09-24 16:30:14 +08:00 |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
2015-09-24 13:44:37 +08:00 |
|
lizanle
|
38a24e8fe4
|
论坛消息回复改版
|
2015-09-24 12:17:14 +08:00 |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
2015-09-24 11:46:33 +08:00 |
|
sw
|
f9f51557dd
|
增加关闭反馈功能
|
2015-09-24 11:31:07 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
|
lizanle
|
c8d07dedf6
|
帖子添加编辑 删除 链接
|
2015-09-23 17:09:21 +08:00 |
|
lizanle
|
6ac5b738e3
|
论坛编辑功能
|
2015-09-23 16:27:13 +08:00 |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
2015-09-23 15:44:48 +08:00 |
|
lizanle
|
eed530db2b
|
添加 上传附件的 文字
|
2015-09-23 15:14:37 +08:00 |
|
ouyangxuhua
|
841c680bb1
|
1.作业消息增加显示老师、课程、课程季度等信息
2.作业内容为空时，tips中不显示内容
|
2015-09-23 14:53:50 +08:00 |
|
sw
|
9d474d6528
|
设置匿评属性静态页面
|
2015-09-23 13:54:36 +08:00 |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
2015-09-23 09:23:31 +08:00 |
|
lizanle
|
361b391d3c
|
修改分页的样式
|
2015-09-22 17:18:10 +08:00 |
|
Tim
|
93804bcfa6
|
关于我们图片对齐
|
2015-09-22 16:11:22 +08:00 |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
2015-09-22 15:54:50 +08:00 |
|
cxt
|
8883093b96
|
"关于我们"的图片居中
|
2015-09-21 17:05:51 +08:00 |
|
cxt
|
facd12640a
|
个人动态的回复为0时不显示“回复(0)”
|
2015-09-21 16:54:23 +08:00 |
|
cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 11:18:55 +08:00 |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
2015-09-19 11:18:41 +08:00 |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 17:51:11 +08:00 |