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

2695 Commits

Author SHA1 Message Date
lizanle 733876743e 服务协议 忘记密码 2015-08-26 17:52:23 +08:00
sw dafc128f34 增加部分默认参数的设置 2015-08-26 17:44:03 +08:00
sw 650d0c8cb5 匿评分配数量默认为3 2015-08-26 17:42:52 +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 85b90f9958 消息代码清理 2015-08-26 16:56:41 +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 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 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
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
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
sw 47b20a7633 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 14:50:33 +08:00
sw 8247a29b85 只有admin用户可以修改个人简介 2015-08-26 14:50:01 +08:00
lizanle d500ea0790 关注人数变化 2015-08-26 14:39:33 +08:00
lizanle d735eee4a3 关注和取消关注 2015-08-26 11:41:32 +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
cxt fce523606c 个人主页 2015-08-25 20:08:52 +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
ouyangxuhua 24f26749c0 修改memo对应的memo_messages的viewed字段 2015-08-25 17:41:59 +08:00
ouyangxuhua 0056fa9db3 修改了课程问卷的link_to以及对应的course_messages的viewed字段 2015-08-25 17:06:38 +08:00
ouyangxuhua f56d9ed265 设置作业对应的forge_messages表的viewed字段 2015-08-25 16:42:29 +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 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
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 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 c93bc5be40 作业列表效果显示 2015-08-25 13:50:42 +08:00
huang 4c974266b8 没消息显示！ 2015-08-25 13:04:25 +08:00
huang 64e54cda75 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 12:43:47 +08:00
huang 3ecdb2940b 去掉统计信息 2015-08-25 12:43:27 +08:00
ouyangxuhua 32e67a3cb1 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 11:17:57 +08:00
ouyangxuhua 12c3f5a723 消息讨论区viewed字段更新 2015-08-25 11:17:37 +08:00
huang bff139b9a7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 11:10:32 +08:00
huang 0da75afc88 消息排序（公共表） 2015-08-25 11:10:08 +08:00
ouyangxuhua 354cb52339 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 10:20:39 +08:00
ouyangxuhua d83ed09617 更新viewed字段 2015-08-25 10:19:47 +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 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
ouyangxuhua b7a473a1b2 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 17:46:11 +08:00
cxt 51c2f595d1 个人主页动态 2015-08-24 17:45:09 +08:00
ouyangxuhua f0483b6de8 更新新闻viewed 2015-08-24 17:45:00 +08:00
ouyangxuhua bf596d7b4b 更新新闻viewed字段 2015-08-24 17:44:13 +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 614743d8d4 登陆界面 2015-08-24 16:22:06 +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 7f2f2c5d40 个人主页，项目更多功能 2015-08-24 14:53:35 +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
huang 3858e87482 user留言类型 2015-08-24 11:43:43 +08:00
huang aadfd16e6a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 11:39:03 +08:00
huang 374c596a50 添加新图标，新base 2015-08-24 11:37:50 +08:00
ouyangxuhua b2ac4e8e1f 项目消息问题 2015-08-24 11:27:36 +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
lizanle 67c5a8e9c5 分页改为了15条 2015-08-24 10:31:25 +08:00
lizanle 830815d3fd 课程资源搜索bug 2015-08-21 21:29:33 +08:00
guange 3a601bbd2c Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-21 19:23:17 +08:00
sw cc4661a9b8 Merge branch 'szzh' into develop 2015-08-21 17:38:21 +08:00
lizanle f763fcf144 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-21 17:13:52 +08:00
lizanle 53c28a9b39 新成员注册的时候报错 2015-08-21 17:13:42 +08:00
sw c3bd085068 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-21 17:09:00 +08:00
lizanle 033aea28c5 新成员注册的时候报错 2015-08-21 17:05:54 +08:00
sw 0489b02e54 课程留言无法删除 2015-08-21 17:00:17 +08:00
lizanle f6b01b300d 资源库 全部里能看到课程资源，但是分类里边却没有。 2015-08-21 16:36:42 +08:00
huang 4e4df99bb1 处理冲突 2015-08-21 16:34:57 +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 9138f46301 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-21 14:10:50 +08:00
lizanle 4928d5976e 资源库 上传以后逻辑修改 2015-08-21 14:00:24 +08:00
lizanle 8a88935b7c 资源库 只能看到自己的资源库 2015-08-21 10:44:09 +08:00
lizanle 3c6484269d 资源库 只能删除上传者为自己的资源 2015-08-21 10:14:04 +08:00
lizanle 7deafac280 资源库 修改 2015-08-21 10:02:26 +08:00
huang 840caf18f3 修改排序 2015-08-20 17:40:01 +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 7c7c337deb 控制界面 2015-08-20 16:29:43 +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 e4dda89c07 消息---用户留言界面 2015-08-20 12:44:32 +08:00
huang b5682adcd3 添加统计数 2015-08-20 10:50:40 +08:00
huang 192f16ba79 修改memo类 
添加新的用户留言表结构
 2015-08-20 10:38:22 +08:00
