huang
|
ba2474e480
|
关闭匿评消息
|
2015-09-18 17:38:19 +08:00 |
huang
|
cfea5e9c89
|
邀请已注册用户 消息邀请信息
|
2015-09-18 15:25:45 +08:00 |
huang
|
c3223982cd
|
修改系统消息链接跳转
|
2015-09-18 14:08:09 +08:00 |
huang
|
81743143c2
|
优化用户留言页面
|
2015-09-18 14:04:02 +08:00 |
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
2015-09-18 13:30:25 +08:00 |
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 11:34:29 +08:00 |
sw
|
8eb2c75cbc
|
1、编程作业修改评分比例之后成绩计算问题
2、关闭匿评之后样式
|
2015-09-18 11:29:58 +08:00 |
sw
|
859fe01c52
|
1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
|
2015-09-18 11:14:59 +08:00 |
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
2015-09-18 11:05:21 +08:00 |
sw
|
a8c5d18069
|
1、之前普通作业更改为匿评作业。。。
2、系统评分为null时默认为0
|
2015-09-18 09:32:25 +08:00 |
sw
|
5bdb1cd461
|
1、启动匿评、关闭匿评时弹出框位置
2、缺评评分设置报错
|
2015-09-17 20:33:36 +08:00 |
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
2015-09-17 20:20:20 +08:00 |
sw
|
cc7a752623
|
到处附件、缺评、匿评、成绩列表
|
2015-09-17 17:20:29 +08:00 |
sw
|
b8cb422268
|
排序功能
|
2015-09-17 17:06:08 +08:00 |
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
2015-09-17 16:53:38 +08:00 |
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
2015-09-17 16:31:32 +08:00 |
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
2015-09-17 16:07:41 +08:00 |
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
2015-09-17 16:04:16 +08:00 |
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
2015-09-17 15:50:33 +08:00 |
huang
|
b9fc410802
|
添加系统消息单独新页面
|
2015-09-17 14:41:03 +08:00 |
sw
|
53d6c6853d
|
作品列表的显示
|
2015-09-17 14:16:13 +08:00 |
huang
|
b5f4b1dd96
|
功能:24小时内系统消息显示
|
2015-09-17 13:58:55 +08:00 |
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
2015-09-17 12:59:52 +08:00 |
sw
|
efdd717c3c
|
成绩计算算法的实现
|
2015-09-17 11:41:24 +08:00 |
sw
|
84bb5af86f
|
增加教师优先字段
|
2015-09-17 10:24:37 +08:00 |
sw
|
1ed1957899
|
教辅评分、系统评分、学生匿评 比例默认设置
|
2015-09-17 10:21:01 +08:00 |
sw
|
22d4499f8f
|
缺评、迟交扣分还是改为 直接扣多少分
|
2015-09-17 10:06:04 +08:00 |
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
2015-09-17 09:20:35 +08:00 |
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”,因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:25:43 +08:00 |
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
2015-09-16 17:25:06 +08:00 |
sw
|
939a010adb
|
静态页面添加
|
2015-09-16 15:51:35 +08:00 |
ouyangxuhua
|
30e703b9bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 12:40:12 +08:00 |
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
2015-09-16 12:38:01 +08:00 |
huang
|
b43acd3a46
|
邀请用户加入项目:
特殊情况:用户登录名=邮箱名,用户修改邮箱,此时将用户作为条件邀请
|
2015-09-16 11:09:10 +08:00 |
huang
|
78ca55f121
|
优化邮件邀请策略
|
2015-09-16 10:49:34 +08:00 |
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时,迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
2015-09-16 10:26:13 +08:00 |
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 09:51:59 +08:00 |
huang
|
b0ccf9037a
|
邮件邀请:
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
sw
|
cd96fd99a8
|
快速创建项目
|
2015-09-15 16:11:55 +08:00 |
huang
|
295921c89d
|
邮件:邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
2015-09-15 10:50:58 +08:00 |
lizanle
|
71c0bd9b43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-15 10:32:11 +08:00 |
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
2015-09-15 10:31:59 +08:00 |
huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +08:00 |
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
2015-09-11 16:59:10 +08:00 |
cxt
|
86f0889f5b
|
"我的动态"显示当前用户的个人动态
|
2015-09-11 16:53:09 +08:00 |
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 16:43:59 +08:00 |
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
2015-09-11 16:37:50 +08:00 |
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
2015-09-11 16:36:10 +08:00 |
sw
|
37f235c2ab
|
导入编程作业
|
2015-09-11 16:22:35 +08:00 |
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-11 15:50:10 +08:00 |
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
2015-09-11 15:39:46 +08:00 |
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
2015-09-11 14:59:30 +08:00 |
guange
|
37e1b6d2a1
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
2015-09-11 11:43:29 +08:00 |
cxt
|
7d6b9005a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 11:41:45 +08:00 |
cxt
|
1855adb037
|
未登录用户不能访问新建课程页面
|
2015-09-11 11:40:07 +08:00 |
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
2015-09-11 11:31:59 +08:00 |
sw
|
7db774eedb
|
新建作业时,匿评相关属性为作业必须属性
|
2015-09-11 10:19:45 +08:00 |
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
2015-09-11 09:45:28 +08:00 |
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
2015-09-11 09:36:44 +08:00 |
sw
|
66636efda9
|
修改普通作业
|
2015-09-11 09:15:54 +08:00 |
sw
|
93b179c958
|
修改普通作业
|
2015-09-10 17:11:16 +08:00 |
ouyangxuhua
|
596c512d0a
|
系统消息
|
2015-09-10 11:39:53 +08:00 |
guange
|
a29ab60481
|
老师的测试结果能显示出来
|
2015-09-10 11:34:10 +08:00 |
sw
|
1d9fda7eeb
|
Merge branch 'guange_homework' into develop
|
2015-09-10 11:32:15 +08:00 |
sw
|
a18a014943
|
Merge branch 'szzh' into develop
|
2015-09-10 10:26:31 +08:00 |
huang
|
0aa8c5b5cc
|
完成系统消息通知功能
|
2015-09-09 17:43:33 +08:00 |
huang
|
13397363db
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-09 17:06:16 +08:00 |
huang
|
66251c8d30
|
添加功能:管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
ouyangxuhua
|
30efa6c8c7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-09 11:42:21 +08:00 |
ouyangxuhua
|
20bef515da
|
issue周报发送消息给所有管理员
|
2015-09-09 11:42:06 +08:00 |
huang
|
146d877254
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-09 10:15:38 +08:00 |
huang
|
1a6f81f302
|
用户申请,区分已读和未读
|
2015-09-09 10:15:05 +08:00 |
sw
|
068b03cd8f
|
Merge branch 'guange_homework' of http://repository.trustie.net/xianbo/trustie2 into guange_homework
|
2015-09-09 09:11:30 +08:00 |
guange
|
c413d66c44
|
程序作业打分
|
2015-09-09 00:43:54 +08:00 |
ouyangxuhua
|
71f8fca68b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 17:32:00 +08:00 |
ouyangxuhua
|
a7f2f0a6d2
|
项目版本库错误提示信息设置为flash.now[:error]
|
2015-09-08 17:31:16 +08:00 |
huang
|
06753497bb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 16:56:36 +08:00 |
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能(管理员收到消息提醒)
|
2015-09-08 16:55:36 +08:00 |
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
2015-09-08 16:36:50 +08:00 |
ouyangxuhua
|
bff50aa769
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 15:28:15 +08:00 |
huang
|
ae2aa2fedd
|
完成消息所有逻辑功能
|
2015-09-08 14:14:49 +08:00 |
sw
|
2dacc882df
|
test
|
2015-09-08 10:33:40 +08:00 |
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
2015-09-08 10:28:21 +08:00 |
huang
|
4c73e00eaf
|
作品消息状态更新
|
2015-09-08 09:43:41 +08:00 |
ouyangxuhua
|
550b263c2c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 09:11:17 +08:00 |
sw
|
3b24bb375a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-08 08:50:00 +08:00 |
sw
|
a29d004fdc
|
没有加入课程的用户进入作业列表报错
|
2015-09-08 08:45:29 +08:00 |
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
2015-09-07 23:47:14 +08:00 |
ouyangxuhua
|
fb6688265c
|
wiki删除后跳转
|
2015-09-07 17:16:25 +08:00 |
huang
|
103d61056d
|
完成功能:
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
2015-09-07 16:08:04 +08:00 |
cxt
|
aa0c0dab83
|
添加“我的动态”
|
2015-09-07 15:01:08 +08:00 |
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准,后面以点击时间为准
|
2015-09-07 11:13:15 +08:00 |
huang
|
ed5f14c9eb
|
添加点击对应方法
|
2015-09-06 17:42:10 +08:00 |
sw
|
88397d58d0
|
1、讨论区新建帖子时增加权限判断
2、删除历史的匿名用户发布帖子的数据
|
2015-09-06 17:27:20 +08:00 |
sw
|
62c657a827
|
用户留言增加登录判断,并且删除匿名用户留言数据
|
2015-09-06 17:06:05 +08:00 |
huang
|
b771cc0fe1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 17:03:48 +08:00 |
sw
|
abf053fc99
|
Merge branch 'develop' into szzh
|
2015-09-06 16:51:33 +08:00 |
sw
|
970de3374c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 16:50:39 +08:00 |
huang
|
b89218a1b3
|
消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
|
2015-09-06 16:50:03 +08:00 |
sw
|
089c4ab490
|
1、用户只可查看自己的作业界面
2、发布作业增加权限判断和登录判断
|
2015-09-06 16:49:29 +08:00 |
sw
|
29379788fe
|
个人动态里回复缺陷留言增加登录判断
|
2015-09-06 16:31:15 +08:00 |
lizanle
|
da43b00ddf
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 15:41:50 +08:00 |
lizanle
|
08fd7e125f
|
作业从资源库引入作者为别人的资源不能删除bug
|
2015-09-06 15:41:43 +08:00 |
cxt
|
55758c3c2f
|
筛选掉未发布的问卷动态
|
2015-09-06 15:31:26 +08:00 |
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
2015-09-06 11:22:27 +08:00 |
guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-03 16:59:24 +08:00 |
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
2015-09-03 16:58:38 +08:00 |
huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
2015-09-03 16:28:49 +08:00 |
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
2015-09-03 16:09:40 +08:00 |
guange
|
a0c611378b
|
提交作业跳转报错
|
2015-09-02 22:09:23 +08:00 |
guange
|
d07873cdf0
|
时间格式修改
|
2015-09-02 21:44:08 +08:00 |
guange
|
bacb5f859b
|
merge
|
2015-09-02 21:41:13 +08:00 |
guange
|
a69cee4b26
|
老师测试功能
|
2015-09-02 21:38:13 +08:00 |
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 19:52:56 +08:00 |
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
2015-09-02 19:52:44 +08:00 |
sw
|
6a6fbea446
|
提交作品样式
|
2015-09-02 19:41:45 +08:00 |
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
2015-09-02 18:35:12 +08:00 |
guange
|
dd4e67ebdb
|
使用新的作业提交界面
|
2015-09-02 18:09:52 +08:00 |
huang
|
4c76292e5e
|
message--viewed
|
2015-09-02 18:00:36 +08:00 |
huang
|
43f99c45e8
|
消息
|
2015-09-02 14:37:57 +08:00 |
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
2015-09-02 14:15:38 +08:00 |
huang
|
a2079dc6e3
|
用户留言消息状态更新
|
2015-09-02 14:13:32 +08:00 |
huang
|
61455bdb4b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-02 11:51:27 +08:00 |
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
2015-09-02 11:50:58 +08:00 |
ouyangxuhua
|
192c5735cb
|
贴吧帖子已读更新
|
2015-09-02 11:46:49 +08:00 |
sw
|
3b153766f6
|
过滤之后点击展开更多相关BUG
|
2015-09-02 11:20:21 +08:00 |
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
2015-09-02 11:00:32 +08:00 |
huang
|
0e4019be2f
|
修复时间乱的问题
|
2015-09-02 10:23:22 +08:00 |
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
2015-09-02 10:08:37 +08:00 |
huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
2015-09-01 17:37:43 +08:00 |
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:37:53 +08:00 |
cxt
|
21565b74fe
|
冲突
|
2015-09-01 16:37:43 +08:00 |
guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:45:49 +08:00 |
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:34:31 +08:00 |
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
2015-09-01 15:34:22 +08:00 |
sw
|
5f42ce4c80
|
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
|
2015-09-01 15:28:03 +08:00 |
sw
|
00a8dc94c3
|
缺陷的回复功能
|
2015-09-01 15:17:40 +08:00 |
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
2015-09-01 15:03:24 +08:00 |
sw
|
b1de662338
|
讨论区回复功能,修改引用样式
|
2015-09-01 14:18:44 +08:00 |
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
sw
|
84ff3450d2
|
在动态中回复通知动态
|
2015-09-01 10:43:30 +08:00 |
sw
|
b3919256fa
|
111
|
2015-09-01 09:17:12 +08:00 |
lizanle
|
5b40628a5b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-31 11:59:42 +08:00 |
lizanle
|
9ca1234324
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 10:23:12 +08:00 |
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
2015-08-31 09:33:20 +08:00 |