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

450 Commits

Author SHA1 Message Date
guange 6063f39eac 修改作业的一些链接和跳转问题 2015-09-03 16:58:38 +08:00
huang f1431b27fc Merge branch 'develop' into szzh 
Conflicts:
	app/views/users/user_messages.html.erb
 2015-09-03 16:28:49 +08:00
huang bf2e63b7be 去掉消息界面“未读”和已读 2015-09-03 16:09:40 +08:00
guange bacb5f859b merge 2015-09-02 21:41:13 +08:00
guange a69cee4b26 老师测试功能 2015-09-02 21:38:13 +08:00
huang 8b9eabd027 迁移文件中添加打印收据 
添加未读消息样式
 2015-09-02 18:35:12 +08:00
huang 4c76292e5e message--viewed 2015-09-02 18:00:36 +08:00
huang 43f99c45e8 消息 2015-09-02 14:37:57 +08:00
huang 487881bb92 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
 2015-09-02 14:15:38 +08:00
huang a2079dc6e3 用户留言消息状态更新 2015-09-02 14:13:32 +08:00
huang 87956ee48c 用户留言消息区分已读和未读 2015-09-02 11:50:58 +08:00
huang d980513551 添加查看通知/新闻的消息状态更新 2015-09-02 10:08:37 +08:00
huang e89fbd2c8e 过滤条件改为同种类型过滤 2015-09-01 17:37:43 +08:00
cxt d845b8373a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 16:37:53 +08:00
cxt 21565b74fe 冲突 2015-09-01 16:37:43 +08:00
guange 8ad521d4ab merge 2015-09-01 16:19:48 +08:00
guange 41f9daed6d 编程作业放入到users controller 2015-09-01 16:18:03 +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
lizanle 7223e6c91c 引用发送资源时刷新资源列表和统计 2015-09-01 15:03:24 +08:00
lizanle b3e3737fb5 发布作业时从资源库选择资源功能 2015-09-01 11:29:43 +08:00
sw b3919256fa 111 2015-09-01 09:17:12 +08:00
cxt 5ddefe21b8 个人主页3080账户动态异常bug 2015-08-29 16:39:37 +08:00
lizanle acbf58837a Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 12:32:08 +08:00
lizanle ad8bd379a1 用户资源过滤 2015-08-29 12:32:00 +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 86e9ec068f 新建作业时，作业截止时间为空 2015-08-29 11:12:18 +08:00
cxt c650c83f82 个人主页报500、动态显示错位的bug修复 2015-08-29 10:16:04 +08:00
huang 3a25f44d83 Merge branch 'dev_hjq' into szzh 2015-08-28 17:07:48 +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 76ec0d5d48 资源库导入资源到作业静态页面 2015-08-28 16:47:43 +08:00
huang 5384e7eee8 消息每种类型为空的时候给出提示 2015-08-28 15:51:42 +08:00
huang 9bc491227b Merge branch 'szzh' into dev_hjq 2015-08-28 14:49:55 +08:00
sw 462b0a82a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 11:56:52 +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
huang 9709692a08 修改消息每页的显示个数 2015-08-28 09:55:23 +08:00
sw c5ad5a3a5a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-27 17:35:04 +08:00
huang 1b9da8d963 消息添加分页功能 2015-08-27 16:57:32 +08:00
sw cb5abc6d74 导入作业弹框 2015-08-27 16:03:41 +08:00
lizanle 54c849cccb 发送资源的时候不选任何课程项目的时候不要弹出框发送成功 2015-08-27 11:02:20 +08:00
sw 19dc9de60f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:58:04 +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 db70425d99 Merge branch 'szzh' into sw_new_course 2015-08-26 17:57:54 +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
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 8247a29b85 只有admin用户可以修改个人简介 2015-08-26 14:50:01 +08:00
lizanle d735eee4a3 关注和取消关注 2015-08-26 11:41:32 +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 70e9d75cc6 登陆后的搜索 2015-08-25 18:59:45 +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 4915f7977e 个人动态 2015-08-25 15:08:35 +08:00
sw c93bc5be40 作业列表效果显示 2015-08-25 13:50:42 +08:00
huang 4c974266b8 没消息显示！ 2015-08-25 13:04:25 +08:00
huang 3ecdb2940b 去掉统计信息 2015-08-25 12:43:27 +08:00
huang 0da75afc88 消息排序（公共表） 2015-08-25 11:10:08 +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
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 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
sw cc4661a9b8 Merge branch 'szzh' into develop 2015-08-21 17:38:21 +08:00
lizanle 53c28a9b39 新成员注册的时候报错 2015-08-21 17:13:42 +08:00
lizanle 033aea28c5 新成员注册的时候报错 2015-08-21 17:05:54 +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
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
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
lizanle 89b9a5c09d 资源库 2015-08-15 17:06:41 +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
huang ed8c4ac906 不同类型消息发送 2015-08-15 02:11:18 +08:00