lizanle 76c2c47adf 资源库 2015-08-20 10:14:26 +08:00
huang 6b6f6e0b0d 个人主页留言消息推送 2015-08-20 09:25:48 +08:00
huang c8399cdf58 去掉forum 2015-08-19 17:49:47 +08:00
huang d18d1a9d81 用户留言添加 
公共讨论区留言修改
 2015-08-19 17:29:05 +08:00
lizanle 929da7512d 资源库最新界面修改 2015-08-19 17:13:57 +08:00
huang 425e0dd89a 公共讨论区消息页面添加 
部分界面修改
 2015-08-19 15:03:04 +08:00
lizanle 0ef7d5f0fa 资源库可见性问题 2015-08-19 12:04:06 +08:00
huang d657e9f3cc 新增 公共贴吧 消息通知 2015-08-19 11:06:39 +08:00
lizanle e7f818deb9 资源库搜索问题 2015-08-19 09:20:39 +08:00
lizanle 43d57074e5 资源库 2015-08-18 17:26:39 +08:00
lizanle ae6260571b 资源库 2015-08-18 16:57:41 +08:00
huang 90661066d3 区分课程/项目讨论区 
课程项目/新闻 的消息显示方式
 2015-08-18 16:53:26 +08:00
huang f9fc63402b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-18 15:27:37 +08:00
huang 6b55474623 作品被评阅 
作品被回复
消息通知
 2015-08-18 15:27:16 +08:00
lizanle 7219586b1e 资源库 2015-08-18 15:25:36 +08:00
ouyangxuhua 3e4f726855 增加留言、指派给我 2015-08-18 14:43:15 +08:00
cxt 27ff5471ec 超级管理员新增功能页面的分页、添加超链接，添加查询条件。 2015-08-18 14:40:12 +08:00
lizanle 76be15f79b 资源库 2015-08-18 11:53:54 +08:00
sw 752fe93d72 已登录用户header完成 2015-08-18 11:47:22 +08:00
huang 4bc0e0eb69 项目模块消息添加 
讨论区结构优化
 2015-08-18 10:31:40 +08:00
lizanle 25460cd255 资源库 2015-08-18 09:31:03 +08:00
huang 71f6927145 issue控制层消息 2015-08-17 16:37:05 +08:00
huang dd1dd143f6 添加项目缺陷消息显示 2015-08-17 16:15:40 +08:00
huang 472254019e 优化 2015-08-17 16:04:04 +08:00
huang fe077a27fb 消息查询代码优化 2015-08-17 15:04:09 +08:00
huang 239cba54d9 区分未读消息和已读消息 2015-08-17 11:34:29 +08:00
huang a71ff944c0 消息排序 2015-08-17 10:42:38 +08:00
guange d36da76685 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-15 19:47:53 +08:00
huang a38e91b3d3 Merge branch 'szzh' into dev_hjq 2015-08-15 17:10:02 +08:00
cxt 58613e843b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-08-15 17:09:10 +08:00
cxt da20f6bc89 超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业 2015-08-15 17:06:50 +08:00
lizanle 89b9a5c09d 资源库 2015-08-15 17:06:41 +08:00
huang 9a695b2d09 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/models/poll.rb
 2015-08-15 16:54:51 +08:00
huang 64e1d88285 去掉项目消息提示 
未登录情况下访问跳转至403
 2015-08-15 16:11:40 +08:00
huang 9b98bdcf5c 1、消息看过则不提示（方法实现） 
2、添加消息新按钮
 2015-08-15 15:44:44 +08:00
sw ac4d529ebc 编程作业取消，并设定匿评为内置功能 2015-08-15 10:45:56 +08:00
huang ed8c4ac906 不同类型消息发送 2015-08-15 02:11:18 +08:00
huang 17fad1f291 课程（所有消息）--发布作业、新闻、问卷界面 2015-08-14 17:05:27 +08:00
sw 6051d0797d 课程搜索结果不正确 2015-08-14 16:24:43 +08:00
huang 7ea0fac774 1。发布作业消息提醒 
2、新建问卷消息提醒
3、消息界面（未完成）
 2015-08-14 15:48:23 +08:00