jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,695 Commits 98 Branches 0 Tags 0 B
Commit Graph

1821 Commits

Author SHA1 Message Date
guange 41f9daed6d 编程作业放入到users controller 2015-09-01 16:18:03 +08:00
suntao ded497a5f2 个人主页左侧导航配置按钮 2015-09-01 15:43:59 +08:00
lizanle 4a1b2fbbd6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 15:34:31 +08:00
lizanle b2eb846a23 关于我们 
隐藏招聘信息
联系我们改为服务协议
 2015-09-01 15:34:22 +08:00
sw 5f42ce4c80 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
 2015-09-01 15:28:03 +08:00
huang 8b9ee2260a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-01 15:24:51 +08:00
huang fede611fea 鼠标经过显示内容效果 
公共贴吧数据迁移
 2015-09-01 15:23:30 +08:00
suntao 00de825050 作业界面颜色更改，删掉冗余头部导航css 2015-09-01 15:10:56 +08:00
suntao acb46d520c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_homework_form.html.erb
 2015-09-01 14:40:24 +08:00
suntao ae3f56c758 提交作业界面对齐 2015-09-01 14:37:34 +08:00
sw b1de662338 讨论区回复功能，修改引用样式 2015-09-01 14:18:44 +08:00
lizanle 798326d6ef Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 11:29:53 +08:00
lizanle b3e3737fb5 发布作业时从资源库选择资源功能 2015-09-01 11:29:43 +08:00
sw 62360175d1 课程通知回复时，所有回复框都会提交 2015-09-01 11:25:52 +08:00
sw 84ff3450d2 在动态中回复通知动态 2015-09-01 10:43:30 +08:00
ouyangxuhua fd0e4a7afd 项目wiki：输入wiki为非汉字类型且长度够长，显示超出边框问题解决 2015-09-01 09:56:59 +08:00
suntao fe664b5e5c 回复模块调整 2015-09-01 09:42:03 +08:00
suntao e917a68bd3 消息页面li间距调整，回复块调整 2015-09-01 09:13:34 +08:00
ouyangxuhua 316f660ca4 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-01 08:47:57 +08:00
suntao 1d1d2f738d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 17:51:08 +08:00
suntao acf5db7067 placeholder显示等 2015-08-31 17:50:50 +08:00
ouyangxuhua 8403d5365c 修改项目新闻提示 2015-08-31 17:49:48 +08:00
huang 311634abf1 修改消息列表样式 2015-08-31 16:53:54 +08:00
cxt 1113a7938c 修复点击空白处返回新建课程/项目的页面 2015-08-31 16:53:41 +08:00
suntao 2804d7d730 resource图片替换 2015-08-31 15:42:56 +08:00
cxt 4ab91984f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:33:39 +08:00
cxt fa57a6c889 主页动态的样式修改 2015-08-31 15:33:20 +08:00
suntao ac353841b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:21:28 +08:00
suntao d3869b03cd 资源库版面样式调整 2015-08-31 15:21:09 +08:00
lizanle 9a1fa316bb Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-31 15:06:38 +08:00
lizanle 19dfd77cad 将资源发送至 会换行，调宽 2015-08-31 15:06:07 +08:00
suntao 3e9bb8a596 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2015-08-31 14:55:15 +08:00
suntao b0ff7f0ee2 页面间距调整，头像大小调整 2015-08-31 14:52:56 +08:00
cxt 23c1ac5a4a 项目问题的动态内容显示超出边框 2015-08-31 14:28:43 +08:00
guange a142103091 Merge remote-tracking branch 'origin/develop' into guange_homework 2015-08-31 09:33:20 +08:00
guange 8f426ca040 merge 2015-08-29 18:22:33 +08:00
guange 85ee2b86cd . 2015-08-29 18:21:01 +08:00
sw faea706683 Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh" 
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
 2015-08-29 17:50:15 +08:00
