 lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
2015-10-26 10:21:13 +08:00 |
 ouyangxuhua
|
6924a3e7bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-24 16:13:05 +08:00 |
|
ouyangxuhua
|
a42a58fb42
|
修改火狐浏览器出现多余省略号的问题
|
2015-10-24 16:09:44 +08:00 |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |
 cxt
|
274db8d080
|
作品列表页面的作业信息添加附件的显示
|
2015-10-24 14:53:49 +08:00 |
|
ouyangxuhua
|
16f0868df3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 16:28:40 +08:00 |
|
ouyangxuhua
|
bc3fbc270f
|
将学生改成同学
|
2015-10-23 16:28:22 +08:00 |
 Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
2015-10-23 16:26:58 +08:00 |
|
Tim
|
83b984a909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 15:46:09 +08:00 |
|
Tim
|
b063be917b
|
附件图标更改；弹窗文字上padding减小
|
2015-10-23 15:45:48 +08:00 |
|
ouyangxuhua
|
4a188dc81d
|
对所有作业消息，统一在内容前加圆点，并且调整颜色
|
2015-10-23 14:28:24 +08:00 |
|
ouyangxuhua
|
9375227250
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 09:33:29 +08:00 |
|
ouyangxuhua
|
7845a0e712
|
修改作业消息的内容及样式
|
2015-10-23 09:33:16 +08:00 |
|
cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
2015-10-22 17:42:02 +08:00 |
|
cxt
|
4b6f8efc5a
|
作品列表添加作业信息
|
2015-10-22 16:57:36 +08:00 |
|
Tim
|
ad77104485
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-20 10:23:03 +08:00 |
|
Tim
|
f59593cc1c
|
学校信息修改样式更改
|
2015-10-20 10:22:47 +08:00 |
 huang
|
b3cd3c48d2
|
修改私有样式
|
2015-10-20 10:11:43 +08:00 |
|
Tim
|
787b3fa5d4
|
贴吧点赞图标颜色更换
|
2015-10-19 17:20:41 +08:00 |
|
Tim
|
2ca83bc7c4
|
学校修改界面修改
|
2015-10-19 15:51:27 +08:00 |
|
cxt
|
7dd6618345
|
非课程成员不能将帖子置顶和锁定
|
2015-10-16 17:32:17 +08:00 |
|
cxt
|
26eda763fe
|
帖子锁定时动态的样式调整
|
2015-10-16 16:31:31 +08:00 |
|
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
2015-10-16 14:51:30 +08:00 |
|
Tim
|
4dddbe9dc7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_journalsformessage.html.erb
|
2015-10-16 10:58:28 +08:00 |
|
Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
2015-10-16 10:54:22 +08:00 |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
2015-10-15 16:44:49 +08:00 |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
|
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
2015-10-15 16:17:48 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
2015-10-14 11:38:16 +08:00 |
|
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 |