 cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
10 years ago |
 huang
|
7a014e1f79
|
解决bug：自动注册用户时，邮箱名过长超过login限制
解决方法：login长度和邮箱长度同步
|
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
|
b943a1de63
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
 ouyangxuhua
|
d4e1c62989
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
99d6012718
|
项目邀请
|
10 years ago |
 sw
|
47cdf1231d
|
匿评评分，成绩提示框的显示
|
10 years ago |
|
sw
|
53d6c6853d
|
作品列表的显示
|
10 years ago |
|
huang
|
b5f4b1dd96
|
功能：24小时内系统消息显示
|
10 years ago |
|
huang
|
e7fc0ca6d3
|
休整消息样式
|
10 years ago |
|
huang
|
cfcf1f8103
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
10 years ago |
|
ouyangxuhua
|
d21dce566f
|
修改新闻显示的word-break 和 word-wrap
|
10 years ago |
|
sw
|
efdd717c3c
|
成绩计算算法的实现
|
10 years ago |
 Tim
|
9a735c7157
|
模拟测试提示添加
|
10 years ago |
|
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
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 |
|
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
10 years ago |
|
sw
|
1ed1957899
|
教辅评分、系统评分、学生匿评 比例默认设置
|
10 years ago |
|
sw
|
22d4499f8f
|
缺评、迟交扣分还是改为 直接扣多少分
|
10 years ago |
|
cxt
|
036129a622
|
动态回复后的回复框样式不改变
|
10 years ago |
|
sw
|
fa9008d396
|
作品在非匿评阶段的显示
|
10 years ago |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
10 years ago |
|
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
10 years ago |
|
huang
|
94f91a85e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
10 years ago |
|
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
10 years ago |
|
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
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 |
|
sw
|
939a010adb
|
静态页面添加
|
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
|
e2024716e9
|
显示问题差别的html样式
|
10 years ago |
|
sw
|
c21cea85f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
30e703b9bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
cxt
|
a714b10860
|
阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充
|
10 years ago |
|
ouyangxuhua
|
99b300b225
|
问题对比显示
|
10 years ago |
|
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
10 years ago |
|
ouyangxuhua
|
5155e8794f
|
将课程留言加入消息队列
|
10 years ago |
|
huang
|
b43acd3a46
|
邀请用户加入项目：
特殊情况：用户登录名=邮箱名，用户修改邮箱，此时将用户作为条件邀请
|
10 years ago |
|
huang
|
78ca55f121
|
优化邮件邀请策略
|
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 |
|
ouyangxuhua
|
3edeb81ba5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
cxt
|
fddf466ce1
|
将发布作业时的引用资源库的“确定”“取消”按钮改成整个按钮可点击
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
sw
|
9ee82c57be
|
去掉课程模块的导航栏
|
10 years ago |
|
ouyangxuhua
|
3bd62310ad
|
增加word-wrap及word-break
|
10 years ago |
|
cxt
|
0a2bfa1bdb
|
个人主页动态的缺陷回复与缺陷页面的回复内容不一致
|
10 years ago |
|
sw
|
cd96fd99a8
|
快速创建项目
|
10 years ago |
|
cxt
|
5ccace15da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
10 years ago |
|
sw
|
f79b2cda94
|
提交作品关联项目功能
|
10 years ago |
|
sw
|
fff9c44271
|
学生没有课程和项目时，课程和项目导航有2条线
|
10 years ago |
|
huang
|
9189ddd63b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
295921c89d
|
邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
10 years ago |
 lizanle