sw 655054a8ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 17:10:56 +08:00
sw cc50d0d85e 布置作业界面调整删除按钮和文件的距离 2015-08-29 17:08:55 +08:00
suntao 3776689661 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 16:52:44 +08:00
suntao efe5c1e3f4 课程宽度调整 2015-08-29 16:52:10 +08:00
sw 17e9b2d293 编辑个人简介文本框 2015-08-29 14:48:47 +08:00
suntao 0d8624a642 颜色更新 2015-08-29 14:43:28 +08:00
suntao 886a00e18d footer间距调整 2015-08-29 14:22:29 +08:00
suntao a22727efb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:08:58 +08:00
suntao 5e25b64004 提交按钮对齐 2015-08-29 14:08:38 +08:00
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:04:57 +08:00
sw e455f93ee1 上传图片；浏览图片按钮 2015-08-29 12:04:35 +08:00
guange 18bfe1fc73 jquery升到1.11 2015-08-29 11:59:52 +08:00
suntao 977f81e031 关注和取消关注，导航圆角 2015-08-29 11:41:12 +08:00
suntao 5f3532ac14 头像部分修改 2015-08-29 11:25:49 +08:00
sw 189405f0a9 课程搜索有部分文本重叠 2015-08-29 10:58:45 +08:00
sw 4d1fc0dc45 调整底部导航栏宽度 2015-08-29 10:54:45 +08:00
suntao 9d638b705a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 10:27:40 +08:00
lizanle 60b429b13d 发送成功不给提示 
课程资源过少的时候不给滚动条
 2015-08-29 10:33:04 +08:00
suntao 2342d1c23a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
 2015-08-29 10:27:22 +08:00
suntao ada04e5e63 个人主页头像模块改动 2015-08-29 10:13:32 +08:00
lizanle afd7beebac Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 10:00:10 +08:00
lizanle f2a909f0e5 资源移动弹出框搜索处鼠标悬浮要手型光标 2015-08-29 10:00:04 +08:00
huang 6287f9b39e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 09:56:39 +08:00
lizanle bc186776d8 资源移动弹出框减少留白 2015-08-29 09:56:34 +08:00
lizanle 553e35281a 资源弹出框的边框色 2015-08-29 09:44:36 +08:00
lizanle 53b150486d Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 09:33:33 +08:00
lizanle 789b62940b 资源名称过长会覆盖的问题 
搜索按钮 手在上边的时候呈手型
筛选资源后  自选资源清零的问题
 2015-08-29 09:33:22 +08:00
huang 938d0e2bbd 解决消息换行显示问题 2015-08-29 09:23:32 +08:00
suntao 5c960c798e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 17:29:47 +08:00
suntao 46ac491b5b 上传图片 2015-08-28 17:29:22 +08:00
sw 3f61a908d1 部分界面样式调整 2015-08-28 17:27:51 +08:00
guange e8fe397158 added 2015-08-28 17:20:39 +08:00
suntao d536c81a8a 提交作业样式修改 2015-08-28 17:11:33 +08:00
huang 3a25f44d83 Merge branch 'dev_hjq' into szzh 2015-08-28 17:07:48 +08:00
huang e193cb0f2d 消息列表界面新样式 2015-08-28 17:05:27 +08:00
sw 014881bd42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
 2015-08-28 17:02:49 +08:00
sw 48419573ac 底部导航栏有2条线 2015-08-28 16:02:00 +08:00
suntao 4392ecdcd7 消息格式更改 2015-08-28 15:41:50 +08:00
guange 1d8fdbf8f1 可以提交答案 2015-08-28 15:08:07 +08:00
suntao e12bef1126 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 14:51:16 +08:00
suntao a19692a0c6 个人主页左侧修改 2015-08-28 14:50:48 +08:00
huang 9bc491227b Merge branch 'szzh' into dev_hjq 2015-08-28 14:49:55 +08:00
huang d9df8aae28 1。缺陷状态更新后，不同状态变更在消息列表中显示方式 
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
 2015-08-28 14:38:46 +08:00
