 lizanle
|
dc3cb3a26b
|
_logined_header.html头像 鼠标移入就要有效果
|
2015-10-09 13:38:35 +08:00 |
 huang
|
548a18d1fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:32:16 +08:00 |
|
huang
|
edf6f8e1f0
|
消息提示，显示新消息数目
|
2015-09-30 10:31:47 +08:00 |
|
lizanle
|
4f8e9ea2cd
|
编辑按钮被注释了
|
2015-09-29 17:54:33 +08:00 |
|
lizanle
|
b798c6747b
|
删除贴吧 函数名重复了
|
2015-09-29 16:40:55 +08:00 |
 Tim
|
a0f4cabcf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:24:30 +08:00 |
|
Tim
|
971ff1e692
|
贴吧点赞位置调整
|
2015-09-29 15:24:15 +08:00 |
|
lizanle
|
9e4896fc7b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 15:13:14 +08:00 |
|
lizanle
|
138b24b34c
|
oschina模式的代码插入
|
2015-09-29 15:13:05 +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
|
c75487fcf5
|
防止论坛名字太长
|
2015-09-29 14:27:53 +08:00 |
|
lizanle
|
ea3900b50a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 12:05:40 +08:00 |
|
lizanle
|
a8bb7ca2bc
|
导航
|
2015-09-29 12:05:30 +08:00 |
 sw
|
f2d3ec980a
|
点击发布作业，作业列表标题栏自动获得焦点
|
2015-09-29 10:48:50 +08:00 |
|
sw
|
ad4fc50fbb
|
1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
|
2015-09-29 10:20:13 +08:00 |
|
sw
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
2015-09-28 17:09:07 +08:00 |
|
lizanle
|
5e0ae3a6bb
|
编辑贴吧描述匡样式修改
|
2015-09-28 14:11:46 +08:00 |
|
lizanle
|
ea515cbb5d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-28 13:36:05 +08:00 |
|
lizanle
|
f340941e3e
|
贴吧描述（历史数据）显示存在html代码
|
2015-09-28 13:35:59 +08:00 |
 ouyangxuhua
|
e4140ac411
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 13:29:17 +08:00 |
|
ouyangxuhua
|
ab0013d659
|
1.项目问题中，问题类型为“周报”时，消息提示应为“发布了周报”；
2.stylesheet_link_tag 中，prettify应该加上引号，否则报错。
|
2015-09-28 13:29:02 +08:00 |
|
lizanle
|
f2dd69f9b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-28 11:42:50 +08:00 |
|
lizanle
|
62bf136bea
|
标题内容 如果换行，那么就换行显示
|
2015-09-28 11:42:32 +08:00 |
 cxt
|
9190f0515d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 08:46:20 +08:00 |
|
sw
|
b84ec1360a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 16:58:57 +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 |
|
sw
|
fd4a2b19c8
|
课程界面老师数量
|
2015-09-25 16:11:59 +08:00 |
|
lizanle
|
926bdd81e8
|
论坛名换行问题
|
2015-09-25 15:52:28 +08:00 |
|
lizanle
|
66ea9e3052
|
删除贴吧 取消也会被删除
|
2015-09-25 15:23:12 +08:00 |
|
lizanle
|
924183b1cc
|
js合并错误
|
2015-09-25 10:04:56 +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
|
6b98b2a273
|
暂时不可点击的链接 不用手型光标
|
2015-09-24 16:17:50 +08:00 |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
2015-09-24 13:44:37 +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 |
|
huang
|
6449b2563b
|
1、去掉项目隐藏代码库的功能
2、同步圈子的描述
3、圈子JS实现
|
2015-09-24 11:19: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
|
44b93af307
|
tag浮动
|
2015-09-24 09:52:57 +08:00 |
|
lizanle
|
7383ac7aa9
|
删除贴吧功能
|
2015-09-23 16:36:11 +08:00 |
|
lizanle
|
6ac5b738e3
|
论坛编辑功能
|
2015-09-23 16:27:13 +08:00 |
|
lizanle
|
eed530db2b
|
添加 上传附件的 文字
|
2015-09-23 15:14:37 +08:00 |
|
lizanle
|
272d9fa527
|
论坛的标签可修改
|
2015-09-23 11:02:22 +08:00 |
|
lizanle
|
1d84064221
|
论坛描述长度过长不会换行显示
|
2015-09-23 09:45:24 +08:00 |
|
lizanle
|
c05b1f5959
|
论坛帖子 和回复 计算错误
|
2015-09-23 09:26:16 +08:00 |
|
lizanle
|
7624b917f0
|
添加标签 要限制长度
|
2015-09-21 17:04:41 +08:00 |
|
lizanle
|
27a4954612
|
添加标签 要限制长度
|
2015-09-21 16:08:05 +08:00 |
|
lizanle
|
e81d8f83a5
|
添加标签 要限制长度
|
2015-09-21 16:01:32 +08:00 |
|
lizanle
|
a24ca05157
|
贴吧的描述修改的图标 和 删除标签的图片的显示隐藏问题
|
2015-09-21 10:31:15 +08:00 |