|
1b9bde2284
|
课程资源的标签库可点击更改
|
10 years ago |
|
lizanle
|
71c0bd9b43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
10 years ago |
|
cxt
|
e10e5e8412
|
调整课程通知页面的回复头像样式
|
10 years ago |
|
cxt
|
a999897efa
|
动态回复头像的调整
|
10 years ago |
|
cxt
|
d0c19124b7
|
将课程的“私有”标志改成不可点击
|
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 |
|
sw
|
1673f4f960
|
1、老师打开编程作品报错
2、隐藏开启匿评按钮
|
10 years ago |
|
huang
|
169c7f3a97
|
修改消息判断作业重复
|
10 years ago |
|
sw
|
da269ef716
|
发布作业，请先输入作业标题
|
10 years ago |
|
huang
|
0233c9b14b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
0d595c5feb
|
修改系统消息提交按钮
|
10 years ago |
|
sw
|
4ee4bb6e9d
|
编辑作业
|
10 years ago |
|
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
sw
|
b1a17f1b6b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ecf2ac5e19
|
课程内发布作业增加提示
|
10 years ago |
|
cxt
|
86f0889f5b
|
"我的动态"显示当前用户的个人动态
|
10 years ago |
|
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
585818fe7a
|
讨论区动态重复出现
|
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 |
|
ouyangxuhua
|
b053a1e43c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/models/system_message.rb
app/views/admin/messages.html.erb
处理冲突、发布系统消息JS提醒！
|
10 years ago |
|
ouyangxuhua
|
67dcb025aa
|
系统消息-修改
|
10 years ago |
|
huang
|
3da6593720
|
查看别人的页面时不显示“全部设为已读”
|
10 years ago |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
6209250e6d
|
内容长度提醒
|
10 years ago |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
10 years ago |
|
sw
|
4405a31c9c
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
10 years ago |
|
huang
|
64bce0261d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
3bfdff81ba
|
去掉项目组织
|
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 |
|
sw
|
487f46bb32
|
上传图片后大小问题
|
10 years ago |
|
guange
|
37e1b6d2a1
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
cxt
|
7d6b9005a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
2da3454bc5
|
暂时屏蔽课程复制功能
|
10 years ago |
|
cxt
|
1855adb037
|
未登录用户不能访问新建课程页面
|
10 years ago |
|
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
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
|
527ff41d43
|
1、编程作业开启匿评之后提交作品的提示
2、匿评弹框不可关闭
|
10 years ago |
|
sw
|
dfed4885de
|
新建作业，取消之后编程设置按钮消失
|
10 years ago |
|
ouyangxuhua
|
36e9c20e59
|
系统消息
|
10 years ago |
|
sw
|
7db774eedb
|
新建作业时，匿评相关属性为作业必须属性
|
10 years ago |
|
sw
|
30ebe9b2d5
|
1、编程作业可以开启匿评
2、取消扣分标准的显示
|
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
|
0bb8b175e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
9e61ceefa9
|
系统消息修改
|
10 years ago |
|
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
10 years ago |
|
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
10 years ago |
|
sw
|
948a6c9138
|
隐藏教师节相关信息
|
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 |
|
huang
|
001c2f48f6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
92a3d78dcc
|
完成作业截止定时发送消息
|
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 |
|
guange
|
424f674da9
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
10 years ago |
|
ouyangxuhua
|
06fea1bf1d
|
系统消息显示
|
10 years ago |
|
lizanle
|
cc6fe754d4
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
10 years ago |
|
cxt
|
e6d5d17859
|
轻抚展开更多->展开更多
|
10 years ago |
|
cxt
|
5f0aac9265
|
点击打开编辑资料，显示保存的性别
|
10 years ago |
|
sw
|
fce5405c41
|
发布作业界面样式调整
|
10 years ago |
|
ouyangxuhua
|
fb155c8458
|
系统消息注释
|
10 years ago |
|
ouyangxuhua
|
596c512d0a
|
系统消息
|
10 years ago |
|
guange
|
a29ab60481
|
老师的测试结果能显示出来
|
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
|
a18a014943
|
Merge branch 'szzh' into develop
|
10 years ago |
|
sw
|
97f9d4fa60
|
增加教师节祝福语
|
10 years ago |
|
cxt
|
50aa22c5e5
|
个人动态的“点击展开更多”改为“轻抚展开更多”，鼠标移到方框上即自动加载更多动态
|
10 years ago |
|
sw
|
a841c20896
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
e30abd2a81
|
提交、修改作品界面宽度
|
10 years ago |
|
cxt
|
5b14dbba45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
6ed0a151dc
|
头像下拉框的样式修改
|
10 years ago |
|
ouyangxuhua
|
3db692dc39
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0aa8c5b5cc
|
完成系统消息通知功能
|
10 years ago |
|
ouyangxuhua
|
1feb7022c7
|
修改系统消息为kindeditor
|
10 years ago |
|
huang
|
13397363db
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
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 |
|
sw
|
adcd3b1ad5
|
去掉无用加载的js
|
10 years ago |
|
sw
|
401b0bc7e3
|
textarea自动拉伸高度优化，编辑普通作业作品功能完成
|
10 years ago |
|
sw
|
b1463f0864
|
学生提交匿评作业作品功能实现
|
10 years ago |
|
ouyangxuhua
|
30efa6c8c7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
20bef515da
|
issue周报发送消息给所有管理员
|
10 years ago |
|
lizanle
|
4b1153d0a5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
1dd4700eb2
|
个人中心留言功能 编辑框自适应高度
|
10 years ago |
|
cxt
|
7474d19120
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
040f3f588d
|
鼠标移到头像上方，才显示账户下拉菜单
|
10 years ago |
|
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知，讨论区，留言都可以自动的长高，缩短
|
10 years ago |
|
huang
|
146d877254
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
1a6f81f302
|
用户申请，区分已读和未读
|
10 years ago |
|
sw
|
e040c20f08
|
admin界面，最后登录的用户列表报错
|
10 years ago |
|
lizanle
|
169c56a58d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
3b9d1d6200
|
讨论区编辑框可以自动长高缩短
|
10 years ago |
|
sw
|
068b03cd8f
|
Merge branch 'guange_homework' of http://repository.trustie.net/xianbo/trustie2 into guange_homework
|
10 years ago |
|
guange
|
c413d66c44
|
程序作业打分
|
10 years ago |
|
ouyangxuhua
|
71f8fca68b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
a7f2f0a6d2
|
项目版本库错误提示信息设置为flash.now[:error]
|
10 years ago |
|
huang
|
51d964d371
|
点击消息链接定位到对应页面的某一点
|
10 years ago |
|
huang
|
06753497bb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能（管理员收到消息提醒）
|
10 years ago |
|
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
10 years ago |
|
sw
|
137a0b16a0
|
1、文件的样式图片
2、点击编程弹框时，测试输入获取焦点
|
10 years ago |
|
ouyangxuhua
|
bff50aa769
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
d01a529040
|
项目消息标题判断
|
10 years ago |
|
guange
|
52c2719a46
|
去掉老式的编程作业提交
|
10 years ago |
|
huang
|
ae2aa2fedd
|
完成消息所有逻辑功能
|
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
|
2dacc882df
|
test
|
10 years ago |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
huang
|
4c73e00eaf
|
作品消息状态更新
|
10 years ago |
|
huang
|
8d72a9a539
|
去掉项目base冗余代码
|
10 years ago |
|
ouyangxuhua
|
550b263c2c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
sw
|
3b24bb375a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
a29d004fdc
|
没有加入课程的用户进入作业列表报错
|
10 years ago |
|
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
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 |
|
ouyangxuhua
|
fb6688265c
|
wiki删除后跳转
|
10 years ago |
|
huang
|
0a45e08488
|
1、消息为0的时候不显示 消息数和“全部设置已读”。
2、消息不为空，未读消息为空的时候不显示“全部设为已读”
|
10 years ago |
|
huang
|
402c0b5173
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
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
|
4e1169a021
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
61281af497
|
管理员页面的最近登录用户列表的登录时间精确到分秒
|
10 years ago |
|
ouyangxuhua
|
8c66adec1b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
ef011ad473
|
项目--邀请--发送邮件邀请用户,对输入的邮箱名进行判断，同时，修改提示样式
|
10 years ago |
|
ouyangxuhua
|
5569dacc6c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
a159af8139
|
项目--邀请--发送邮件邀请用户对输入的邮箱进行判断，同时修改提示样式
|
10 years ago |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
10 years ago |
|
sw
|
2dad88d7d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
|
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 |
|
huang
|
ed5f14c9eb
|
添加点击对应方法
|
10 years ago |
|
cxt
|
7a28a65807
|
问卷动态不显示的缺陷修复
|
10 years ago |
|
sw
|
88397d58d0
|
1、讨论区新建帖子时增加权限判断
2、删除历史的匿名用户发布帖子的数据
|
10 years ago |
|
huang
|
b2e25e8afc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
62c657a827
|
用户留言增加登录判断，并且删除匿名用户留言数据
|
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 |
|
sw
|
970de3374c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b89218a1b3
|
消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
|
10 years ago |
|
sw
|
089c4ab490
|
1、用户只可查看自己的作业界面
2、发布作业增加权限判断和登录判断
|
10 years ago |
|
sw
|
e0376b5176
|
tag的导航栏和底部导航栏修改
|
10 years ago |
|
sw
|
29379788fe
|
个人动态里回复缺陷留言增加登录判断
|
10 years ago |
|
sw
|
9f8fee8267
|
个人积分报500
|
10 years ago |
|
lizanle
|
da43b00ddf
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
08fd7e125f
|
作业从资源库引入作者为别人的资源不能删除bug
|
10 years ago |
|
huang
|
c579ee51fe
|
增加点击时间表
|
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 |
|
sw
|
f3e4812d00
|
修改计算项目得分方法名
|
10 years ago |
|
sw
|
78cfed2b68
|
缺陷列表过滤修改
|
10 years ago |
|
sw
|
56a96acbf0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
sw
|
6607e72ca4
|
user_score_helper.rb还原
|
10 years ago |
|
huang
|
a30ee2cb10
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
87387273d8
|
解决消息链接点击一次多一条的问题
|
10 years ago |
|
sw
|
96a2beb342
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
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 |
|
huang
|
4ce8282bd2
|
修改项目500问题
|
10 years ago |
|
huang
|
f5b4b02fb6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
dd06aa3a92
|
添加为空判断
|
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
|
d07873cdf0
|
时间格式修改
|
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 |
|
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
10 years ago |
|
sw
|
6a6fbea446
|
提交作品样式
|
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 |
|
lizanle
|
b4ae611718
|
贴吧交流url
|
10 years ago |
|
sw
|
c2bfbfecee
|
编辑作业按钮隐藏
|
10 years ago |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
10 years ago |
|
guange
|
1c8b24822d
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
sw
|
2e51d0e833
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
69cba79926
|
修改动态的显示时间
|
10 years ago |
|
guange
|
dd4e67ebdb
|
使用新的作业提交界面
|
10 years ago |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
10 years ago |
|
huang
|
86405b8a3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
4c76292e5e
|
message--viewed
|
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 |
|
huang
|
4b2385cb81
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
9df301b4cc
|
取消无用参数
|
10 years ago |
|
huang
|
43f99c45e8
|
消息
|
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 |
|
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
|
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 |
|
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 |
|
huang
|
a2079dc6e3
|
用户留言消息状态更新
|
10 years ago |
|
sw
|
e55b61cb81
|
课程留言回复
|
10 years ago |
|
sw
|
0935a7eab1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
8acc432f91
|
项目讨论区回复刷新
|
10 years ago |
|
sw
|
c4da4b6c09
|
项目缺陷回复刷新
|
10 years ago |
|
sw
|
2538797a52
|
课程论坛回复刷新
|
10 years ago |
|
huang
|
61455bdb4b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
10 years ago |
|
ouyangxuhua
|
192c5735cb
|
贴吧帖子已读更新
|
10 years ago |
|
sw
|
bbf4478fc0
|
课程通知回复后不能及时刷新页面
|
10 years ago |
|
sw
|
3b153766f6
|
过滤之后点击展开更多相关BUG
|
10 years ago |
|
suntao
|
023bb3d95f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
9728437953
|
作业界面样式
|
10 years ago |
|
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
10 years ago |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
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 |
|
huang
|
0e4019be2f
|
修复时间乱的问题
|
10 years ago |
|
sw
|
b0060fc03b
|
请选择发送的课程选择
|
10 years ago |
|
huang
|
469293bc1f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
10 years ago |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
10 years ago |
|
suntao
|
f036b322b9
|
忘记密码页面提示位置调整
|
10 years ago |
|
suntao
|
e3b0eae427
|
作业界面展开更多间距
|
10 years ago |
|
huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
10 years ago |
|
suntao
|
a7ba6b5da2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
7276b5685e
|
表情框按钮间距调整
|
10 years ago |
|
sw
|
dd3fe5915e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
9e7323539f923b5387b9ec9239b5aeb, reversing
changes made to da9c374ed9.
Conflicts:
app/views/users/_user_homework_form.html.erb
|
10 years ago |
|
cxt
|
77349fc111
|
点击新建课程/项目时显示提示信息
|
10 years ago |
|
cxt
|
80b97c5692
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21cb59a7ae
|
点击发布作业的取消按钮时收起输入框
|
10 years ago |
|
lizanle
|
a8652cbe43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
262f013b51
|
发送资源到项目课程 名称要显示完全
|
10 years ago |
|
cxt
|
7aef734113
|
点击发布作业的取消按钮时还原截止日期和课程列表下拉框的默认值
|
10 years ago |
|
sw
|
d0743e4dbf
|
缺陷显示界面描述增加html_safe
|
10 years ago |