suntao fb91958a3f 导航栏修改 2015-08-28 14:30:02 +08:00
guange 1462ea09f3 测试代码功能完成 2015-08-28 12:04:49 +08:00
suntao c0477fda99 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
 2015-08-28 11:58:33 +08:00
sw 462b0a82a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 11:56:52 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
sw 711b21070f 上传附件样式调整 2015-08-28 11:53:05 +08:00
sw 2fa03c3102 导入作业功能完成 2015-08-28 11:32:57 +08:00
lizanle f9651d853c 资源每页显示的个数 2015-08-28 10:47:50 +08:00
sw 007a39b5d5 作业列表的过滤查询 2015-08-28 10:00:48 +08:00
lizanle d3f441d4da 可拖动的资源弹出框 2015-08-28 09:34:02 +08:00
sw c5ad5a3a5a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-27 17:35:04 +08:00
lizanle 149ac07cf9 去掉重复的css， 
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
 2015-08-27 16:20:47 +08:00
sw cb5abc6d74 导入作业弹框 2015-08-27 16:03:41 +08:00
sw 1f87c4adf5 重复CSS删除 2015-08-27 09:46:17 +08:00
lizanle 41a8f9d6a2 底部去掉marginBottom:10px 
登录界面加底部
 2015-08-27 09:28:13 +08:00
lizanle 82b86ea14f Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 17:52:32 +08:00
lizanle 733876743e 服务协议 忘记密码 2015-08-26 17:52:23 +08:00
sw b7cbb9b0c2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
 2015-08-26 17:31:37 +08:00
sw 049e27f15f 发布作业功能 2015-08-26 17:29:47 +08:00
huang a54de0c8fb Merge branch 'dev_hjq' into sw_new_course 2015-08-26 16:33:21 +08:00
lizanle ccfd69602c 服务协议 2015-08-26 16:31:28 +08:00
huang b824c3fa46 1、去掉多余的代码 
2、消息样式列表过宽显示跨行问题
 2015-08-26 16:31:28 +08:00
huang 6a986b98d9 Merge branch 'sw_new_course' into dev_hjq 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-26 16:14:50 +08:00
lizanle 5ec24913bb 留言背景色 留言头 2015-08-26 16:06:15 +08:00
sw e2869faa08 日历选择器的样式调整 2015-08-26 15:17:56 +08:00
huang 334e6dbd55 消息未读样式 2015-08-26 15:14:25 +08:00
sw 686af68026 关注、粉丝、编辑资料页面样式问题 2015-08-26 14:11:28 +08:00
sw f0a4d364b0 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 13:56:53 +08:00
sw ccfa93be66 老师布置作业界面 2015-08-26 13:56:37 +08:00
lizanle d735eee4a3 关注和取消关注 2015-08-26 11:41:32 +08:00
sw 757da1ec0a 调整编辑资料样式 2015-08-26 09:36:05 +08:00
cxt cccc0577c7 个人动态 2015-08-26 08:51:39 +08:00
sw 767fc67686 已过期课程显示为darkgrey 2015-08-25 18:22:46 +08:00
sw 59fe95bf33 去掉部分重复的CSS 2015-08-25 17:26:40 +08:00
sw 994a4188ce 未登录情况下，导航栏样式问题 2015-08-25 17:13:09 +08:00
sw 4ca3d8be03 搜索栏样式 2015-08-25 16:35:22 +08:00
sw 0d9a397453 登录、未登录搜索条件选择js 
用户主页 show方法改造
 2015-08-25 16:01:31 +08:00
