 ouyangxuhua
|
71794ccffc
|
tips显示主题和内容
|
10 years ago |
|
ouyangxuhua
|
1e97f9224f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
400f394d05
|
tips标题
|
10 years ago |
 huang
|
32f90ea591
|
"同意加入"只有自己才能看到
|
10 years ago |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
10 years ago |
 sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
3a4400cfee
|
tips样式
|
10 years ago |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
c8f7655d1e
|
系统消息样式
|
10 years ago |
 cxt
|
cacb3e043a
|
动态回复框的焦点前焦点后样式调整
|
10 years ago |
|
sw
|
1d39df5469
|
C改为大写、编程属性设置的修改
|
10 years ago |
|
ouyangxuhua
|
e8d6fe1e4b
|
显示系统消息标题
|
10 years ago |
|
ouyangxuhua
|
9c74ff0b34
|
1.系统消息显示主题；
2.系统消息中冒号修改为中文形式
|
10 years ago |
|
cxt
|
20ea692260
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
154cd7de6f
|
子域名的更改
|
10 years ago |
|
sw
|
cf2a00d7a8
|
作业列表增加：编程语言提示，匿评阶段提示
|
10 years ago |
|
sw
|
9d9ed24d1b
|
111
|
10 years ago |
|
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
huang
|
bc422dd25e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
f823046bc3
|
完成课程留言点对点逻辑结构
|
10 years ago |
|
cxt
|
ad610cb0b2
|
测试集输入输出框的自适应高度
|
10 years ago |
|
ouyangxuhua
|
989d74bf70
|
修改消息tips样式
|
10 years ago |
|
huang
|
e09cdb2587
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
3b5e7f3012
|
公共贴吧消息样式
|
10 years ago |
|
ouyangxuhua
|
7934b59395
|
增加break_word
|
10 years ago |
|
ouyangxuhua
|
7694a8fd2c
|
所有消息里的系统消息样式
|
10 years ago |
|
cxt
|
8f317711b8
|
动态回复框高度的自适应
|
10 years ago |
|
ouyangxuhua
|
6f9c10651c
|
修改系统消息样式
|
10 years ago |
|
ouyangxuhua
|
43eeb8f457
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
d31b1d99a9
|
修改系统消息样式
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
 Tim
|
a99d56b2e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
3dccf8f77d
|
动态页面菜单栏图标更改；
提交作业界面图标宽度更改。
|
10 years ago |
|
cxt
|
6c99674798
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3f7c69e8e1
|
动态的判断
|
10 years ago |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
|
huang
|
e7fc0ca6d3
|
休整消息样式
|
10 years ago |
|
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
10 years ago |
|
Tim
|
9a735c7157
|
模拟测试提示添加
|
10 years ago |
|
Tim
|
5612bb47dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
0930815086
|
回复头像模糊效果
|
10 years ago |
|
cxt
|
036129a622
|
动态回复后的回复框样式不改变
|
10 years ago |
|
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
10 years ago |
|
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
10 years ago |
|
Tim
|
3d5f93b938
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_activities.html.erb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
3bdab22aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a184ab4b69
|
个人动态首页只显示第一个动态的回复框，其它的需点击才显示
|
10 years ago |
|
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
10 years ago |
|
ouyangxuhua
|
5155e8794f
|
将课程留言加入消息队列
|
10 years ago |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
|
Tim
|
77a8c18a77
|
1.关于我们样式修改；
2.登录界面格式调整；
3.个人动态回复样式调整；
|
10 years ago |
|
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
fddf466ce1
|
将发布作业时的引用资源库的“确定”“取消”按钮改成整个按钮可点击
|
10 years ago |
|
cxt
|
0a2bfa1bdb
|
个人主页动态的缺陷回复与缺陷页面的回复内容不一致
|
10 years ago |
|
cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
10 years ago |
|
sw
|
f79b2cda94
|
提交作品关联项目功能
|
10 years ago |
|
cxt
|
a999897efa
|
动态回复头像的调整
|
10 years ago |
|
ouyangxuhua
|
9ba0d3293e
|
修改系统消息提示样式
|
10 years ago |
|
huang
|
4a7d3c9072
|
系统消息增加长度
|
10 years ago |
|
sw
|
4a9fd15bfd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
8f3889e2c5
|
编程作品提交框自动增高
|
10 years ago |
|
huang
|
169c7f3a97
|
修改消息判断作业重复
|
10 years ago |
|
sw
|
da269ef716
|
发布作业，请先输入作业标题
|
10 years ago |
|
sw
|
4ee4bb6e9d
|
编辑作业
|
10 years ago |
|
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
10 years ago |
|
sw
|
a3d628dc17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
760b70971a
|
取消导入编程作业时对homework_type的赋值
|
10 years ago |
|
sw
|
90a52aa01b
|
导入编程作业后、测试集数量不显示的问题
|
10 years ago |
|
sw
|
37f235c2ab
|
导入编程作业
|
10 years ago |
|
huang
|
3da6593720
|
查看别人的页面时不显示“全部设为已读”
|
10 years ago |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
10 years ago |
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
10 years ago |
 lizanle
