Commit Graph

147 Commits

Author SHA1 Message Date
Tim 0930815086 回复头像模糊效果 2015-09-17 10:25:26 +08:00
Tim 1085c9c53f 添加,取消关注图标恢复 2015-09-17 09:06:01 +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
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 cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
cxt a999897efa 动态回复头像的调整 2015-09-15 09:22:18 +08:00
cxt f1a6e3d7e3 “关于我们”的样式调整 2015-09-11 17:57:25 +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
ouyangxuhua 22e2510482 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 14:43:14 +08:00
ouyangxuhua 3044b07df7 系统消息颜色 2015-09-11 14:43:04 +08:00
huang c0437ae992 作业截止时间提醒界面! 2015-09-11 14:41:23 +08:00
sw f0bd113a5e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-10 17:11:38 +08:00
sw 93b179c958 修改普通作业 2015-09-10 17:11:16 +08:00
lizanle 80e38287dd 所有baselayout都引入prttefy.css .js
调整资源库宽度
2015-09-10 16:38:45 +08:00
sw fce5405c41 发布作业界面样式调整 2015-09-10 14:44:25 +08:00
sw 97f9d4fa60 增加教师节祝福语 2015-09-10 10:26:16 +08:00
sw a841c20896 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:51:13 +08:00
sw e30abd2a81 提交、修改作品界面宽度 2015-09-09 17:50:49 +08:00
cxt 5b14dbba45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:47:09 +08:00
cxt 6ed0a151dc 头像下拉框的样式修改 2015-09-09 17:45:39 +08:00
sw 519f079bcc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 16:54:21 +08:00
sw b1463f0864 学生提交匿评作业作品功能实现 2015-09-09 16:10:11 +08:00
cxt 040f3f588d 鼠标移到头像上方,才显示账户下拉菜单 2015-09-09 11:23:23 +08:00
cxt 8fec99114a "关于我们"的样式调整 2015-09-09 10:39:11 +08:00
cxt a991500e55 登录首页的样式修改 2015-09-09 10:21:44 +08:00
sw 2e59584031 作业编辑功能按钮、加入课程、项目等按钮样式 2015-09-08 16:36:50 +08:00
sw 137a0b16a0 1、文件的样式图片
2、点击编程弹框时,测试输入获取焦点
2015-09-08 15:40:25 +08:00
sw e4209007b1 Merge branch 'guange_homework' into szzh 2015-09-08 10:28:21 +08:00
guange 9e9f373a76 发布作业优化 2015-09-07 23:09:19 +08:00
cxt a86d2aaadd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-07 17:38:41 +08:00
cxt 32b2d4f874 点击动态中的图片即显示大图 2015-09-07 17:38:31 +08:00
lizanle 6bcaf01fe2 课程弹出框样式不对 2015-09-07 16:01:19 +08:00
sw 359e34471b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 21:30:59 +08:00
huang c7f15d3a3e 修改留言html样式 2015-09-02 20:06:47 +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 1ba0c86828 Merge branch 'szzh' into dev_hjq 2015-09-02 19:38:31 +08:00
huang 4c76292e5e message--viewed 2015-09-02 18:00:36 +08:00
suntao 4259540f53 作业列表宽度调整 2015-09-02 17:03:01 +08:00
huang a94d5928d4 Merge branch 'szzh' into dev_hjq 2015-09-02 14:32:46 +08:00
huang 487881bb92 Merge branch 'szzh' into dev_hjq
Conflicts:
	public/stylesheets/new_user.css
2015-09-02 14:15:38 +08:00
suntao 9b8270aed1 Banner padding调整 2015-09-02 14:15:26 +08:00
suntao c9d46f17f3 回复blockquote调整 2015-09-02 11:15:38 +08:00
ouyangxuhua 16e018a444 更改未读消息样式的字体大小 2015-09-02 10:55:40 +08:00
suntao 9bbf658fdb 回复框样式调整 2015-09-02 10:51:46 +08:00
ouyangxuhua 2fc337cb07 修改已读和未读消息样式 2015-09-02 09:25:34 +08:00