 cxt
|
3ebbcedf1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-13 16:51:57 +08:00 |
 lizanle
|
c9b23c5597
|
贴吧 项目符号 应该显示
|
2015-10-13 15:59:02 +08:00 |
|
cxt
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
2015-10-13 11:03:22 +08:00 |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 17:20:11 +08:00 |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
2015-10-12 17:19:55 +08:00 |
 Tim
|
752494e35e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 16:08:51 +08:00 |
|
Tim
|
d33a6b763d
|
引用资源库弹窗外观调整
|
2015-10-12 16:08:33 +08:00 |
 ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标；
|
2015-10-12 15:08:01 +08:00 |
|
Tim
|
0d85fb3c5f
|
导航栏链接在变色范围内都可点击
|
2015-10-10 11:07:29 +08:00 |
|
Tim
|
9e91429b1e
|
鼠标在侧导航左侧文字颜色不变修复
|
2015-10-10 10:32:08 +08:00 |
|
Tim
|
99e19c51f9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-10 10:24:12 +08:00 |
|
Tim
|
48bd70b9f6
|
个人动态编辑图片显示
|
2015-10-10 10:23:52 +08:00 |
 huang
|
ddac70c9b8
|
项目成员角色Gitlab一致，单选
添加成员按钮样式调整
|
2015-10-10 10:00:11 +08:00 |
|
lizanle
|
724abee12a
|
缩进问题
|
2015-10-09 15:49:50 +08:00 |
|
cxt
|
c6cca9f17e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-09 14:40:49 +08:00 |
|
cxt
|
0f6ea47792
|
课程讨论区的列表显示
|
2015-10-09 14:39:40 +08:00 |
|
lizanle
|
357a5d4139
|
添加点赞人数
|
2015-10-09 14:08:12 +08:00 |
|
huang
|
530d101024
|
项目邀请--姓名、长度JS验证
|
2015-10-09 11:25:21 +08:00 |
|
huang
|
7b18c14aa3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-09 10:34:18 +08:00 |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
2015-10-09 10:33:10 +08:00 |
|
Tim
|
fb5eae3ae2
|
搜索框图标漂移效果清除
|
2015-10-09 10:26:47 +08:00 |
|
Tim
|
0ff58b7631
|
修复了贴吧图片漂移的问题
|
2015-10-09 09:41:36 +08:00 |
|
Tim
|
f5ff94d888
|
资源库固定宽度、作品描述margin、搜索框文字居中
|
2015-10-08 16:35:08 +08:00 |
|
lizanle
|
7d04ce80d4
|
tag为可以点击的时候 是 手型
|
2015-10-08 13:56:17 +08:00 |
|
lizanle
|
d8a4e4d710
|
issue序号丢失的问题
issue缩进以及代码缩进的样式不同 的问题
|
2015-10-08 11:33:52 +08:00 |
|
lizanle
|
56db8b4232
|
批量修改tag的bug
|
2015-10-08 11:08:26 +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
|
c7a9738dc8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:52:44 +08:00 |
|
Tim
|
ff18381f64
|
引用资源库弹框调整
|
2015-09-30 10:52:27 +08:00 |
 sw
|
af892fa7ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:44:00 +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
|
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 |
|
sw
|
d1bb76cfcb
|
调整学生匿评界面提交按钮样式
|
2015-09-30 10:24:20 +08:00 |
|
lizanle
|
d182f532a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-30 10:21:27 +08:00 |
|
lizanle
|
acdb63974f
|
具体课程发布作业的样式
|
2015-09-30 10:21:11 +08:00 |
|
sw
|
9edfa49bcb
|
项目内上传图片按钮
|
2015-09-29 17:41:12 +08:00 |
|
huang
|
278d26e9a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 17:35:37 +08:00 |
|
huang
|
fe83fe31af
|
项目版本库--》内容对比
|
2015-09-29 17:35:22 +08:00 |
|
Tim
|
b6a8a69be8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 17:30:02 +08:00 |
|
Tim
|
4c5b59ebc8
|
作业动态图标替换
|
2015-09-29 17:28:45 +08:00 |
|
lizanle
|
4386f3fddf
|
样式问题
|
2015-09-29 17:29:44 +08:00 |
|
lizanle
|
2c9e46fc77
|
靠左 0间距
|
2015-09-29 16:48:56 +08:00 |
|
lizanle
|
3c01969db1
|
代码缩进
|
2015-09-29 16:06:04 +08:00 |
|
Tim
|
1613f41e77
|
点赞判断
|
2015-09-29 15:44:04 +08:00 |
|
Tim
|
0fdf10649c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:25:01 +08:00 |
|
Tim
|
a0f4cabcf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:24:30 +08:00 |
|
lizanle
|
81092a7e32
|
行高调整
|
2015-09-29 15:24:50 +08:00 |
|
Tim
|
971ff1e692
|
贴吧点赞位置调整
|
2015-09-29 15:24:15 +08:00 |
|
lizanle
|
c8b5ccdd34
|
行高调整
|
2015-09-29 15:23:09 +08:00 |
|
sw
|
9beaba0aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:21:11 +08:00 |
|
sw
|
b22669e36f
|
课程上传图片按钮
|
2015-09-29 14:50:29 +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
|
80fabf0681
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 16:09:55 +08:00 |
|
ouyangxuhua
|
e9d61a928a
|
修复项目issue中，图片显示超出边界的问题
|
2015-09-28 16:08:47 +08:00 |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
2015-09-28 15:52:30 +08:00 |
|
cxt
|
e1348a4845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 15:24:27 +08:00 |
|
cxt
|
038bcdb80e
|
课程动态的作业编辑菜单样式调整
|
2015-09-28 15:24:03 +08:00 |
|
ouyangxuhua
|
eac31cda7f
|
修改个人主页最新动态图片显示超出边界问题
|
2015-09-28 15:13:42 +08:00 |
|
cxt
|
e298f738ed
|
调整课程动态的过滤列表样式
|
2015-09-28 14:10:04 +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
|
474779498b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 14:40:22 +08:00 |
|
ouyangxuhua
|
1935a9caaa
|
调整消息页面的宽度
|
2015-09-25 14:38:41 +08:00 |
|
lizanle
|
7ef48f3fa3
|
标签修改的问题
|
2015-09-25 12:31:52 +08:00 |
|
lizanle
|
9184dddb5e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-25 11:50:05 +08:00 |
|
lizanle
|
3fe5adcaf8
|
统一修改tag 会 和边框有边距
|
2015-09-25 11:49:57 +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 |
|
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
|
b9ff46f8d0
|
帖子的编辑与删除
|
2015-09-24 09:40:53 +08:00 |
|
huang
|
54065e49a7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-23 17:37:31 +08:00 |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
2015-09-23 17:36:36 +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 |