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

258 Commits

Author SHA1 Message Date
Tim 674a8e0035 单词折行问题 2016-01-29 16:16:02 +08:00
ouyangxuhua 4b95ee95c0 组织帖子栏目讨论区中的帖子，在登陆情况下就能发送；在组织栏目中，对帖子栏目讨论区增加编辑、删除、发送选项。 2016-01-27 16:12:34 +08:00
ouyangxuhua 89a919163c 一旦组织私有，就disabled掉允许游客下载选项 2016-01-26 15:25:25 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
cxt 435f81a422 关联项目的更新时间 2016-01-22 21:47:59 +08:00
cxt 8a2a1d2bc9 Merge branch 'szzh' into develop 2016-01-22 20:55:18 +08:00
cxt fc0b589760 Merge branch 'cxt_course' into szzh 2016-01-22 20:54:14 +08:00
cxt 6ae7da99be 帖子、博客、通知、文章详情页面的单词折行 2016-01-22 18:33:43 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
cxt a96d8ce5a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:29:29 +08:00
huang faf1fcaf22 issue回复局部刷新 
附件浏览问题
昵称改成登录名
 2016-01-22 17:27:21 +08:00
ouyangxuhua 0a9ecac3db 帖子栏目讨论区链接问题修复 2016-01-22 17:12:59 +08:00
cxt e09f795171 附件的显示 2016-01-22 17:05:58 +08:00
ouyangxuhua b5bfa6d824 1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。 2016-01-22 16:56:36 +08:00
ouyangxuhua b6219c149a 解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除； 2016-01-22 16:10:05 +08:00
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间 2016-01-22 11:10:35 +08:00
cxt 6789693fc7 已评分作品超过5个时，作业优秀作品排行显示“更多” 2016-01-22 10:17:00 +08:00
cxt fea4f79dc8 组织帖子栏目的通知增加点赞tip 2016-01-22 09:47:18 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项 2016-01-21 15:31:36 +08:00
cxt 65563e6503 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-21 15:24:40 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
cxt fe0414c83f 组织文章和博客的点赞 2016-01-20 10:53:05 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-20 09:27:29 +08:00
ouyangxuhua 18e79ba9b3 未登陆情况下，可以看到组织文章列表及首页全部内容 2016-01-20 09:25:12 +08:00
ouyangxuhua e70e1beb5d Merge branch 'szzh' into dev_hjq 2016-01-19 16:59:04 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-18 17:12:56 +08:00
ouyangxuhua f796aa1489 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-18 10:54:17 +08:00
ouyangxuhua 03df9abfeb 增加域名唯一性判断 2016-01-18 10:43:22 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
ouyangxuhua c6aaaff8d1 对有子域名的组织，栏目的链接应不含有组织及其id 2016-01-18 10:07:12 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 15:42:36 +08:00
ouyangxuhua b9359b1cee 显示url申请 2016-01-15 13:15:17 +08:00
cxt 902cfdcbe9 课程/项目的创建动态不需要显示更新时间 2016-01-15 10:29:55 +08:00
cxt c49a290d56 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 10:24:37 +08:00
ouyangxuhua 16a3a7d06d 隐藏url定制 2016-01-14 21:42:28 +08:00
ouyangxuhua 7ad377f458 修改一些bug 2016-01-14 21:29:43 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
cxt 25cc959576 Merge branch 'szzh' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb
 2016-01-14 18:22:57 +08:00
cxt cef9fd96cd 组织帖子的动态点赞 2016-01-14 18:05:58 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
cxt 26631e2199 关联项目的提交次数 2016-01-14 15:39:40 +08:00
ouyangxuhua 93570249c0 Merge branch 'dev_hjq' into szzh 2016-01-14 15:02:45 +08:00
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +08:00
ouyangxuhua a21465343c 组织栏目编辑状态样式更新 2016-01-14 15:01:51 +08:00
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-14 14:40:13 +08:00
ouyangxuhua d6e7a2ade5 解决一些bug 2016-01-14 12:51:01 +08:00
ouyangxuhua 324513fc94 组织栏目子目录功能实现 2016-01-14 10:33:15 +08:00
cxt e889f798d7 项目创建动态报500 2016-01-13 17:26:36 +08:00
cxt 53a45908e9 关联项目的提交次数 2016-01-13 16:54:41 +08:00
cxt efb5d05551 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-13 16:32:33 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
cxt e04926f2e7 关联项目的提交次数 2016-01-13 10:04:42 +08:00
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-13 09:58:14 +08:00
ouyangxuhua 8ead573872 组织设置url 2016-01-13 09:56:24 +08:00
ouyangxuhua 5d9ce929d9 组织栏目子目录 2016-01-13 09:34:33 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接 2016-01-11 16:44:52 +08:00
huang 8c10ce6fee 修改组织500问题 2016-01-08 21:47:42 +08:00
cxt 1264d5f6ca Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 20:35:19 +08:00
cxt 9368e3875c 去掉关联项目的提交次数 2016-01-08 20:35:05 +08:00
ouyangxuhua ceeec3af12 修改一些bug 2016-01-08 19:33:58 +08:00
cxt 5dbad5a672 已关联项目的样式修改 2016-01-08 19:04:22 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
ouyangxuhua 09b8373e12 组织配置https改成http 2016-01-08 17:13:34 +08:00
cxt a0afe6ccbf 动态显示附件并统一附件样式 2016-01-08 16:05:36 +08:00
ouyangxuhua c500fc13db 解决组织动态中，第二页重复显示第一页动态的问题 2016-01-08 15:21:24 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
ouyangxuhua 178f9e167c 1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线； 
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
 2016-01-08 09:41:56 +08:00
cxt 5e0ee0426a 作业动态的附件放在扣分上面 2016-01-07 17:23:32 +08:00
ouyangxuhua 539d971901 组织页面也增加项目/课程快捷菜单 2016-01-07 16:37:41 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等 2016-01-07 15:58:22 +08:00
cxt 1263e4cac0 关联项目的样式修改 2016-01-07 15:33:21 +08:00
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	config/routes.rb
	db/schema.rb
	public/images/hwork_icon.png
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-06 16:27:42 +08:00
cxt cf125159f2 关联项目增加提交次数 2016-01-06 10:36:53 +08:00
cxt 244e133803 关联项目的对齐 2016-01-06 09:57:54 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
cxt 0a2d2a539f 关联项目的组长名字加个title 2016-01-05 15:46:41 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
ouyangxuhua dae07d7e92 解决组织页面对齐的问题 2016-01-04 11:11:42 +08:00
ouyangxuhua 692f13d1de Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 16:12:19 +08:00
ouyangxuhua defba80427 栏目配置中，“设为显示”改成“设为可见" 2015-12-31 16:11:48 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
ouyangxuhua 373e40f4fd 未登陆情况下，不能发布帖子 2015-12-31 14:13:31 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
ouyangxuhua 29c720a8a4 1.权限管理问题 2015-12-30 17:45:15 +08:00
ouyangxuhua 987b0dd9d2 message_id为空的动态不显示 2015-12-30 17:02:14 +08:00
ouyangxuhua c16f99774b 1.组织叶底样式错误问题修正 2015-12-30 16:57:40 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00