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

5616 Commits

Author SHA1 Message Date
lizanle 5f23244742 忘记密码 2015-08-26 17:59:05 +08:00
cxt a7ce1168db Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:58:59 +08:00
cxt caec5e5490 个人主页动态 2015-08-26 17:58:48 +08:00
sw 347298124e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:55:40 +08:00
sw e4a36b9be2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:55:07 +08:00
sw 01c8ee3898 1、个人主页新建课程、新建项目、加入课程功能添加 
2、新建课程时导航栏的修改
 2015-08-26 17:54:41 +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 5b9c9312f5 留言界面样式修改 2015-08-26 17:42:02 +08:00
sw afeaecc478 作业列表增加标题 2015-08-26 17:37:53 +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
cxt 7c3544dfec 个人主页动态 2015-08-26 17:21:58 +08:00
cxt 706415dc6e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:03:15 +08:00
cxt 2124b3c392 个人主页动态缺陷修复 2015-08-26 17:02:54 +08:00
lizanle 9e9de44397 服务协议 2015-08-26 16:51:03 +08:00
lizanle ba9a64360e Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 16:50:36 +08:00
lizanle 65b5b467d4 服务协议 2015-08-26 16:50:26 +08:00
huang ef74d129c5 消息通知回复链接样式 2015-08-26 16:35:53 +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
lizanle f43e312fbb Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 15:49:11 +08:00
lizanle a53b9f9049 留言模块 2015-08-26 15:49:05 +08:00
sw af2434809b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:47:05 +08:00
huang 7340a664f2 链接颜色 2015-08-26 15:42:12 +08:00
cxt eed1939d2f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:25:15 +08:00
cxt 048319ef8e 个人主页 2015-08-26 15:24:57 +08:00
sw 4fe3ba2442 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:23:41 +08:00
sw a08d32d0f3 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:18:05 +08:00
sw e2869faa08 日历选择器的样式调整 2015-08-26 15:17:56 +08:00
lizanle 7f19295b88 服务协议 2015-08-26 15:07:59 +08:00
huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
 2015-08-26 15:04:44 +08:00
huang 1dce1a2a4c 老师更新作品评阅消息通知 
区分第一次评阅和后面的评阅
 2015-08-26 14:47:53 +08:00
lizanle d500ea0790 关注人数变化 2015-08-26 14:39:33 +08:00
lizanle da47f5bb00 登录报错后就无法登录bug 2015-08-26 14:23:25 +08:00
sw 7081fc9975 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 14:11:47 +08:00
lizanle cb61816d9a 登录字样写错了 2015-08-26 14:12:18 +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
sw aa28b5ba6a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 09:14:44 +08:00
lizanle 4ee571e586 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 09:11:10 +08:00
lizanle cf12ee877e 编辑资料的时候个人说明隐藏 2015-08-26 09:11:03 +08:00
huang 0007b720b3 修改描述 2015-08-26 09:01:02 +08:00
cxt cccc0577c7 个人动态 2015-08-26 08:51:39 +08:00
cxt fce523606c 个人主页 2015-08-25 20:08:52 +08:00
sw ab7fd7bc8f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 20:06:37 +08:00
sw 18029fcb22 111 2015-08-25 20:06:25 +08:00
sw ad524f5a6c 取消课程、项目、贴吧等独自的搜索条，搜索统一使用导航栏搜索条 2015-08-25 19:41:22 +08:00
huang 627ca059ca 解决issue的更新 
和新建问题
 2015-08-25 19:30:22 +08:00
cxt e4c9f05c7b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 19:24:37 +08:00
cxt bd00870eba 个人主页 2015-08-25 19:24:23 +08:00
sw 56a1283033 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 19:19:41 +08:00
sw d8b87ccc37 作业列表滚动到底部显示下面10条作业 2015-08-25 19:18:56 +08:00
lizanle 5c43c902c4 编辑资料css 2015-08-25 19:07:59 +08:00
lizanle 70e9d75cc6 登陆后的搜索 2015-08-25 18:59:45 +08:00
sw bedc364275 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/layouts/_unlogin_header.html.erb
 2015-08-25 18:26:25 +08:00
