Commit Graph

9233 Commits

Author SHA1 Message Date
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw fff9c44271 学生没有课程和项目时,课程和项目导航有2条线 2015-09-15 15:16:49 +08:00
sw 6127e0cee0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-15 09:36:38 +08:00
cxt a999897efa 动态回复头像的调整 2015-09-15 09:22:18 +08:00
cxt d0c19124b7 将课程的“私有”标志改成不可点击 2015-09-14 17:29:00 +08:00
sw e7f55148ca Merge branch 'develop' into szzh 2015-09-11 18:37:56 +08:00
sw 2ce29b7dcc 删除应该忽略的文件 2015-09-11 18:36:56 +08:00
sw 9ce6bc225b Merge branch 'szzh' into develop 2015-09-11 18:12:44 +08:00
sw 4a9fd15bfd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 18:12:02 +08:00
sw 8f3889e2c5 编程作品提交框自动增高 2015-09-11 18:03:37 +08:00
cxt b3c73811fc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 17:57:47 +08:00
cxt f1a6e3d7e3 “关于我们”的样式调整 2015-09-11 17:57:25 +08:00
sw 1673f4f960 1、老师打开编程作品报错
2、隐藏开启匿评按钮
2015-09-11 17:52:37 +08:00
huang 169c7f3a97 修改消息判断作业重复 2015-09-11 17:48:14 +08:00
sw da269ef716 发布作业,请先输入作业标题 2015-09-11 17:27:07 +08:00
cxt 42ddc0bf3c 迁移文件 2015-09-11 17:19:40 +08:00
huang 0233c9b14b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 17:19:40 +08:00
huang 0d595c5feb 修改系统消息提交按钮 2015-09-11 17:19:12 +08:00
sw 09f6a67577 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 17:17:33 +08:00
cxt 9dc3f43af1 修改迁移文件 2015-09-11 17:15:05 +08:00
sw d04fc37de1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2015-09-11 17:13:59 +08:00
sw 4ee4bb6e9d 编辑作业 2015-09-11 17:07:30 +08:00
sw b31104007a Merge branch 'szzh' into develop 2015-09-11 16:59:10 +08:00
sw b1a17f1b6b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:58:38 +08:00
sw b6452bb652 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:58:05 +08:00
sw ecf2ac5e19 课程内发布作业增加提示 2015-09-11 16:57:49 +08:00
cxt 86f0889f5b "我的动态"显示当前用户的个人动态 2015-09-11 16:53:09 +08:00
sw 295a3332c6 schema.rb文件错误 2015-09-11 16:47:53 +08:00
lizanle 6c06dfeb3d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-11 16:46:20 +08:00
cxt 7e5093d0d2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:45:58 +08:00
lizanle c701eefb42 暂时不添加 我要回复 2015-09-11 16:45:57 +08:00
cxt 312955e5dc 迁移文件 2015-09-11 16:45:50 +08:00
lizanle b99663a773 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-11 16:44:28 +08:00
lizanle 9f871ababb 添加 我要回复 2015-09-11 16:44:19 +08:00
cxt 35ccb23566 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:44:08 +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 b75247177c Merge branch 'dev_hjq' into szzh 2015-09-11 16:38:32 +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 a3d628dc17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:29:55 +08:00
sw 760b70971a 取消导入编程作业时对homework_type的赋值 2015-09-11 16:27:34 +08:00
sw 90a52aa01b 导入编程作业后、测试集数量不显示的问题 2015-09-11 16:26:35 +08:00
sw 37f235c2ab 导入编程作业 2015-09-11 16:22:35 +08:00
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提醒!
2015-09-11 16:11:34 +08:00
ouyangxuhua 67dcb025aa 系统消息-修改 2015-09-11 16:05:02 +08:00
huang 3da6593720 查看别人的页面时不显示“全部设为已读” 2015-09-11 15:55:51 +08:00
huang 4d4b48ef99 Merge branch 'szzh' into dev_hjq
Conflicts:
	db/schema.rb
2015-09-11 15:50:10 +08:00
huang 6209250e6d 内容长度提醒 2015-09-11 15:45:25 +08:00