|
dc32bba5fd
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
17b4b31449
|
隐藏个人中心的回复 textarea编辑框
|
10 years ago |
|
ouyangxuhua
|
22e2510482
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
3044b07df7
|
系统消息颜色
|
10 years ago |
|
huang
|
c0437ae992
|
作业截止时间提醒界面！
|
10 years ago |
|
huang
|
f1e0eed5a8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
sw
|
f4c19c0fb0
|
1、homework.js on改为live
2、导入作业之后，编程功能按钮消失
|
10 years ago |
|
sw
|
dfed4885de
|
新建作业，取消之后编程设置按钮消失
|
10 years ago |
|
ouyangxuhua
|
36e9c20e59
|
系统消息
|
10 years ago |
|
huang
|
08c222266a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
4ea20b707c
|
定义消息标题类型方法
|
10 years ago |
|
ouyangxuhua
|
9e61ceefa9
|
系统消息修改
|
10 years ago |
|
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
10 years ago |
|
sw
|
6730c4da84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
66636efda9
|
修改普通作业
|
10 years ago |
|
lizanle
|
2beb85561a
|
上传资源后，全选按钮和已选择资源数清空
|
10 years ago |
|
sw
|
f0bd113a5e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
93b179c958
|
修改普通作业
|
10 years ago |
|
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
10 years ago |
|
ouyangxuhua
|
06fea1bf1d
|
系统消息显示
|
10 years ago |
|
cxt
|
e6d5d17859
|
轻抚展开更多->展开更多
|
10 years ago |
|
sw
|
fce5405c41
|
发布作业界面样式调整
|
10 years ago |
|
ouyangxuhua
|
fb155c8458
|
系统消息注释
|
10 years ago |
|
ouyangxuhua
|
596c512d0a
|
系统消息
|
10 years ago |
|
sw
|
1d9fda7eeb
|
Merge branch 'guange_homework' into develop
|
10 years ago |
|
sw
|
8d415b0856
|
取消作业列表的编辑按钮
|
10 years ago |
|
sw
|
97a944ff27
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
97f9d4fa60
|
增加教师节祝福语
|
10 years ago |
|
cxt
|
50aa22c5e5
|
个人动态的“点击展开更多”改为“轻抚展开更多”，鼠标移到方框上即自动加载更多动态
|
10 years ago |
|
huang
|
0aa8c5b5cc
|
完成系统消息通知功能
|
10 years ago |
|
sw
|
1bf90739be
|
调整从资源库选择资源到作业、作品中弹框的初始位置
|
10 years ago |
|
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
1dd4700eb2
|
个人中心留言功能 编辑框自适应高度
|
10 years ago |
|
huang
|
1a6f81f302
|
用户申请，区分已读和未读
|
10 years ago |
|
huang
|
51d964d371
|
点击消息链接定位到对应页面的某一点
|
10 years ago |
|
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能（管理员收到消息提醒）
|
10 years ago |
|
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
10 years ago |
|
sw
|
137a0b16a0
|
1、文件的样式图片
2、点击编程弹框时，测试输入获取焦点
|
10 years ago |
|
guange
|
52c2719a46
|
去掉老式的编程作业提交
|
10 years ago |
|
cxt
|
6f64152ec7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
cdca8dea4d
|
去掉缺陷描述的图片点击显示大图后的蓝色边框
|
10 years ago |
|
lizanle
|
23e60bf007
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
de822daf44
|
个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
|
10 years ago |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
guange
|
9e9f373a76
|
发布作业优化
|
10 years ago |
|
guange
|
04dffb2f89
|
模拟回答界面调整
|
10 years ago |
|
cxt
|
a86d2aaadd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
32b2d4f874
|
点击动态中的图片即显示大图
|
10 years ago |
|
huang
|
0a45e08488
|
1、消息为0的时候不显示 消息数和“全部设置已读”。
2、消息不为空，未读消息为空的时候不显示“全部设为已读”
|
10 years ago |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
10 years ago |
|
lizanle
|
e8c5627c41
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
6bcaf01fe2
|
课程弹出框样式不对
|
10 years ago |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
10 years ago |
|
guange
|
53cea36329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
216bc7f70f
|
动态中作业的提交状态修改
|
10 years ago |
|
cxt
|
0dc47279de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
7a28a65807
|
问卷动态不显示的缺陷修复
|
10 years ago |
|
huang
|
b771cc0fe1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
abf053fc99
|
Merge branch 'develop' into szzh
|
10 years ago |
|
huang
|
b89218a1b3
|
消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
|
10 years ago |
|
sw
|
9f8fee8267
|
个人积分报500
|
10 years ago |
|
cxt
|
8ecf70588d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
55758c3c2f
|
筛选掉未发布的问卷动态
|
10 years ago |
|
lizanle
|
baf3d90836
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
704337fe56
|
全选所有资源，然后再用关键字过滤，全选checkbox和选择资源的个数应该清空
|
10 years ago |
|
cxt
|
d274b675db
|
去掉动态中的“缺陷描述”、“通知描述”等文字
|
10 years ago |
|
lizanle
|
9caa7a421a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
f8c85ccb83
|
个人动态页面 回复框固定高度减少
|
10 years ago |
|
guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
10 years ago |
|
huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
10 years ago |
|
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
10 years ago |
|
huang
|
02ace5693f
|
去掉项目多余的横线
|
10 years ago |
|
guange
|
8ac8edeb71
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
10 years ago |
|
huang
|
719cbee3ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a78b28f1b7
|
0条消息则不显示“全部设为已读”
|
10 years ago |
|
guange
|
f6edbb238e
|
隐去编程作业的得分
|
10 years ago |
|
guange
|
bacb5f859b
|
merge
|
10 years ago |
|
guange
|
a69cee4b26
|
老师测试功能
|
10 years ago |
|
huang
|
a47c9176b7
|
注释掉消息迁移文件
修改消息html样式
|
10 years ago |
|
sw
|
359e34471b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
7424c82eae
|
留言框高度
|
10 years ago |
|
huang
|
c7f15d3a3e
|
修改留言html样式
|
10 years ago |
|
huang
|
1ba0c86828
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
70f80bb36f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
7d6d349c4d
|
讨论区鼠标经过显示html代码
|
10 years ago |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
10 years ago |
|
cxt
|
69cba79926
|
修改动态的显示时间
|
10 years ago |
|
huang
|
86405b8a3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
suntao
|
b24909df8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
1fff00bab0
|
回复模块改动
|
10 years ago |
|
sw
|
45c54dabad
|
课程内创建作业代码还原
|
10 years ago |
|
sw
|
e360ea0bc7
|
回复框高度为50px
|
10 years ago |
|
huang
|
fcb9978a05
|
消息鼠标经过时显示html内容
|
10 years ago |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
10 years ago |
|
sw
|
9df301b4cc
|
取消无用参数
|
10 years ago |
|
sw
|
917442c0e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_list.html.erb
|
10 years ago |
|
sw
|
05739931f3
|
作业列表点击加载更多
|
10 years ago |
|
cxt
|
9f494bc14a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
70c2f7de1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_activities.html.erb
|
10 years ago |
|
huang
|
a05a3074dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a94d5928d4
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
63f52ea9bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3208574a5e
|
作业和首页的加载更多传递page参数
|
10 years ago |
|
sw
|
594faabcbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
c2dbd9449e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/user_homeworks.html.erb
|
10 years ago |
|
huang
|
fcdf9b3fc1
|
清理数据
|
10 years ago |
|
sw
|
53c57668aa
|
点击显示更多按钮的显示与隐藏
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
suntao
|
9b8270aed1
|
Banner padding调整
|
10 years ago |
|
sw
|
8acc432f91
|
项目讨论区回复刷新
|
10 years ago |
|
sw
|
c4da4b6c09
|
项目缺陷回复刷新
|
10 years ago |
|
sw
|
2538797a52
|
课程论坛回复刷新
|
10 years ago |
|
sw
|
bbf4478fc0
|
课程通知回复后不能及时刷新页面
|
10 years ago |
|
sw
|
3b153766f6
|
过滤之后点击展开更多相关BUG
|
10 years ago |
|
sw
|
9728437953
|
作业界面样式
|
10 years ago |
|
sw
|
6b1e0b1407
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
guange
|
d5be41eebc
|
merge
|
10 years ago |
|
guange
|
45dd48069e
|
submit不能提交的问题
|
10 years ago |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
10 years ago |
|
sw
|
e42b6d65db
|
导入作业之后显示所有的作业信息
|
10 years ago |
|
sw
|
b0060fc03b
|
请选择发送的课程选择
|
10 years ago |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
10 years ago |
