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

1564 Commits

Author SHA1 Message Date
huang 7b6a62e972 历史版本下载403问题 2016-05-27 10:34:57 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang b0e4ed5ab3 请求分享如果自己在项目的话则不需要申请 2016-05-20 17:40:18 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +08:00
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 11bc6b1e6c 配置500问题 2016-05-17 10:18:24 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +08:00
guange f217b3f510 去除用户名域名 2016-05-14 16:00:04 +08:00
huang 79e57e2b7f 代码和并冲突处理及连接参数 2016-05-13 17:00:25 +08:00
huang e8afcf9157 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/organizations/_org_subfield_rightM2.html.erb
 2016-05-13 16:56:02 +08:00
huang 39c753fd25 名师列表排序 2016-05-13 16:54:27 +08:00
huang 467ee60657 名师默认显示5个，没有则不显示 2016-05-13 15:37:04 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
huang 3853d5b7ad 右三模式定制 2016-05-13 13:39:44 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
cxt 7481d96166 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/admin_controller.rb
	config/routes.rb
	lib/redmine.rb
 2016-05-12 10:40:35 +08:00
cxt 5baf467d13 作品评分不覆盖 2016-05-10 15:26:08 +08:00
huang cabac5914c 学生统计数 2016-05-10 13:41:21 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
huang 5880a12290 sql查询 2016-05-10 10:00:28 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
huang a98678e001 列表中类型显示方法封装 2016-05-09 15:00:50 +08:00
huang 878bcc8cf1 栏目创建类型添加老师、学生类型 2016-05-09 14:43:28 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang c3a016607b 解决冲突 2016-05-06 10:39:37 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
huang 0b43fb5502 隐藏可见及箭头的局部刷新 2016-05-06 09:49:15 +08:00
huang 231f8f3526 二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框 2016-05-05 21:23:34 +08:00
huang a0ea2c7e5d 模式二3在配置整合 2016-05-05 10:05:53 +08:00
huang ccea42cc8b 项目和课程的动态只参与五种配置 2016-05-04 19:47:44 +08:00
huang 8dfe95dfd1 配置页面新建二级域名样式 2016-05-04 15:50:53 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
cxt 1cad1626e0 解决冲突 2016-04-29 20:31:31 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
yuanke f185c59e90 Merge branch 'yuanke' into develop 2016-04-28 14:33:30 +08:00
yuanke 2cb9f0cd05 组织还原 2016-04-28 14:31:40 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
huang d8f71da1fb 完成模块8配置 2016-04-26 11:01:12 +08:00
huang 255d7e07bc 北斗新界面样式 2016-04-25 18:54:21 +08:00
huang dae6a5ecae 配置八种类型更新 2016-04-25 16:00:52 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
huang e8048f8eb7 完成版本库时间UTC与北京时间的转换 
时间国际化问题
 2016-04-21 10:09:52 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
huang ad3d27d6b0 版本库文件目录 2016-04-19 10:21:12 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
huang 7259d607dc Merge branch 'hjq_beidou' into develop 2016-04-18 15:38:11 +08:00
huang 8064fe6c46 讨论区新建帖子代码优化 2016-04-18 15:37:32 +08:00
cxt e5b07c6c12 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 12:33:11 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
cxt 062af3c57a 作业积分出现负分 2016-04-13 16:11:57 +08:00
cxt 70afbb3323 姓名的判断、 2016-04-12 15:46:56 +08:00
cxt 1882cd8f4f 用户姓名不显示 2016-04-12 15:42:59 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
cxt 8f7c6f49b7 api的修改 2016-04-06 14:56:09 +08:00
cxt 6c527a9a54 点赞的api 2016-04-06 11:40:05 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
Yiang Gan af2bd66847 回复api 2016-04-01 18:23:12 +08:00
Yiang Gan 536394663a 微信消息模板 2016-03-31 20:46:36 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
huang 1ccb3a2c41 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-31 15:25:24 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
huang bded9f2e98 图片自动获取功能 2016-03-30 18:35:47 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
Yiang Gan 9cebcfdd2d 动态api调整 2016-03-30 15:51:27 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
huang 8a6a1b94ee 组织资源的统计与权限 2016-03-29 20:09:47 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
cxt ed0eb4aff3 学生作品详情无法打开 2016-03-29 09:24:11 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
huang 8f0038c3ff tag 2016-03-25 17:06:59 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
 2016-03-25 16:33:22 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +08:00
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
alan 9273e37a5b 优化SQL查询：1，members与users表关联查询； 2，blogs表单查询 2016-03-23 00:04:53 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员，链接使用https://www形式 2016-03-18 16:35:36 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +08:00
huang bff20ee072 英雄榜数据显示问题 2016-03-18 14:16:23 +08:00
linchun d3635067b7 Merge remote-tracking branch 'remotes/origin/develop' into linchun 2016-03-18 13:01:39 +08:00
huang 4999b47b44 项目去掉ID 2016-03-17 16:46:26 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
alan a4e2fd741e 删除issue，返回页面不变 2016-03-17 14:13:29 +08:00
linchun 34c9f54510 完成了管理员界面学校列表 2016-03-16 15:24:41 +08:00
ouyangxuhua baf547417e 组织下的链接用Setting.protocol表示协议 2016-03-16 14:57:32 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
ouyangxuhua dcadadae03 退出和用户的链接使用https:// +Setting.host_name 2016-03-16 11:24:55 +08:00
ouyangxuhua da1b27cd38 Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang 2016-03-16 10:01:42 +08:00
cxt 2ce2134f0b 浏览器tab的title，显示用户姓名，不是登录名 2016-03-15 17:25:46 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
ouyangxuhua 2a46d60433 组织下的链接的host_name均使用Setting.host_name 2016-03-15 11:19:03 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00
ouyangxuhua 402b0e9c24 域名都使用Setting.host_name获取主机名 2016-03-14 23:15:08 +08:00
ouyangxuhua 15dfaf67b2 测试版环境，登陆注册改成https://test.forge. 2016-03-14 18:29:50 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
ouyangxuhua a7312a6191 修改游客下载组织资源的权限 2016-03-14 14:43:30 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
cxt 98f7ad19f6 Merge branch 'linchun' into develop 2016-03-11 19:34:33 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
cxt ef5625ccdf 延期发布的课程资源设为公开后不应对学生可见 2016-03-11 11:17:44 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
huang 53e164048d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-09 15:29:06 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
ouyangxuhua 5d1d56fbb3 组织下链接改成https://www.形式 2016-03-08 16:44:03 +08:00
ouyangxuhua 6e21229b4c 组织用户链接 2016-03-08 15:22:56 +08:00
ouyangxuhua 4442d286ce 组织下的用户连接改成https://www.……形式 2016-03-08 15:20:38 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-08 11:29:58 +08:00
ouyangxuhua c3eb8e05cd 组织的私有资源，数量一致 2016-03-07 18:12:40 +08:00