 guange
|
08eecbd5ec
|
merge
|
2015-09-25 09:30:32 +08:00 |
 huang
|
25a604d7b8
|
issue解决冲突
|
2015-09-24 16:59:19 +08:00 |
|
huang
|
38ba47f8c8
|
讨论区结构修改
任务中添加：自动开启/关闭匿评消息通知
匿评开启失败消息通知
|
2015-09-24 16:16:37 +08:00 |
|
guange
|
0b4c8b05f1
|
JAVA语言支持
|
2015-09-24 15:09:15 +08:00 |
 sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-22 16:21:54 +08:00 |
 cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
2015-09-22 15:54:50 +08:00 |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
2015-09-21 17:11:45 +08:00 |
|
sw
|
385f2aa4ac
|
111
|
2015-09-19 15:23:01 +08:00 |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
2015-09-19 11:21:45 +08:00 |
|
sw
|
07dbb9da4c
|
111
|
2015-09-19 11:18:30 +08:00 |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
2015-09-19 11:01:48 +08:00 |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
2015-09-19 10:54:50 +08:00 |
|
guange
|
c99222820e
|
加入了python语言支持
|
2015-09-19 10:39:10 +08:00 |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
2015-09-18 23:18:15 +08:00 |
|
sw
|
34db84e79f
|
test
|
2015-09-18 20:27:13 +08:00 |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 17:51:11 +08:00 |
|
huang
|
ba2474e480
|
关闭匿评消息
|
2015-09-18 17:38:19 +08:00 |
|
sw
|
20b4c056a8
|
历史数据：普通作业改为匿评作业
|
2015-09-18 16:19:30 +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
|
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
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
2015-09-17 16:31:32 +08:00 |
|
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
|
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
2015-09-17 15:50:33 +08:00 |
|
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 10:24:58 +08:00 |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
2015-09-17 10:24:37 +08:00 |
 Tim
|
5b6ac4564a
|
回复框头像路径改变
|
2015-09-17 08:46:43 +08:00 |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
 lizanle
|
2fa01f32fb
|
schema
|
2015-09-15 11:28:08 +08:00 |
|
huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +08:00 |
|
sw
|
da269ef716
|
发布作业，请先输入作业标题
|
2015-09-11 17:27:07 +08:00 |
|
cxt
|
42ddc0bf3c
|
迁移文件
|
2015-09-11 17:19:40 +08:00 |
|
cxt
|
9dc3f43af1
|
修改迁移文件
|
2015-09-11 17:15:05 +08:00 |
|
cxt
|
312955e5dc
|
迁移文件
|
2015-09-11 16:45:50 +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 |
|
cxt
|
585818fe7a
|
讨论区动态重复出现
|
2015-09-11 16:42:24 +08:00 |
|
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
2015-09-11 16:36:10 +08:00 |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-11 15:50:10 +08:00 |
|
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
2015-09-11 11:31:59 +08:00 |
|
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
2015-09-10 16:38:45 +08:00 |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
|
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 16:54:21 +08:00 |
|
cxt
|
a991500e55
|
登录首页的样式修改
|
2015-09-09 10:21:44 +08:00 |
|
sw
|
1cbda41997
|
11
|
2015-09-08 14:43:59 +08:00 |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
2015-09-08 10:28:21 +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 |
|
guange
|
9e9f373a76
|
发布作业优化
|
2015-09-07 23:09:19 +08:00 |