lizanle d2135f7204 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-25 18:27:00 +08:00
lizanle 0be3ef0a65 搜索 2015-08-25 18:26:54 +08:00
sw 767fc67686 已过期课程显示为darkgrey 2015-08-25 18:22:46 +08:00
sw 6ea185f250 修改资料页面跳转以及搜索弹出框样式 2015-08-25 18:17:31 +08:00
ouyangxuhua 10e39a6967 发帖的消息内容显示的是帖子的主题 2015-08-25 17:42:39 +08:00
sw 30147c29ee 帮助中心页面跳转 2015-08-25 17:30:55 +08:00
sw a32d6697ce 点击确实图标，跳转到登录界面 2015-08-25 17:27:28 +08:00
ouyangxuhua 0056fa9db3 修改了课程问卷的link_to以及对应的course_messages的viewed字段 2015-08-25 17:06:38 +08:00
lizanle c360bdaf7d logout 2015-08-25 16:39:22 +08:00
lizanle 79bd438c87 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-25 16:08:57 +08:00
lizanle f2e406a416 登陆注册按钮改为页面跳转 2015-08-25 16:08:52 +08:00
sw 0d9a397453 登录、未登录搜索条件选择js 
用户主页 show方法改造
 2015-08-25 16:01:31 +08:00
