 guange
|
01d716d61f
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-10-18 13:20:40 +08:00 |
|
guange
|
3a21e9f2b0
|
修复重构错误
|
2015-10-18 13:16:58 +08:00 |
 huang
|
765d2b875d
|
还原目录显示
|
2015-10-16 20:06:03 +08:00 |
|
guange
|
6086c9304e
|
merge
|
2015-10-16 17:00:46 +08:00 |
|
guange
|
9e8e77f3e1
|
方法重构
|
2015-10-16 16:57:45 +08:00 |
|
huang
|
b1ba6d576a
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 16:52:44 +08:00 |
|
huang
|
5c57403041
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 16:50:13 +08:00 |
 cxt
|
f58d68c61a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 16:31:44 +08:00 |
|
cxt
|
26eda763fe
|
帖子锁定时动态的样式调整
|
2015-10-16 16:31:31 +08:00 |
|
huang
|
178752ba8f
|
将“作品”改成“提交”
|
2015-10-16 15:42:10 +08:00 |
|
huang
|
d0eba5cc37
|
Merge branch 'szzh' into develop
|
2015-10-16 15:24:39 +08:00 |
|
huang
|
07ff8d2eb7
|
老师，非课程成员 课程动态中显示 -- 提交（作品数）
|
2015-10-16 15:23:34 +08:00 |
|
cxt
|
bdf7bdc13e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 14:51:47 +08:00 |
|
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
2015-10-16 14:51:30 +08:00 |
 lizanle
|
f53867a841
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-16 14:49:13 +08:00 |
|
lizanle
|
707244886c
|
学校列表分页
|
2015-10-16 14:48:59 +08:00 |
 Tim
|
1414924c78
|
课程留言格式调整
|
2015-10-16 11:01:52 +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 |
|
lizanle
|
7a17186ca3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-16 10:54:41 +08:00 |
|
lizanle
|
5b76ae50ef
|
创建学校成功给出提示
|
2015-10-16 10:54:28 +08:00 |
|
Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
2015-10-16 10:54:22 +08:00 |
|
cxt
|
c77505392a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 10:42:17 +08:00 |
|
cxt
|
76921b184d
|
讨论区单个帖子的二级回复显示不对
|
2015-10-16 10:42:07 +08:00 |
|
lizanle
|
7961149d2a
|
解决kindeditor报错问题
|
2015-10-16 10:30:34 +08:00 |
|
cxt
|
fef0475c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-16 10:19:05 +08:00 |
|
cxt
|
770f2f14bd
|
个人动态、课程动态、讨论区、单个帖子页面的图片可点击
|
2015-10-16 10:18:51 +08:00 |
|
lizanle
|
ec316e580f
|
ke复制贴图url不对
|
2015-10-16 10:07:10 +08:00 |
|
cxt
|
a16dc09afa
|
讨论区帖子图片可点击
|
2015-10-16 09:26:13 +08:00 |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 09:07:38 +08:00 |
|
cxt
|
9a0c9ecc77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 17:07:02 +08:00 |
|
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-15 17:06:53 +08:00 |
|
cxt
|
998c7e1c1b
|
课程讨论区单个帖子页面的图片超出边框
|
2015-10-15 17:06:48 +08:00 |
|
lizanle
|
e3a660cf18
|
添加学校
|
2015-10-15 17:06:42 +08:00 |
|
huang
|
778ff80b55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 17:02:40 +08:00 |
|
huang
|
94d60e4150
|
修改邮件配置文件
更新gem镜像路径
|
2015-10-15 17:02:16 +08:00 |
|
cxt
|
c5b881cb43
|
发布帖子按钮的样式调整
|
2015-10-15 16:59:17 +08:00 |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
2015-10-15 16:44:49 +08:00 |
|
cxt
|
0f0351b343
|
解决冲突
|
2015-10-15 16:28:03 +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 |
|
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 15:47:59 +08:00 |
|
huang
|
6b7800c36b
|
Merge branch 'dev_hjq' into szzh
|
2015-10-15 15:47:38 +08:00 |
|
huang
|
c11905707d
|
非课程成员 --课程动态中不显示 提交 ，匿评等信息
|
2015-10-15 15:43:40 +08:00 |
|
huang
|
e747599925
|
作品匿评不显示
|
2015-10-15 15:26:32 +08:00 |
|
huang
|
0945fecee6
|
匿评开启后，显示“作品匿评”，点击进入匿评作业列表
|
2015-10-15 15:20:40 +08:00 |
|
huang
|
02d4a8383a
|
用户作品提交完成后，框框自动收起
|
2015-10-15 15:00:05 +08:00 |
|
huang
|
4917d5917b
|
解决缺陷 --匿评作品列表，点击下拉的区域不展开问题
|
2015-10-15 14:27:45 +08:00 |
|
lizanle
|
0c1d7d420e
|
学校的查询与现实问题重做
|
2015-10-15 13:54:37 +08:00 |
|
lizanle
|
e382cb5899
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-15 12:05:07 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |