 huang
|
b3cd3c48d2
|
修改私有样式
|
10 years ago |
 lizanle
|
4c4188835a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
9330418668
|
学校列表div 下拉分页
|
10 years ago |
 ouyangxuhua
|
d0c4230e69
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
1cfa8326aa
|
解决课程作业500问题
|
10 years ago |
|
ouyangxuhua
|
50abd3785a
|
修改作业提示信息，在前面统一加上“某某您好！”
|
10 years ago |
|
huang
|
ce4da2e4af
|
去掉日志打印
|
10 years ago |
|
huang
|
dc1e72a64b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
588bc2ed98
|
页面显示公开/私有
|
10 years ago |
|
ouyangxuhua
|
ec1eddbf07
|
1.学生的“发布了作业”消息，链接到提交作业界面，而非作业提交列表；
2.开课学期具体到某年，如“秋季学期”，改为“2015年秋季学期”
|
10 years ago |
|
lizanle
|
3386c53d76
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
4f1f34ac58
|
暂时屏蔽掉加入课程的分类情况
|
10 years ago |
|
huang
|
dc5721497e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
1f1a8e0770
|
管理员修改学校的功能
|
10 years ago |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
74284e1e71
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
7898208b16
|
私有课程上传资源都为私有
|
10 years ago |
|
ouyangxuhua
|
efbae1f003
|
修改作业消息的内容：把“你”统一改成“您”；发布作业是本人的话，改成“您发布了作业”，而非“某某老师发布了作业”等
|
10 years ago |
 Tim
|
39d347d5c2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
2ca83bc7c4
|
学校修改界面修改
|
10 years ago |
|
ouyangxuhua
|
4deeaa0f34
|
1.增加消息：用户迟交作业时，发送不能参与匿评的消息；
2.增加消息：用户创建课程时，发送创建课程消息。
|
10 years ago |
 cxt
|
9cf1278e99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
cf0fd2022d
|
课程创建动态 项目创建动态
|
10 years ago |
|
huang
|
64fa435a3a
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
f189e3cde8
|
0
|
10 years ago |
|
cxt
|
7359081fd2
|
开启匿评后学生不可删除作品附件
|
10 years ago |
|
lizanle
|
f914d21c3f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5652a60c68
|
js函数节流
|
10 years ago |
guange
|
74fd461fac
|
.
|
10 years ago |
|
guange
|
acbd690bc6
|
添加转换页面
|
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 |
|
lizanle
|
f25015c6b8
|
学校名字中有换行的话，需要将换行变成空格
如果聚焦的时候，学校id存在的话，那么就不需要去查询了。
如果是因为学校不存在的缘故，给出提示，说明学校必须是从下拉列表中选择
|
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
|
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
|
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 |
|
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 |
|
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 |
|
huang
|
61bcdd4643
|
只允许创建一个版本库
|
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 |
|
huang
|
8ab04c652f
|
Merge branch 'develop' into gitlab_guange
|
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 |
|
huang
|
9eb498dbc4
|
版本库 文件目录（未完成--）
|
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 |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
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 |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
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 |
|
lizanle
|
24a3327304
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
1de6e24bfb
|
tag数目的显示方式的更改
|
10 years ago |
|
huang
|
8729399925
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
ddac70c9b8
|
项目成员角色Gitlab一致，单选
添加成员按钮样式调整
|
10 years ago |
|
lizanle
|
f5949ce04f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
467a6c4fba
|
项目tag显示问题
|
10 years ago |
whimlex
|
a2814a8d98
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
171d30e112
|
项目缺陷改为项目问题
|
10 years ago |
|
huang
|
ebe1afd489
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2518305959
|
项目删除跳转修改；项目删除提示修改
|
10 years ago |
|
ouyangxuhua
|
6ad1ee36e2
|
将“项目讨论区”简化为“项目讨论”，与其他列表一致
|
10 years ago |
|
ouyangxuhua
|
77581d46eb
|
1.将所有类型的消息都列出来；
2.修复当消息为空时，浏览器端报错的问题。
|
10 years ago |
|
cxt
|
c6cca9f17e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
0f6ea47792
|
课程讨论区的列表显示
|
10 years ago |
|
ouyangxuhua
|
d20368aa38
|
将消息列表由一行分至两行
|
10 years ago |
 sw