sw e2af9e26f8 个人主页报错 2015-08-25 15:35:45 +08:00
ouyangxuhua 67c31d59d0 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 15:20:44 +08:00
ouyangxuhua 03ac1ca37c 消息人物头像链接 2015-08-25 15:20:24 +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
cxt 097d52c07a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 15:09:02 +08:00
cxt 4915f7977e 个人动态 2015-08-25 15:08:35 +08:00
lizanle 725143b894 登陆界面 错误信息提示 2015-08-25 14:51:07 +08:00
huang 716ffcfdc9 修改留言多余内容 2015-08-25 14:35:26 +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
huang 3170fb2377 相关问题 2015-08-25 13:56:48 +08:00
huang 36c855cc65 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 13:52:41 +08:00
huang 90c199f15a 缺陷更新区别新建 2015-08-25 13:51:42 +08:00
sw c93bc5be40 作业列表效果显示 2015-08-25 13:50:42 +08:00
ouyangxuhua 49af0cdea7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 13:05:06 +08:00
ouyangxuhua d7de5fc480 更改消息样式 2015-08-25 13:04:46 +08:00
huang 4c974266b8 没消息显示！ 2015-08-25 13:04:25 +08:00
huang b1ed9deba1 内容框对齐 2015-08-25 12:46:57 +08:00
huang 3ecdb2940b 去掉统计信息 2015-08-25 12:43:27 +08:00
huang 0da75afc88 消息排序（公共表） 2015-08-25 11:10:08 +08:00
sw 5b99effbc8 更新css，编辑个人简介功能BUG 2015-08-25 10:30:31 +08:00
sw 67c4561b28 我的课程、我的项目图标 2015-08-25 10:04:27 +08:00
cxt 9320cd18d3 个人动态的项目讨论动态 2015-08-25 09:50:36 +08:00
sw d132c08a11 增加footer 2015-08-25 09:29:19 +08:00
huang 5306d7e2a4 列表排序（未完） 2015-08-24 23:53:28 +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 45d90639c9 静态页面的间距 2015-08-24 18:17:33 +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
huang d575ce5e5f 消息公共表 2015-08-24 17:51:19 +08:00
cxt 51c2f595d1 个人主页动态 2015-08-24 17:45:09 +08:00
sw 26c5592d29 用户课程或项目名称过长时的显示 2015-08-24 17:04:40 +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
sw a9c7c252e5 搜索功能js以及类型的选择 2015-08-24 16:16:07 +08:00
huang f26ccac3b9 Merge branch 'sw_new_course' into dev_hjq 2015-08-24 15:46:29 +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 fe91442c96 课程列表已关闭课程标识出来 2015-08-24 15:18:07 +08:00
huang 4d0abbc4d3 添加消息总数和未读控制 2015-08-24 15:03:45 +08:00
sw 7f2f2c5d40 个人主页，项目更多功能 2015-08-24 14:53:35 +08:00
lizanle 12b89e2c81 可拖动的框暂时做不了。 2015-08-24 14:53:30 +08:00
huang 3919f15806 调整消息提示样式及连接 2015-08-24 14:52:23 +08:00
sw 2d75fea96b 课程点击更多按钮显示 2015-08-24 14:44:22 +08:00
huang 17b06963dd 添加未读样式 2015-08-24 14:29:38 +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
huang fe8924443c html_safe显示 2015-08-24 12:46:48 +08:00
sw 36152d19e8 个人show界面下面有一块空白界面 2015-08-24 11:42:26 +08:00
sw 0287a0f3b4 个人积分弹出框 2015-08-24 11:40:09 +08:00
huang 4fd90464d9 Merge branch 'sw_new_course' into dev_hjq 2015-08-24 11:38:50 +08:00
huang 98b6c090c6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-24 11:38:06 +08:00
huang 374c596a50 添加新图标，新base 2015-08-24 11:37:50 +08:00
sw 15c44297cc 用户base关联user_base.js 2015-08-24 11:32:14 +08:00
huang 1e6db593d6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 11:19:41 +08:00
huang 9f664d8172 修改表情无法显示问题 2015-08-24 11:19:20 +08:00
ouyangxuhua 657f5f9acf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 11:15:50 +08:00
ouyangxuhua ab37372dad 增加消息用户链接 2015-08-24 11:13:41 +08:00
huang e129404b4c 解决图标点两次的问题 2015-08-24 11:11:45 +08:00
sw f6d122e37f Merge branch 'guange_dev' into sw_new_course 2015-08-24 11:04:19 +08:00
sw 08ab08d064 Merge branch 'develop' into sw_new_course 2015-08-24 11:03:18 +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
huang ff3816e97d 添加链接，修复留言无法显示问题 2015-08-24 10:38:41 +08:00
lizanle 67c5a8e9c5 分页改为了15条 2015-08-24 10:31:25 +08:00
huang b9980d4ab1 消息没显示问题！ 2015-08-24 10:30:27 +08:00
guange 3a601bbd2c Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-21 19:23:17 +08:00
huang 17aae7c79d 解决CSS冲突 2015-08-21 17:40:28 +08:00
cxt 011184b537 个人主页 2015-08-21 17:26:52 +08:00
lizanle 53c28a9b39 新成员注册的时候报错 2015-08-21 17:13:42 +08:00
lizanle 2589179fca 管理员登陆报错 2015-08-21 16:57:44 +08:00
lizanle f6b01b300d 资源库 全部里能看到课程资源，但是分类里边却没有。 2015-08-21 16:36:42 +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
lizanle 051c921108 资源库 多选发送给出提示 2015-08-21 15:58:32 +08:00
sw d942cc3123 性别的判断 2015-08-21 15:40:38 +08:00
huang 5594295c9e 添加问题更新策略 
显示更新内容
 2015-08-21 15:27:01 +08:00
