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

1571 Commits

Author SHA1 Message Date
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00
huang 5ab9e3b5b7 资源搜索 
作业留言
 2016-03-04 09:29:20 +08:00
huang ef57dc80d4 去掉项目名称 2016-03-03 18:03:30 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 16:26:51 +08:00
newuser d2bd4706d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-26 14:57:41 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 14:55:28 +08:00
huang 8b839caa48 添加样式 2016-02-25 11:12:24 +08:00
cxt 5e330de31a 学生看到的作业个数不包含未发布的作业 2016-02-24 16:20:59 +08:00
cxt adf9465443 课程英雄榜的积分只显示一位小数 2016-02-24 10:49:48 +08:00
ouyangxuhua 035b22d6dd Merge branch 'ouyangxuhua' into develop 2016-02-23 16:49:12 +08:00
ouyangxuhua 2a26fd4e75 修改组织子域名的问题 2016-02-23 16:48:31 +08:00
ouyangxuhua 5c9d8954ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 16:20:07 +08:00
ouyangxuhua f785277d42 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
Tim 87f5f9c380 上传头像预览图片排版，课程关联组织取消按钮 2016-02-23 15:26:34 +08:00
ouyangxuhua 62193ef7ff 组织页面右上角的退出、登陆、注册链接，使用类似https://www.trustie.net/域名 2016-02-23 14:12:55 +08:00
ouyangxuhua 3e699ebd99 Merge branch 'ouyangxuhua' into develop 2016-02-22 17:40:16 +08:00
ouyangxuhua c1a84e2ce5 组织页面右上角的用户链接改成https://www.trustie.net的形式 2016-02-22 11:14:26 +08:00
ouyangxuhua 1216f49ac2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
 2016-02-20 16:59:58 +08:00
cxt e04e80d64d 跨越多个学期的课程学期的显示 2016-02-20 16:18:28 +08:00
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度；2.组织页面右上角链接修改 2016-02-20 15:18:24 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
ouyangxuhua 38a87a04ba 1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag，增加“双击可编辑”的tips 2016-01-27 15:50:31 +08:00
cxt af7ca36c92 学生加入课程或退出课程 2016-01-26 15:59:39 +08:00
Tim 76063b0911 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/layouts/_project_info.html.erb
 2016-01-26 15:08:38 +08:00
Tim 821ade7985 作业列表优化，课程加入退出 2016-01-26 11:00:24 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
 2016-01-21 16:10:29 +08:00
cxt 65563e6503 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-21 15:24:40 +08:00
huang c7522067e6 修改base界面 2016-01-20 18:37:39 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
ouyangxuhua 18e79ba9b3 未登陆情况下，可以看到组织文章列表及首页全部内容 2016-01-20 09:25:12 +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
cxt b4521d3582 课程/项目首页的更多默认收起 2016-01-18 16:18:40 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
huang 8b815f95bb Merge branch 'develop' into hjq_new_course 2016-01-18 08:55:35 +08:00
huang b2746d0953 课程讨论区总数计入回复数 2016-01-15 16:30:17 +08:00
huang c936304314 课程默认收起 2016-01-15 15:37:17 +08:00
huang 81b32ea643 点击铃铛弹出新tab页 2016-01-15 12:39:38 +08:00
huang 157502d450 精品课程 2016-01-15 10:35:56 +08:00
ouyangxuhua 5097f19ec8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/layouts/_user_projects.html.erb
	app/views/projects/set_public_or_private.js.erb
 2016-01-14 18:30:05 +08:00
ouyangxuhua 1c62edbed4 项目设为私有title更新 2016-01-14 18:26:36 +08:00
cxt 894c97304c 冲突 2016-01-14 18:24:07 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +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
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +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
huang 49d456bf21 修改数据统计信息 2016-01-14 14:32:19 +08:00
Tim 893e5dc7f3 针对课程370的精品课程样式设计 2016-01-13 18:33:22 +08:00
ouyangxuhua 582880e54d 设置课程/项目的公开私有属性，使用局部刷新 2016-01-13 16:59:48 +08:00
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00
huang 05cf2d24dc 新项目积分系统 
讨论区回复加入得分系统
版本库行号显示错误问题
 2016-01-13 15:29:29 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
huang 165d5f50c8 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/files_controller.rb
	db/schema.rb
处理冲突
 2016-01-13 13:01:26 +08:00
huang 64088f5a21 项目数据存入数据库（统计数据直接从数据库获取） 2016-01-13 10:08:48 +08:00
ouyangxuhua 48f931deba 隐藏组织的课程/项目快捷菜单 2016-01-11 17:02:01 +08:00
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接 2016-01-11 16:44:52 +08:00
ouyangxuhua 3a62db6475 Merge branch 'dev_hjq' into szzh 2016-01-08 19:34:36 +08:00
ouyangxuhua ceeec3af12 修改一些bug 2016-01-08 19:33:58 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-08 18:11:54 +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
huang 57af22e3af 项目资源库tag增、删、改ajax 2016-01-08 16:30:04 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang dd4d687559 修改项目资源附件统计功能 2016-01-08 11:11:11 +08:00
ouyangxuhua 539d971901 组织页面也增加项目/课程快捷菜单 2016-01-07 16:37:41 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等 2016-01-07 15:58:22 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
huang 81bb35ac49 项目资源库 资源列表 2016-01-05 10:01:56 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +08:00
ouyangxuhua dae07d7e92 解决组织页面对齐的问题 2016-01-04 11:11:42 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
huang 743950d264 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 18:13:15 +08:00
cxt c3ddbcfddf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 16:33:32 +08:00
cxt 5d2c760a8e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-29 16:32:35 +08:00
ouyangxuhua 2e41e9890a 将riserved改成reserved 2015-12-29 15:50:29 +08:00
huang 41cd038758 讨论区帖子添加锁定 2015-12-29 15:05:07 +08:00
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_org.html.erb
	app/views/organizations/_org_activities.html.erb
	db/schema.rb
	public/stylesheets/new_user.css
	public/stylesheets/org.css
	public/stylesheets/public.css
 2015-12-28 15:32:03 +08:00