sw c8b1bb5d64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 15:09:21 +08:00
sw 87ee2e744f 公共贴吧、课程、项目相关界面导航栏和底部导航栏修改 2015-08-25 15:09:02 +08:00
lizanle 8917a67c7c Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-25 14:24:29 +08:00
lizanle d25971f546 登陆界面 2015-08-25 14:24:20 +08:00
sw bcd12e7e48 课程、项目相关页面 顶部导航栏和底部导航栏修改 2015-08-25 14:09:37 +08:00
sw c93bc5be40 作业列表效果显示 2015-08-25 13:50:42 +08:00
sw 5b99effbc8 更新css，编辑个人简介功能BUG 2015-08-25 10:30:31 +08:00
sw d132c08a11 增加footer 2015-08-25 09:29:19 +08:00
sw 38f8aa5ba4 更新css文件 2015-08-24 18:25:33 +08:00
sw 4bf92d0737 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-24 18:17:45 +08:00
sw 3ea198dc3d 标题栏作业界面静态页面的添加 2015-08-24 18:15:46 +08:00
cxt 2e5916cf5e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/admin_controller.rb
 2015-08-24 18:01:51 +08:00
lizanle 5bf7aeb430 资源库css小改动 2015-08-24 16:35:10 +08:00
lizanle 39b022f696 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/stylesheets/new_public.css
 2015-08-24 16:25:09 +08:00
lizanle 86d2f5342c 登陆界面 2015-08-24 16:22:22 +08:00
lizanle 614743d8d4 登陆界面 2015-08-24 16:22:06 +08:00
sw a9c7c252e5 搜索功能js以及类型的选择 2015-08-24 16:16:07 +08:00
sw e746a7764f 处理被还原的css 2015-08-24 15:36:32 +08:00
sw 5fcb97b990 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/stylesheets/new_public.css
 2015-08-24 15:32:51 +08:00
sw dabef542fe 更新css文件，并实现未登陆用户时静态页面显示 2015-08-24 15:30:11 +08:00
sw 7f2f2c5d40 个人主页，项目更多功能 2015-08-24 14:53:35 +08:00
lizanle 12b89e2c81 可拖动的框暂时做不了。 2015-08-24 14:53:30 +08:00
sw 2d75fea96b 课程点击更多按钮显示 2015-08-24 14:44:22 +08:00
lizanle 9a2e9a4ad2 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-24 13:54:22 +08:00
lizanle 5628a43578 资源库和新版个人中心整合 2015-08-24 13:54:15 +08:00
sw 0287a0f3b4 个人积分弹出框 2015-08-24 11:40:09 +08:00
sw f6d122e37f Merge branch 'guange_dev' into sw_new_course 2015-08-24 11:04:19 +08:00
sw 86b151979b js相关 2015-08-24 11:03:09 +08:00
sw 111478ec72 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
 2015-08-24 10:39:52 +08:00
guange baea29e2f0 回复需要点击两次才能显示的问题 2015-08-22 15:48:20 +08:00
huang 17aae7c79d 解决CSS冲突 2015-08-21 17:40:28 +08:00
sw 2a522f144e 编辑个人简介 2015-08-21 16:29:25 +08:00
lizanle 1aa61acd79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/public.css
 2015-08-21 16:16:18 +08:00