sw 8ef6225084 个人主页，添加、取消关注及相关效果 2015-08-21 15:23:03 +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 a53e66d4b0 消息中同事显示 评论和 打分 2015-08-21 14:04:10 +08:00
lizanle 4928d5976e 资源库 上传以后逻辑修改 2015-08-21 14:00:24 +08:00
huang 2473849a6b 作品只打分不留言的情况！ 2015-08-21 13:53:36 +08:00
huang 241d525e2c 问卷名为空的显示“未命名问卷” 2015-08-21 13:08:05 +08:00
huang 3f3c55cb52 修复名字为空的缺陷 2015-08-21 12:59:50 +08:00
lizanle 3feff49ca3 资源库 只能删除上传者为自己的资源 2015-08-21 10:32:13 +08:00
lizanle cf243d47e5 资源库 只能删除上传者为自己的资源 2015-08-21 10:28:29 +08:00
lizanle 3c6484269d 资源库 只能删除上传者为自己的资源 2015-08-21 10:14:04 +08:00
huang 9b827a698c 鼠标经过的时候显示完整的标题 2015-08-21 10:02:58 +08:00
lizanle 7deafac280 资源库 修改 2015-08-21 10:02:26 +08:00
huang ef45e41a40 新消息提醒。表情插入 2015-08-21 09:41:59 +08:00
lizanle 705d31b1d0 资源库 修改 2015-08-20 17:38:30 +08:00
cxt 4c87071765 个人动态 2015-08-20 17:24:34 +08:00
huang 29b8a9dd9d 添加项目新闻回复 消息通知 2015-08-20 17:20:38 +08:00
lizanle 0e8c1d1b66 资源库 分页 2015-08-20 17:00:54 +08:00
huang ff53840029 修改消息中存在的页面bug 2015-08-20 16:27:49 +08:00
lizanle 7ddf6d1e7d 资源库 多选发送 2015-08-20 16:05:58 +08:00
huang 93f44287aa jounal状态 2015-08-20 14:32:46 +08:00
huang b40122c9ee 跟新issue状态！ 2015-08-20 14:18:16 +08:00
huang a15ab2c72e Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-08-20 14:07:11 +08:00
lizanle f97a55e164 资源库 删除 2015-08-20 14:01:33 +08:00
huang 404a6f4bca Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-20 14:00:47 +08:00
huang 6b847e27d9 修正问题 2015-08-20 14:00:31 +08:00
ouyangxuhua cb773e37ea Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-20 12:49:49 +08:00
ouyangxuhua ee09a105d2 贴吧帖子改名 2015-08-20 12:46:31 +08:00
huang f829c6ff23 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
 2015-08-20 12:45:21 +08:00
huang e4dda89c07 消息---用户留言界面 2015-08-20 12:44:32 +08:00
ouyangxuhua 84182171f5 消息信息显示 2015-08-20 12:41:53 +08:00
lizanle 107a5686d1 资源库 全选反选 2015-08-20 11:37:32 +08:00
ouyangxuhua 88fe0a69f4 消息显示判断 2015-08-20 10:38:14 +08:00
lizanle 76c2c47adf 资源库 2015-08-20 10:14:26 +08:00
ouyangxuhua d387a529d7 增加公共贴吧消息 2015-08-19 17:28:43 +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 a536af8fa3 用户show界面更新 2015-08-19 15:18:12 +08:00
sw b6a2be72e4 调整CSS，修改图片，实现部分功能动态效果 2015-08-19 15:13:30 +08:00
huang 425e0dd89a 公共讨论区消息页面添加 
部分界面修改
 2015-08-19 15:03:04 +08:00
sw d8da74a0d4 更新css，增加个人主页公共部分的动态效果 2015-08-19 14:43:12 +08:00
ouyangxuhua ff3edf4d5e 消息显示 2015-08-19 11:12:47 +08:00
lizanle 3836cfb40b 资源库 2015-08-18 17:45:14 +08:00
lizanle 43d57074e5 资源库 2015-08-18 17:26:39 +08:00
cxt 652f5fa6e1 超级管理员的留言列表、帖子、最近登录用户列表的缺陷修复 2015-08-18 17:00:58 +08:00
lizanle ae6260571b 资源库 2015-08-18 16:57:41 +08:00