Tim 445d5dc379 组织下拉菜单修改 2015-12-25 16:30:09 +08:00
huang 801651cba6 解决组织两个footer冲突问题 2015-12-25 16:16:06 +08:00
huang 533be61cf7 添加底部样式 2015-12-25 16:13:17 +08:00
huang 5d1b63d6fa Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 16:05:07 +08:00
huang 7412c1caf6 添加footer 2015-12-25 16:04:49 +08:00
Tim 1a24505eac footer新增图片，样式修改 2015-12-25 15:27:45 +08:00
cxt 3e39eacd19 新建课程通知时通知标题框自动获取焦点 2015-12-24 16:45:45 +08:00
cxt 61b5cf41d0 取消课程首页的开设单位超链接 2015-12-24 11:23:23 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	public/stylesheets/org.css
 2015-12-24 10:40:00 +08:00
Tim eb7d0761cb 组织菜单栏修改成和个人首页相同 2015-12-24 10:37:13 +08:00
ouyangxuhua 9e0b88c186 项目讨论区样式改成方块样式 2015-12-24 09:46:18 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
lizanle 4bc68081ee editor修改 2015-12-17 15:15:00 +08:00
cxt 90c7822c38 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-15 16:06:59 +08:00
cxt 72c475e8a2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-15 16:03:26 +08:00
cxt 1f4454d908 课程左侧的在线测验统计数 2015-12-15 10:43:43 +08:00
lizanle 88c2db47b7 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/helpers/application_helper.rb
 2015-12-15 08:48:08 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
ouyangxuhua a5fa68c928 资源栏目增加资源 2015-12-14 16:41:18 +08:00
cxt 85b11010d2 在线测验报500、 学生看不到已截止的测验、测验列表的样式调整 2015-12-14 16:18:39 +08:00
lizanle f3013ca3e7 修改了搜索的提示描述 2015-12-14 11:22:36 +08:00
huang 5ca8d4cd66 修改http链接自动换域名 2015-12-14 10:54:37 +08:00
huang 670df76c70 注释掉项目邀请加入功能 2015-12-10 20:24:42 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
ouyangxuhua 8b14e7c549 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 17:19:52 +08:00
huang 91fa3f6fab 解决项目样式冲突问题 2015-12-07 16:52:23 +08:00
ouyangxuhua 76db95aa03 1.组织页面中，退出后刷新组织页面； 
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
 2015-12-07 15:52:13 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
ouyangxuhua 108865968b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 12:01:49 +08:00
ouyangxuhua 12c57e7e4b 将Jquery引入组织首页 2015-12-05 12:01:04 +08:00
huang 9d68fd7d28 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 11:39:50 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 37a7abea53 组织首页 2015-12-05 11:31:20 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
huang 4a41039fa6 课程英雄榜改成课程活跃度 2015-12-04 15:58:56 +08:00
ouyangxuhua 2855c0e409 修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等 2015-12-04 10:59:09 +08:00
lizanle 7af82aac98 base_forums要加ajax-indicator ajax-model 2015-12-02 09:28:01 +08:00
lizanle 35b543cd22 论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。 2015-12-01 17:23:14 +08:00
huang 9d970036f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-30 17:21:38 +08:00
huang aa19f5f8d5 Merge branch 'gitlab_guange' into develop 
Conflicts:
	app/views/layouts/base_courses.html.erb

处理冲突
 2015-11-30 15:43:05 +08:00
huang 582a7c47a4 修改英雄版为0显示的问题 2015-11-30 15:42:00 +08:00
lizanle 7eb5d2a8fa Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-30 14:59:59 +08:00
lizanle 8bd9c0c7af tip 2015-11-30 14:59:51 +08:00
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
合并
 2015-11-30 14:35:37 +08:00
lizanle 29a8d1b9f5 tip 2015-11-30 13:22:01 +08:00
huang d67fc18988 英雄榜、贡献榜显示真实姓名 
为零的时候不显示
 2015-11-30 10:20:47 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00
ouyangxuhua edea776b03 Merge branch 'szzh' into dev_hjq 2015-11-27 16:28:16 +08:00
ouyangxuhua 89d01679a7 组织中，重复的项目和组织不显示 2015-11-27 16:27:23 +08:00
huang 2ec78d07fa Merge branch 'szzh' into hjq_new_course 2015-11-27 14:47:16 +08:00
huang 1cc6e305ed 完成新功能模块开发： 
1、如果没有成绩则不显示
2、工具框展开没有则不显示
 2015-11-27 13:52:40 +08:00
ouyangxuhua e0f4050779 1.修改组织中关联项目和课程的内容和样式 2015-11-27 12:34:02 +08:00
ouyangxuhua 4aa827eb4a 组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。 2015-11-27 11:02:48 +08:00
huang 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
ouyangxuhua 58365e8892 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
2.组织增加项目功能
 2015-11-27 09:50:17 +08:00
huang 8c83bbfff3 课程英雄榜数据 2015-11-27 00:48:08 +08:00
huang 061a1f602a 效果实现 2015-11-26 21:17:04 +08:00
ouyangxuhua 9c3aed8028 增加组织加入课程功能 2015-11-26 16:29:50 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00