cxt e1fb2a6bab 个人主页动态 2015-08-21 16:07:18 +08:00
sw d942cc3123 性别的判断 2015-08-21 15:40:38 +08:00
sw 8ef6225084 个人主页，添加、取消关注及相关效果 2015-08-21 15:23:03 +08:00
lizanle 11d6298efa 资源库 合并后css样式冲突 2015-08-21 14:37:19 +08:00
sw 73854cc35c 右侧静态页面如果没有内容时增加默认最小高度 2015-08-21 14:25:01 +08:00
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-21 14:10:50 +08:00
huang 2473849a6b 作品只打分不留言的情况！ 2015-08-21 13:53:36 +08:00
huang 947fcc160c 修改列表显示样式！ 2015-08-21 10:49:13 +08:00
ouyangxuhua 2f21b4663d 消息颜色更改 2015-08-20 16:46:22 +08:00
lizanle 7ddf6d1e7d 资源库 多选发送 2015-08-20 16:05:58 +08:00
sw 2f43296854 更新课程样式 2015-08-20 10:23:29 +08:00
sw f48e77901a 用户上传头像功能 2015-08-19 17:14:19 +08:00
lizanle 929da7512d 资源库最新界面修改 2015-08-19 17:13:57 +08:00
sw e64c15a026 个人主页基本页面布局完成 2015-08-19 16:32:05 +08:00
sw b6a2be72e4 调整CSS，修改图片，实现部分功能动态效果 2015-08-19 15:13:30 +08:00
sw d8da74a0d4 更新css，增加个人主页公共部分的动态效果 2015-08-19 14:43:12 +08:00
ouyangxuhua ff3edf4d5e 消息显示 2015-08-19 11:12:47 +08:00
sw 752fe93d72 已登录用户header完成 2015-08-18 11:47:22 +08:00
sw b27944fad7 增加css文件以及个人主页静态页面、缺失图片 2015-08-18 10:59:31 +08:00
huang 4bc0e0eb69 项目模块消息添加 
讨论区结构优化
 2015-08-18 10:31:40 +08:00
huang 9c8679eda8 铃铛样式 2015-08-17 16:07:45 +08:00
ouyangxuhua 8f23a81261 消息显示样式更新 2015-08-17 15:56:16 +08:00
huang a677119ba0 修改界面样式 2015-08-17 15:20:46 +08:00
ouyangxuhua e72eeb37c8 通知显示 2015-08-17 15:05:26 +08:00
ouyangxuhua 276653d9a2 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-17 11:37:14 +08:00
ouyangxuhua e6cf2f400c 添加样式 2015-08-17 11:35:47 +08:00
huang 239cba54d9 区分未读消息和已读消息 2015-08-17 11:34:29 +08:00
huang a38e91b3d3 Merge branch 'szzh' into dev_hjq 2015-08-15 17:10:02 +08:00
lizanle 421f86cdaf 资源库 2015-08-15 17:07:50 +08:00
lizanle 89b9a5c09d 资源库 2015-08-15 17:06:41 +08:00
huang fc244982bc 处理冲突 
修改浏览器兼容问题
 2015-08-15 17:06:19 +08:00
huang 9a695b2d09 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/models/poll.rb
 2015-08-15 16:54:51 +08:00
huang 4ffdd05a19 消息为空给出提示 
连接鼠标经过颜色
 2015-08-15 16:50:21 +08:00
huang 9b98bdcf5c 1、消息看过则不提示（方法实现） 
2、添加消息新按钮
 2015-08-15 15:44:44 +08:00
huang ed8c4ac906 不同类型消息发送 2015-08-15 02:11:18 +08:00
huang 4013ff486a 消息界面调整 2015-08-14 17:35:10 +08:00
sw 9b424a5b17 课程问卷调查----点击问卷列表中如图空白处也返回相关问卷详情页面 2015-08-14 17:25:53 +08:00
huang 7ea0fac774 1。发布作业消息提醒 
2、新建问卷消息提醒
3、消息界面（未完成）
 2015-08-14 15:48:23 +08:00
sw 16aea5ef42 迟交扣分0-50分 2015-08-14 15:44:54 +08:00
huang b958340ab6 Merge branch 'szzh' into dev_hjq 2015-08-14 08:55:41 +08:00
huang ee778b5968 1、增加issue消息提醒（发送给指派的人） 
2、下拉框形式区分消息
3、相关关联
 2015-08-12 17:45:17 +08:00
