guange
|
01d716d61f
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
guange
|
3a21e9f2b0
|
修复重构错误
|
10 years ago |
 huang
|
765d2b875d
|
还原目录显示
|
10 years ago |
 cxt
|
bfdfde8028
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
7dd6618345
|
非课程成员不能将帖子置顶和锁定
|
10 years ago |
 ouyangxuhua
|
86cd27eb17
|
消息中，系统消息的标题显示“系统消息”，而非“消息”
|
10 years ago |
|
guange
|
6086c9304e
|
merge
|
10 years ago |
 lizanle
|
f25015c6b8
|
学校名字中有换行的话，需要将换行变成空格
如果聚焦的时候，学校id存在的话，那么就不需要去查询了。
如果是因为学校不存在的缘故，给出提示，说明学校必须是从下拉列表中选择
|
10 years ago |
|
guange
|
9e8e77f3e1
|
方法重构
|
10 years ago |
|
huang
|
b48d0ff377
|
Merge branch 'szzh' into develop
|
10 years ago |
|
lizanle
|
7e4694f71e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
1b2bbdc577
|
学校名字中有换行的话，需要将换行变成空格
如果聚焦的时候，学校id存在的话，那么就不需要去查询了。
如果是因为学校不存在的缘故，给出提示，说明学校必须是从下拉列表中选择
|
10 years ago |
|
huang
|
b1ba6d576a
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
5c57403041
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
f58d68c61a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
26eda763fe
|
帖子锁定时动态的样式调整
|
10 years ago |
|
huang
|
178752ba8f
|
将“作品”改成“提交”
|
10 years ago |
|
huang
|
d0eba5cc37
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
07ff8d2eb7
|
老师，非课程成员 课程动态中显示 -- 提交（作品数）
|
10 years ago |
|
ouyangxuhua
|
4d246de1c6
|
对于被拉入或者移出某私有项目对应的消息，当用户没有访问权限，应给出提示
|
10 years ago |
|
cxt
|
bdf7bdc13e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
5f3c8d928d
|
作业批次下拉列表的样式修改
|
10 years ago |
|
lizanle
|
f53867a841
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
707244886c
|
学校列表分页
|
10 years ago |
 Tim
|
1414924c78
|
课程留言格式调整
|
10 years ago |
|
Tim
|
4dddbe9dc7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_journalsformessage.html.erb
|
10 years ago |
|
lizanle
|
7a17186ca3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5b76ae50ef
|
创建学校成功给出提示
|
10 years ago |
|
Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
10 years ago |
|
cxt
|
c77505392a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
76921b184d
|
讨论区单个帖子的二级回复显示不对
|
10 years ago |
|
ouyangxuhua
|
2160d508f3
|
1.更改加入项目以及移出项目消息的提示；
2.对于发布作业消息，当作业消息为空时，不显示；
3.消息列表中，“全部”改成“所有消息”
|
10 years ago |
|
lizanle
|
7961149d2a
|
解决kindeditor报错问题
|
10 years ago |
|
cxt
|
fef0475c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
770f2f14bd
|
个人动态、课程动态、讨论区、单个帖子页面的图片可点击
|
10 years ago |
|
lizanle
|
ec316e580f
|
ke复制贴图url不对
|
10 years ago |
|
ouyangxuhua
|
dd08a8232d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
2f2ad38cdf
|
1.用户被拉入项目，发送相应消息给该用户；
2.用户被移出项目，发送消息给该用户。
|
10 years ago |
|
cxt
|
a16dc09afa
|
讨论区帖子图片可点击
|
10 years ago |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
9a0c9ecc77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
cxt
|
998c7e1c1b
|
课程讨论区单个帖子页面的图片超出边框
|
10 years ago |
|
lizanle
|
e3a660cf18
|
添加学校
|
10 years ago |
|
huang
|
778ff80b55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
94d60e4150
|
修改邮件配置文件
更新gem镜像路径
|
10 years ago |
|
cxt
|
c5b881cb43
|
发布帖子按钮的样式调整
|
10 years ago |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
10 years ago |
|
cxt
|
0f0351b343
|
解决冲突
|
10 years ago |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
10 years ago |
