 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 |
|
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
|
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 |