sw 2f77adfe9c 课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示 2015-08-12 16:24:27 +08:00
sw 09b1c03ef2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-10 11:21:04 +08:00
lizanle d0bca180ca Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-10 09:12:57 +08:00
lizanle 5d82f3336e 导入作者是我，但是问卷在其他课程里的问卷，可以多选 2015-08-10 09:12:26 +08:00
huang a51b532a0b 个人主页CSS 2015-08-04 18:18:37 +08:00
sw 3d2a91c6be Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-04 18:15:42 +08:00
huang 7ff93753c6 css 2015-08-04 18:10:48 +08:00
sw e4378f1c4b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-04 18:08:21 +08:00
sw 2e4babc2ae 修改demo代码，增加C++的示例代码 2015-08-04 17:52:57 +08:00
sw f482d64a72 编译错误才存储错误信息 2015-08-04 16:42:17 +08:00
sw 9b5a1a5203 增加标准代码显示 2015-08-04 16:02:17 +08:00
sw 3f51368bb2 老师布置作业界面增加错误信息的提示 2015-08-04 15:25:05 +08:00
huang 15b3d527dc footer 2015-08-01 18:15:04 +08:00
sw fe2d621dc3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/helpers/users_helper.rb
 2015-08-01 15:17:01 +08:00
huang c376c0e38f 新建版本 --新页面设计 2015-08-01 11:25:33 +08:00
sw cbbc93acbd 当标准代码内容改变时，自动还原所有的测试信息 2015-08-01 10:45:32 +08:00
sw e17b834706 编辑资料显示在头像的右下角 2015-07-31 16:09:07 +08:00
huang b42d8c6d2c Merge branch 'szzh' into dev_hjq 2015-07-31 15:47:27 +08:00
sw d5cf0c65a7 验证正确和错误之后，可以继续点击进行验证 2015-07-31 15:38:50 +08:00
huang b4e12b6e71 解决版本库--查看修订异常问题 2015-07-31 15:29:55 +08:00
sw a74409fa04 回复子留言不成功 2015-07-31 15:18:57 +08:00
sw a52c906217 用户留言界面插件问题 2015-07-31 14:18:32 +08:00
huang 93ef63d60d Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/layouts/base_users_new.html.erb
 2015-07-31 14:07:04 +08:00
sw f163cdac51 老师点击测试自动刷新，每组测试对标准代码的返回结果存储 2015-07-30 21:02:04 +08:00
sw 3e5af49281 点击测试时增加事件的发送 2015-07-30 20:36:00 +08:00
sw 5e885d9417 老师布置编程作业界面增加测试，以及测试结果的存储 2015-07-30 17:38:01 +08:00
sw 28509b7cdd 老师布置编程作业界面增加测试按钮 2015-07-30 17:27:42 +08:00
sw 32122796f9 1、我的课程、我的项目留言js问题 
2、编辑资料无法提交
3、访问他人项目不显示加入项目按钮
 2015-07-30 11:44:36 +08:00
sw 7628a53cdc 留言回复 2015-07-30 10:45:58 +08:00
huang 03be4dd80d 课程搜索结果列表问题 2015-07-30 10:03:48 +08:00
huang 88ec9ca0ca 修改个人主页---关注 2015-07-30 09:39:38 +08:00
sw 51a7044e05 个人主页留言图片最大宽度为100% 2015-07-30 09:20:54 +08:00
sw 023f51260a 个人主页相关界面js刷新页面的时候给出等待的提示 2015-07-30 09:12:43 +08:00
huang 206d1a38f7 修改项目动态缺陷异常 2015-07-30 09:07:11 +08:00
sw e4e99df113 个人主页留言界面显示以及留言的删除 2015-07-29 17:41:10 +08:00
huang 55f8484654 项目留言提交JS问题修复 2015-07-29 16:54:10 +08:00
sw 9c704b7dc1 个人主页留言静态页面 
更新css
路由及相关代码整理
 2015-07-29 10:34:04 +08:00
sw 8ef0d0f8a6 1、个人主页，布局右侧显示不够左侧长度时自动补充 
2、个人主页js、css提取出来
3、css错误整理
 2015-07-28 16:38:18 +08:00
lizanle ad5c4052fb Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-28 10:27:56 +08:00
lizanle 45d5972a93 在发布问卷的时候中间可以插入问题 2015-07-28 10:27:45 +08:00
sw 6091369e02 增加学校logo的上传功能，以及实时预览效果 2015-07-27 18:20:20 +08:00
sw 7c818ce59a admin界面增加学校列表显示，以及按名称过滤功能 2015-07-27 16:07:29 +08:00
sw 7f8f957a71 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-24 14:27:45 +08:00
sw 430956bfe5 我要反馈---下拉编辑框时边框消失 2015-07-24 14:24:31 +08:00
huang b6812d8810 Merge branch 'szzh' into dev_hjq 2015-07-24 09:49:06 +08:00
cxt afce49839f Merge branch 'szzh' into dev_cxt2 
Conflicts:
	app/views/layouts/base_users_new.html.erb
 2015-07-24 09:07:58 +08:00
zhangshenjerry d639942b82 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/helpers/users_helper.rb
	app/views/layouts/base_users_new.html.erb
 2015-07-24 08:58:56 +08:00
sw b781d22a62 删除课程过滤器中没有的方法，增加删除课程的action 2015-07-23 16:17:13 +08:00
sw f4786ea71f 学生列表加入时间对齐 2015-07-23 10:23:27 +08:00
huang 6cbafb66d9 版本库添加统计说明 2015-07-23 10:20:32 +08:00
sw c0eea86132 增加错误信息的显示 2015-07-23 10:12:07 +08:00
cxt 3b6d6596c0 3218 3219缺陷的修复 2015-07-21 11:59:15 +08:00
yutao 83bbb62149 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-21 11:19:43 +08:00
yutao 6df40be30e 个人主页：如图“取消”改为“取消关注” 2015-07-21 10:38:38 +08:00
sw 10c0a85846 学生作品列表分班过滤宽度的问题 2015-07-20 12:03:10 +08:00
huang c198a03a90 DTS测试工具 2015-07-19 20:08:57 +08:00
sw c66e74dc82 Merge branch 'szzh' into develop 2015-07-18 17:10:04 +08:00
sw 8c82f6c6a7 编程作业新增测试取消测试按钮 2015-07-18 16:34:24 +08:00
yutao 5ecf7f12af 喻涛 2015-07-18 16:10:47 +08:00
sw d0482fdb65 作品列表搜索报500 2015-07-18 11:38:00 +08:00
sw a7666af597 Merge branch 'yutao' into szzh 
Conflicts:
	app/controllers/users_controller.rb
 2015-07-17 17:38:07 +08:00
yutao 8e3bc28fa2 个人主页 2015-07-16 13:43:01 +08:00
yutao 11ae8c82d4 个人主页 2015-07-16 11:37:03 +08:00
sw b6e123e476 右上角导航栏问题 2015-07-16 10:49:39 +08:00
yutao 87ab758ec5 个人主页->动态 2015-07-16 10:26:09 +08:00
sw 66c1dfa77e 作品列表增加分班的过滤 2015-07-15 17:34:34 +08:00
sw f909fbb835 作品列表增加分班过滤 2015-07-15 16:01:03 +08:00
sw 67c054e3af Merge branch 'szzh' into sw_new_course 2015-07-15 15:29:47 +08:00
huang c9c3d2e3d8 修改讨论区行数过高压住字体 2015-07-10 16:29:49 +08:00
sw aeb0d23289 Merge branch 'develop' into sw_new_course 
Conflicts:
	app/views/homework_common/index.html.erb
 2015-07-10 15:42:53 +08:00
huang b089b973ab Merge branch 'szzh' into dev_hjq 2015-07-10 15:41:53 +08:00
yutao 02d09c84b4 个人主页->留言 2015-07-10 14:17:19 +08:00
huang 57f6f72c64 修改编辑器下面多余的黑色框框 2015-07-10 13:09:09 +08:00
huang fc61edf1fa 课程讨论区添加真实姓名 
编辑器图片更新
 2015-07-10 10:37:34 +08:00
