Commit Graph

9270 Commits

Author SHA1 Message Date
cxt 8f317711b8 动态回复框高度的自适应 2015-09-17 19:06:15 +08:00
cxt c3d0dac319 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 17:27:05 +08:00
cxt 7254cf4689 项目缺陷的属性变化时更新动态表中相应缺陷的最后更新时间 2015-09-17 17:26:48 +08:00
Tim 210425277e 导航栏下拉菜单样式调整 2015-09-17 17:17:36 +08:00
Tim 062a9ff231 上传头像确定,取消按钮字号大小统一 2015-09-17 16:12:31 +08:00
Tim a99d56b2e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 16:04:52 +08:00
Tim 3dccf8f77d 动态页面菜单栏图标更改;
提交作业界面图标宽度更改。
2015-09-17 16:04:27 +08:00
cxt 68338c46e1 个人动态按最后更新时间排序 2015-09-17 15:50:33 +08:00
cxt 6c99674798 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 14:59:01 +08:00
cxt 3f7c69e8e1 动态的判断 2015-09-17 14:58:10 +08:00
Tim 9a735c7157 模拟测试提示添加 2015-09-17 11:13:36 +08:00
Tim 5612bb47dd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 10:25:46 +08:00
Tim 0930815086 回复头像模糊效果 2015-09-17 10:25:26 +08:00
cxt 501d9101f0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 10:02:37 +08:00
cxt 036129a622 动态回复后的回复框样式不改变 2015-09-17 10:02:28 +08:00
Tim 1085c9c53f 添加,取消关注图标恢复 2015-09-17 09:06:01 +08:00
Tim 5b6ac4564a 回复框头像路径改变 2015-09-17 08:46:43 +08:00
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
2015-09-16 16:13:40 +08:00
cxt 3bdab22aca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 15:40:24 +08:00
cxt a184ab4b69 个人动态首页只显示第一个动态的回复框,其它的需点击才显示 2015-09-16 15:40:05 +08:00
sw c21cea85f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 14:29:17 +08:00
cxt a714b10860 阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充 2015-09-16 12:39:08 +08:00
sw 5f08ecc7e3 1、作业的开启匿评、关闭匿评功能
2、提交作品时,迟交扣分、缺评扣分的计算--->改为只计算数量
3、
2015-09-16 10:26:13 +08:00
Tim 77a8c18a77 1.关于我们样式修改;
2.登录界面格式调整;
3.个人动态回复样式调整;
2015-09-16 10:16:25 +08:00
sw 4a959523c1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 09:51:59 +08:00
cxt fddf466ce1 将发布作业时的引用资源库的“确定”“取消”按钮改成整个按钮可点击 2015-09-16 09:45:27 +08:00
sw 9ee82c57be 去掉课程模块的导航栏 2015-09-15 17:01:39 +08:00
cxt 0a2bfa1bdb 个人主页动态的缺陷回复与缺陷页面的回复内容不一致 2015-09-15 16:27:53 +08:00
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
cxt 5ccace15da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-15 15:45:29 +08:00
cxt 069c1ddf3c 课程通知页面的评论提示 2015-09-15 15:45:16 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw fff9c44271 学生没有课程和项目时,课程和项目导航有2条线 2015-09-15 15:16:49 +08:00
lizanle 2fa01f32fb schema 2015-09-15 11:28:08 +08:00
lizanle 1b9bde2284 课程资源的标签库可点击更改 2015-09-15 10:33:05 +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
cxt e10e5e8412 调整课程通知页面的回复头像样式 2015-09-15 09:50:57 +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