 lizanle
|
7a17186ca3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5b76ae50ef
|
创建学校成功给出提示
|
10 years ago |
 Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
10 years ago |
 cxt
|
76921b184d
|
讨论区单个帖子的二级回复显示不对
|
10 years ago |
 ouyangxuhua
|
2160d508f3
|
1.更改加入项目以及移出项目消息的提示；
2.对于发布作业消息，当作业消息为空时，不显示；
3.消息列表中，“全部”改成“所有消息”
|
10 years ago |
|
cxt
|
770f2f14bd
|
个人动态、课程动态、讨论区、单个帖子页面的图片可点击
|
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 |
|
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 |
|
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 |
|
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
10 years ago |
 huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
6b7800c36b
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
c11905707d
|
非课程成员 --课程动态中不显示 提交 ，匿评等信息
|
10 years ago |
|
huang
|
e747599925
|
作品匿评不显示
|
10 years ago |
|
huang
|
0945fecee6
|
匿评开启后，显示“作品匿评”，点击进入匿评作业列表
|
10 years ago |
|
huang
|
02d4a8383a
|
用户作品提交完成后，框框自动收起
|
10 years ago |
|
huang
|
4917d5917b
|
解决缺陷 --匿评作品列表，点击下拉的区域不展开问题
|
10 years ago |
|
lizanle
|
0c1d7d420e
|
学校的查询与现实问题重做
|
10 years ago |
|
lizanle
|
e382cb5899
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
|
huang
|
32b02f397a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
8daecd3ead
|
解决作品提交者链接错误问题
|
10 years ago |
|
ouyangxuhua
|
c13558f78f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
5f689090b8
|
完善作业消息的内容
|
10 years ago |
|
huang
|
d0ea49d1e9
|
解决项目讨论区置顶功能不能使用问题
|
10 years ago |
|
huang
|
7c8525298c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
554927d517
|
删除项目的时候，项目动态级联删除
|
10 years ago |
|
ouyangxuhua
|
9dc1b75fab
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
b261eed24c
|
提取作业评分消息的评分及评语，用适当的样式显示出来
|
10 years ago |
|
huang
|
9399063886
|
创建版本库控制层及国际化
|
10 years ago |
|
huang
|
a45722b0f5
|
一个项目只能建一个版本库
|
10 years ago |
|
ouyangxuhua
|
69ad8495c7
|
修改作业消息中，评阅了某作评的消息内容
|
10 years ago |
|
Tim
|
7f59902a23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
5d8ebad25c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
20ff1430fc
|
动态回复默认显示3个，“收起回复”、“展开更多”后去掉回复数
|
10 years ago |
|
lizanle
|
d012820a54
|
显示用户的真姓名
|
10 years ago |
|
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
10 years ago |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
|
Tim
|
edbcb534c5
|
加入课程弹窗修改
|
10 years ago |
|
lizanle
|
e5808f3fe8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
918c6f46ba
|
资源全站搜索出现bug
|
10 years ago |
|
Tim
|
58c8851a99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
64ec465126
|
意见反馈窗口调整
|
10 years ago |
guange
|
f2dd1c9467
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
af03d6c00c
|
IE11乱码问题
|
10 years ago |
|
lizanle
|
bd8f2f20a5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a227e37598
|
取消掉贴吧字符长度的限制
|
10 years ago |
|
cxt
|
3ebbcedf1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
10 years ago |
|
guange
|
3a98224f6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
5b2fb66468
|
解决ie11下载乱码问题
|
10 years ago |
|
lizanle
|
2d60555041
|
单个帖子的回复全部展示
|
10 years ago |
|
lizanle
|
26e0f7db0b
|
是老师，就都能编辑，有id，就是只能编辑资源里的tag
|
10 years ago |
|
ouyangxuhua
|
d006c2691b
|
issue模块中，搜索问题时，给出提示信息“请输入问题名称”
|
10 years ago |
|
cxt
|
78e552ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
53a7b1dda4
|
课程讨论区动态按最后更新时间排序
|
10 years ago |
|
cxt
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
10 years ago |
|
lizanle
|
e1c5c02c0d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
71c55667ac
|
forum tag双击可编辑的函数错误，导致编辑器在火狐浏览器插入图片bug
|
10 years ago |
|
lizanle
|
1c72d59f71
|
forum tag双击可编辑的函数错误，导致编辑器在火狐浏览器插入图片bug
|
10 years ago |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
|
ouyangxuhua
|
4d2215646a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
57475f3420
|
作业截止时间快到时，由“某用户发布的作业”，改为“某老师发布的作业”
|
10 years ago |
|
lizanle
|
f024723f8c
|
去掉js的调试语句
|
10 years ago |
|
lizanle
|
d3590b6a6e
|
提交作品 那里 也有引入资源库的需求，也需要分页多选。
|
10 years ago |
|
lizanle
|
44b148b32f
|
act有可能为空，导致500错误
|
10 years ago |
|
lizanle
|
cb4d62d3b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
10 years ago |
|
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标；
|
10 years ago |
|
lizanle
|
590a2480ba
|
没有资源的情况下不要显示全部
|
10 years ago |
|
lizanle
|
122145dbb2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e9055dd113
|
发布作业的时候引入资源的情况，分页列表中的文字被遮挡
|
10 years ago |
|
huang
|
0205fd62d9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
ouyangxuhua
|
8133ba33c7
|
将消息分类为：课程消息、项目消息等
|
10 years ago |
|
ouyangxuhua
|
491e4d12c6
|
1.增加课程问卷、项目讨论、项目新闻对应界面的标题
2.将下拉菜单放在一个局部页面中，以便User_messages页面和User_system_messages都调用它，避免代码重复。
|
10 years ago |
|
ouyangxuhua
|
3d993304e3
|
1.修复作业消息的一些代码bug;
2.调整消息下拉单间距
|
10 years ago |
|
lizanle
|
5ea5cada00
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
d80dffb31c
|
只有课程里才用到了tag 云，
|
10 years ago |
|
ouyangxuhua
|
3955075d03
|
消息中，将用户留言前面的空行去掉
|
10 years ago |
|
ouyangxuhua
|
1fc7bed486
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
3957ca5dc2
|
邮件中，让用户留言以html格式显示
|
10 years ago |
|
huang
|
a7b14e973d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
a9456ca82f
|
让项目留言的内容以html形式显示
|
10 years ago |
|
ouyangxuhua
|
2752512471
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c365f32a17
|
修改邮件中，有些邮件内容不能正常显示的问题。
|
10 years ago |
|
huang
|
e5c64fc43a
|
去掉系统消息判断
|
10 years ago |
|
huang
|
47de084a6c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
d63a049593
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a0f0ecf86d
|
修改未读消息500问题
|
10 years ago |
|
Tim
|
0d85fb3c5f
|
导航栏链接在变色范围内都可点击
|
10 years ago |
|
lizanle
|
11abbca1cf
|
tag_list代码的公用问题
|
10 years ago |