zhangshenjerry 66042a90f3 创新竞赛--竞赛通知：评论通知输入框显示超出边框 2015-07-10 09:23:36 +08:00
yutao 5c011fd342 个人主页 2015-07-09 15:27:49 +08:00
huang 8de307d198 项目资源库区分“项目内搜索”和“全站搜索” 2015-07-09 14:36:59 +08:00
sw 2eff8cce6a 更新css文件 2015-07-08 16:38:34 +08:00
sw 6af6fdd5a3 编程作业分配比例添加以及界面显示 2015-07-08 11:17:59 +08:00
huang 7ebdf4a08d issue列表增加优先级 
修改issue列表界面
 2015-07-07 11:29:40 +08:00
zhangshenjerry 04f125c7a6 张申修改的bug 2015-07-06 11:42:26 +08:00
sw 5e90684677 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/homework_common_controller.rb
 2015-07-06 10:44:07 +08:00
sw 283e93c9e2 为启用匿评作业不现实匿评栏 2015-07-04 12:07:21 +08:00
huang 162fcc7ff4 Merge branch 'szzh' into dev_hjq 2015-07-03 16:04:55 +08:00
sw 4eb9ce6f0f css报错 2015-07-03 10:58:30 +08:00
sw d2b76e92f2 展开后成绩得分框显示位置 2015-07-03 10:55:22 +08:00
huang e986ee4e4e Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/_edit.html.erb
 2015-07-03 10:51:54 +08:00
sw 642fa8dd5d 1、缺评、迟交扣分 
2、匿评提示框、最终成绩计算提示框
3、修改作业
 2015-07-03 10:47:10 +08:00
huang b16e19096f 添加新闻回复 2015-07-03 10:25:21 +08:00
sw 1e12b68027 下载附件提示遮住按钮 2015-07-03 10:09:49 +08:00
zhangshenjerry 54317af6d8 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-02 15:31:34 +08:00
zhangshenjerry 448cedc842 回复的收缩 2015-07-02 15:30:09 +08:00
sw 59f6ef81cd 附件提示框固定位置 2015-06-30 10:15:04 +08:00
sw 90c4a38cfc 公共贴吧头像显示问题 2015-06-26 17:00:33 +08:00
sw 0f92a2e3cb 下载附件给出使用winrar解压的提示 2015-06-26 14:29:03 +08:00
sw 0215d2224e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-26 13:41:33 +08:00
yutao 5e29c6bf27 bug#2742:项目问题跟踪：新建问题时在描述中直接贴图，若图片长度够长，在个人动态中显示超出边框 2015-06-26 10:14:26 +08:00
huang 5d0cd4520e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-26 10:04:48 +08:00
huang cf0e1b3bd5 修改缺陷：上传名称较长的资源，文字被截断了 2015-06-26 09:47:58 +08:00
yutao e6a15a45c4 bug#2782:讨论区：若某一级回帖是视频，再二级回复该回复信息，显示时超出边框 2015-06-26 09:42:17 +08:00
sw ebeeb9cf28 开启匿评后学生提交作品提示，开启匿评时对老师的提示 
界面css
 2015-06-25 15:55:57 +08:00
guange 38b97aa558 下载url有两处需要处理的 2015-06-24 16:23:15 +08:00
guange 81187dea36 有带+号的作业无法打包下载的问题 2015-06-24 16:07:54 +08:00
sw e3c67fb17a Merge branch 'szzh' into sw_new_course 2015-06-19 15:05:24 +08:00
sw 857110d537 作品列表增加时间显示，相应界面调整 2015-06-19 11:54:01 +08:00
sw 810561c31b 老师才可以查看缺评情况 2015-06-19 10:26:56 +08:00
sw 1c10775619 Merge branch 'guange_dev' into szzh 2015-06-19 10:18:24 +08:00
sw 43363e8bcb 缺评情况功能 2015-06-18 17:56:28 +08:00