|
7c825baf19
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
2187595b6c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f4b92e110f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
lizanle
|
ba3ce6eca4
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
357a5d4139
|
添加点赞人数
|
10 years ago |
|
huang
|
dab8aa98db
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
6a3312230a
|
邮箱验证不允许中文输入
姓名允许中文输入
|
10 years ago |
|
sw
|
ff5e167e3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
829e94c563
|
enter可修改tag name并且只修改一次
|
10 years ago |
|
lizanle
|
7e4f75f92e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
dc3cb3a26b
|
_logined_header.html头像 鼠标移入就要有效果
|
10 years ago |
|
sw
|
e6bb599a6c
|
TAG批量修改完成
|
10 years ago |
|
huang
|
530d101024
|
项目邀请--姓名、长度JS验证
|
10 years ago |
|
ouyangxuhua
|
97a6487eeb
|
增加开启匿评失败的原因说明
|
10 years ago |
|
ouyangxuhua
|
c4c005a39b
|
修改获取所有消息的排序算法，使用数据库的order
|
10 years ago |
|
huang
|
2768317d08
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
7b18c14aa3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
10 years ago |
|
ouyangxuhua
|
28bbbb1508
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
8841b5221b
|
消息显示内容修改
|
10 years ago |
|
lizanle
|
b51066694e
|
全部 按钮
|
10 years ago |
|
cxt
|
c5133997fa
|
项目缺陷改为项目问题
|
10 years ago |
|
huang
|
fce872a6a5
|
优化issue显示代码
|
10 years ago |
|
lizanle
|
b8be9c6425
|
批量修改tag
|
10 years ago |
|
huang
|
2aeebfe645
|
优化数组排序
有序排序
|
10 years ago |
|
huang
|
0064aa4278
|
系统消息不消失
系统消息和普通消息一致，按照时间排序
待优化点：数组排序
|
10 years ago |
|
cxt
|
0ef84d9691
|
个人主页的“项目缺陷”改为“项目进展”
|
10 years ago |
|
lizanle
|
4a1df8c15a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
418e7e379d
|
编辑室不能移动光标
|
10 years ago |
|
lizanle
|
9291758ef4
|
鼠标移到tag上变手型
|
10 years ago |
|
huang
|
6179e455d2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
10 years ago |
|
lizanle
|
e76f9a169e
|
注释
|
10 years ago |
|
lizanle
|
7cbee4cd53
|
编辑tag有时候不能用
|
10 years ago |
|
lizanle
|
c8357a6364
|
批量修改tag
|
10 years ago |
|
lizanle
|
912fdf480a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
0cd96f579e
|
批量修改tag
|
10 years ago |
|
huang
|
d22234dfe4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
e563354c85
|
项目删除
|
10 years ago |
|
lizanle
|
56db8b4232
|
批量修改tag的bug
|
10 years ago |
|
huang
|
88b8854ed7
|
修改吧主和发帖人消息重复的问题
|
10 years ago |
|
sw
|
fed1a99bec
|
课程动态报500
|
10 years ago |
|
sw
|
af892fa7ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
11314a5366
|
第二个人打分之后，评分结果的样式
|
10 years ago |
|
huang
|
548a18d1fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
edf6f8e1f0
|
消息提示，显示新消息数目
|
10 years ago |
|
sw
|
1acadd1edf
|
1、测试时间显示不正确
2、作品列表时间增加判断
|
10 years ago |
|
sw
|
52eabd5c0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
87e4bfdd3f
|
课程内导入作业却将作业发布到被导入的课程
|
10 years ago |
|
lizanle
|
ecbf1ca692
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
4f8e9ea2cd
|
编辑按钮被注释了
|
10 years ago |
|
sw
|
f2b8e01aee
|
Merge branch 'develop' into szzh
|
10 years ago |
|
Tim
|
b6a8a69be8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
4c5b59ebc8
|
作业动态图标替换
|
10 years ago |
|
lizanle
|
9f9b68ef2a
|
帮助中心报500的问题
|
10 years ago |
|
sw
|
9569bda67c
|
上传图片功能不可 用
|
10 years ago |
|
lizanle
|
b798c6747b
|
删除贴吧 函数名重复了
|
10 years ago |
|
huang
|
cfdaf1f1b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
1eac300fb7
|
去掉打印结果
|
10 years ago |
|
sw
|
2e9d6d396f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
9d122886a9
|
删除帖子会删除贴吧
|
10 years ago |
|
sw
|
a3ce43c3d5
|
去掉与我相关
|
10 years ago |
|
Tim
|
74dc276383
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
f2b2062b9c
|
贴吧点赞位置再调整
|
10 years ago |
|
huang
|
39800b2aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
3f6d64877a
|
1、老师发布作业自己能收到
2、关闭给所有人发
3、修改参数member问题
|
10 years ago |
|
ouyangxuhua
|
17cfa10dca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
b29546cd13
|
评论了项目新闻消息，其内容应该为新闻题目，而非评论内容。
|
10 years ago |
|
Tim
|
852435d708
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
1613f41e77
|
点赞判断
|
10 years ago |
|
cxt
|
fe339e6a8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
03436bca2a
|
贴吧的用户链接可点击
|
10 years ago |
|
Tim
|
0fdf10649c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
a0f4cabcf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
971ff1e692
|
贴吧点赞位置调整
|
10 years ago |
|
sw
|
9beaba0aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
16333d69f7
|
文件列表
|
10 years ago |
|
ouyangxuhua
|
9f5c3ec05c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
ab82fff1a0
|
课程消息中，修改“评论了通知”的内容和tips
|
10 years ago |
|
lizanle
|
9e4896fc7b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
138b24b34c
|
oschina模式的代码插入
|
10 years ago |
|
cxt
|
ce5579c14d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
e2a5819d74
|
课程动态首页的图片可点击
|
10 years ago |
|
sw
|
b22669e36f
|
课程上传图片按钮
|
10 years ago |
|
Tim
|
21408f3843
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
cc99120f25
|
贴吧样式更改
|
10 years ago |
|
lizanle
|
c75487fcf5
|
防止论坛名字太长
|
10 years ago |
|
ouyangxuhua
|
d9c6d9239c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
1f77b05879
|
如果是自己发布的作业消息，提示语改为“您”,而非某某老师
|
10 years ago |
|
lizanle
|
6d74867150
|
清除浮动
|
10 years ago |
|
lizanle
|
de62798d4d
|
点赞按钮位置调整
|
10 years ago |
|
lizanle
|
ea3900b50a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a8bb7ca2bc
|
导航
|
10 years ago |
|
cxt
|
7057247700
|
首页项目动态讨论区回复无法刷新
|
10 years ago |
|
cxt
|
e0b8b7195f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
7f8acf55b8
|
个人首页作业列表配置菜单的隐藏
|
10 years ago |
|
huang
|
f9b3f2a1c3
|
删除版本库部分报错代码
|
10 years ago |
|
ouyangxuhua
|
a4953c3a5a
|
修改开启匿评失败发送邮件的方法错误
|
10 years ago |
|
huang
|
18d028bb7e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
be4b5d94b0
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
4624e26999
|
启动作业匿评失败的信息提醒，判断是本人还是其他人
|
10 years ago |
|
sw
|
3c0a497d4e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
0ecfb7b935
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3d9dcfe250
|
作业的最后更新时间为作品的最新提交时间
|
10 years ago |
|
sw
|
f2d3ec980a
|
点击发布作业，作业列表标题栏自动获得焦点
|
10 years ago |
|
huang
|
da4b00e56c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
d75155e04a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
61061573a7
|
去掉版本库git操作指南
|
10 years ago |
|
sw
|
22b9c6a866
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
sw
|
8585748a92
|
课程内作业列表界面样式调整
|
10 years ago |
|
ouyangxuhua
|
073761781d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
cxt
|
4f20bb2969
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
dea03a4d9f
|
首页动态描述和回复的图片大小的调整和可点击
|
10 years ago |
|
sw
|
ad4fc50fbb
|
1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
|
10 years ago |
|
ouyangxuhua
|
769a4a1bcf
|
1.增加issue截止日期提醒消息；
2.修改相应rake代码
|
10 years ago |
|
lizanle
|
b4cf2f87af
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
eacd37d986
|
帖子的创建和编辑用编辑器
|
10 years ago |
|
huang
|
5b0738a4cb
|
匿评启动失败邮件通知:实现程序及界面
|
10 years ago |
|
ouyangxuhua
|
da5e137795
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
5f26e331c6
|
缺陷截止时间到了消息通知
|
10 years ago |
|
sw
|
9a5dba7773
|
课程内发布、修改、删除作业后跳转仍在课程内的作业列表
|
10 years ago |
|
sw
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
10 years ago |
|
ouyangxuhua
|
b19007f56a
|
修改判断用户是老师的方法
|
10 years ago |
|
huang
|
030f9e945e
|
优化消息整个界面代码
|
10 years ago |
|
ouyangxuhua
|
e9d61a928a
|
修复项目issue中，图片显示超出边界的问题
|
10 years ago |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
10 years ago |
|
huang
|
0a1798eb0b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
c3422460ce
|
匿评失败邮件发送框架
|
10 years ago |
|
huang
|
ba569403c3
|
1、匿评关闭/开启发送对象为所有成员
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
|
10 years ago |
|
huang
|
2873412d1a
|
修改邮件--每天发送-》内容为空的问题
|
10 years ago |
|
ouyangxuhua
|
afbfc9f8b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
b58fcb58de
|
作业消息的内容更新；
更改样式
|
10 years ago |
|
lizanle
|
41a6b8ab06
|
文件名称尽可能的显示完全
|
10 years ago |
|
lizanle
|
08c2b9395e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
4e7b0c5bdf
|
文件名称尽可能的显示完全
|
10 years ago |
|
cxt
|
ea18098a9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
5909df1f69
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
5e0ae3a6bb
|
编辑贴吧描述匡样式修改
|
10 years ago |
|
cxt
|
f5a6d5d349
|
首页的作业动态添加编辑菜单
|
10 years ago |
|
lizanle
|
ea515cbb5d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
f340941e3e
|
贴吧描述（历史数据）显示存在html代码
|
10 years ago |
|
ouyangxuhua
|
e4140ac411
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
ab0013d659
|
1.项目问题中，问题类型为“周报”时，消息提示应为“发布了周报”；
2.stylesheet_link_tag 中，prettify应该加上引号，否则报错。
|
10 years ago |
|
lizanle
|
5174e6eeb8
|
添加删除确认
|
10 years ago |
|
lizanle
|
0b5b643a8e
|
附件与内容距离太大
|
10 years ago |
|
lizanle
|
f2dd69f9b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
62bf136bea
|
标题内容 如果换行，那么就换行显示
|
10 years ago |
|
ouyangxuhua
|
f5de071191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f8d7c61065
|
修改作业消息显示内容及样式
|
10 years ago |
|
cxt
|
3254abf67f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
6a3089bb9b
|
动态的回复图片超出边框
|
10 years ago |
|
ouyangxuhua
|
29b4e174fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f73865b771
|
1.修改作业消息的样式；
2.解决系统消息时间显示问题。
|
10 years ago |
|
cxt
|
9190f0515d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
c250945422
|
修改消息500问题
|
10 years ago |
|
huang
|
4a5dfe1109
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
8c84179650
|
修改issue更新消息重复提示的问题
|
10 years ago |
|
lizanle
|
e092b6c36e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
4845435aa3
|
帖子的编辑长度限制
|
10 years ago |
|
sw
|
aa07c3408f
|
项目资源增加TAG后点击报错
|
10 years ago |
|
sw
|
b84ec1360a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
745a32b684
|
资源库tag修改问题
|
10 years ago |
|
sw
|
9b5a362e24
|
查看附件样式不正确
|
10 years ago |
|
lizanle
|
f54149a5b7
|
发送动态 消息会重复
|
10 years ago |
|
lizanle
|
9a5b83c898
|
如果没有大于两条回复。那么展开回复就要隐藏
|
10 years ago |
|
cxt
|
be932e3b1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
39c5571d73
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c3d829a68f
|
名称检查
|
10 years ago |
|
ouyangxuhua
|
6857b62f00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
31c5cf2163
|
1.将作品评论、回复作品评论等加入至作业消息列表
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
|
lizanle
|
e0c338b497
|
限制字符长度
|
10 years ago |
|
sw
|
fd4a2b19c8
|
课程界面老师数量
|
10 years ago |
|
lizanle
|
a8812dd48e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
959d3f1a93
|
万一长度过大，阻止提交
|
10 years ago |
|
ouyangxuhua
|
c906c7ee1d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
272bd2730a
|
消息中，更新了问题为留言时，去掉“留言内容”几个字；
内容显示主题
|
10 years ago |
|
lizanle
|
c8cbab2d50
|
火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同
|
10 years ago |
