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

1635 Commits

Author SHA1 Message Date
guange d348981721 加入邀请码 2016-06-24 13:29:36 +08:00
Your Name ce6e6116b5 get data from sonar API 2016-06-22 17:09:54 +08:00
Your Name 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
cxt c4cea93a44 消息列表的“展开更多”指针手势修改 2016-06-21 13:58:17 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00
cxt 860068f7ed 新注册用户的留言 2016-06-21 11:03:50 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
guange 8fd4d518b2 添加邀请码 2016-06-15 13:44:28 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
huang b128ba5257 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-06-03 14:58:37 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
cxt 2431ef6986 模板消息引起的问题 2016-06-02 13:56:11 +08:00
cxt b72ad364db 微信模板消息：用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
huang 649b3918c4 通知、消息创建的时候异步发送消息 2016-05-27 15:25:27 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang a4f2ebb73b Merge branch 'develop' into hjq_beidou 2016-05-24 16:12:27 +08:00
huang ed7c6cbcfe 组织新建帖子增减status状态 2016-05-24 09:40:16 +08:00
huang b1c70db28a 上线暂时还原代码 2016-05-23 16:34:31 +08:00
huang a3abf09841 delayjob封装 2016-05-23 16:04:06 +08:00
huang d70f42b413 发布课程通知消息异步发送（测试版） 2016-05-23 15:03:22 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
cxt 40f45ea697 发布通知的微信模板消息内容有重复 2016-05-20 19:13:19 +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
huang 5cefedd20a Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-05-20 15:35:08 +08:00
cxt c165d0b37e 作业二级回复的模板通知 2016-05-20 14:52:47 +08:00
cxt 82568b5951 缺陷状态更改或内容更改时不发模板消息 2016-05-20 11:39:30 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
huang 984f706722 可发送权限控制 2016-05-19 15:59:59 +08:00
cxt 6517f23f03 首页不显示项目的创建动态 2016-05-19 15:26:23 +08:00
huang 99cbf0b54e 资源引用消息通知 2016-05-19 11:32:58 +08:00
huang f3f75a57bd 申请资源消息资源发布这收到消息 2016-05-18 17:37:48 +08:00
cxt 670b2c48c7 缺陷的模板消息要细化缺陷类型 2016-05-18 16:08:40 +08:00
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +08:00
huang 658ea0cf1e 资源引用 结构搭建 数据创建 2016-05-18 14:49:13 +08:00
cxt 357e143c9a Merge branch 'develop' into cxt_course 
Conflicts:
	db/schema.rb
 2016-05-17 16:30:03 +08:00
guange 1767e1200d school不用Base64解码，两边都是utf8 2016-05-17 15:56:06 +08:00
cxt 55a98d8d6e 作业二级回复的消息通知 2016-05-17 15:33:16 +08:00
huang 855b33c4a5 Merge branch 'develop' into hjq_beidou 2016-05-17 09:02:43 +08:00
huang 13cc5ceaa6 model中添加获取二级域名的方法 2016-05-17 09:02:17 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +08:00
guange 80be46dc92 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-16 17:44:32 +08:00
guange 4b4a48b0c4 sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开 2016-05-16 17:44:08 +08:00
huang ff20b50aa2 Merge branch 'cxt_course' into develop 2016-05-16 11:15:01 +08:00
cxt 5e56e11982 暂时禁掉作业的模板消息和消息通知 2016-05-16 11:14:21 +08:00
guange f217b3f510 去除用户名域名 2016-05-14 16:00:04 +08:00
huang fbcae050ad 项目500问题 2016-05-13 17:16:09 +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
huang 1673ae451b 名师榜新增一个后就不能再新增 2016-05-13 10:50:34 +08:00
cxt ca5f03f2ea 作业回复的消息通知，评阅作品的消息通知修改 2016-05-12 14:13:34 +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 f4b8f2c794 学生追加附件发送消息 2016-05-12 10:29:43 +08:00
cxt 9ec488684b 分享申请的消息更改 2016-05-12 09:30:06 +08:00
cxt 83f7de597a 暂时屏蔽通知的微信消息和消息通知 2016-05-10 15:30:27 +08:00
huang 99d9a28828 名师榜sql查询 2016-05-10 11:33:02 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
huang cd0603f01b 模式二里面的链接问题 2016-05-06 20:36:06 +08:00
cxt c6c3625029 题目申请说明内容较长时，会导致被申请者收不到消息 2016-05-06 18:47:38 +08:00
huang a5be092c16 二级目录帖子列表中添加编辑功能 2016-05-06 14:42:13 +08:00
huang 6e7d20c410 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 10:17:18 +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
guange 88fd2cbfb6 Merge remote-tracking branch 'origin/develop' into guange_dev 2016-05-05 14:07:29 +08:00
guange dfdd301f2f sso同步登录功能完成 2016-05-05 14:06:47 +08:00
cxt 5f50ad046c 留言报500 2016-05-05 10:52:54 +08:00
cxt d845b14992 讨论区的模板消息 2016-05-05 09:36:45 +08:00
cxt 121aca7505 缺陷模板消息 2016-05-05 09:09:45 +08:00
guange e8adcf8cc7 添加sso model 2016-05-04 15:40:18 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_message.html.erb
 2016-05-03 17:12:38 +08:00
cxt c49627913b 更改评分设置中的教师优先，评分未更新 2016-05-03 15:12:56 +08:00
cxt b0988dc950 Merge branch 'cxt_course' into develop 2016-04-29 17:57:32 +08:00
cxt 389b75f7ab 申请引用私有作业时发送消息 2016-04-29 17:55:57 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
huang 2b4f16e5f1 二级目录新界面的帖子列表页面 2016-04-29 14:46:40 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +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
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
guange 2c23b88998 boards#index性能优化 2016-04-24 12:48:03 +08:00
huang a985f6fee1 新建帖子/回帖不发送消息 2016-04-22 14:14:21 +08:00
huang 17b5832df0 Merge branch 'hjq_beidou' into develop 2016-04-22 12:45:05 +08:00
huang c4bd78e442 讨论区代码还原及优化 2016-04-22 12:44:37 +08:00
huang e23262225a 版本库名不能是全数字 2016-04-22 10:34:45 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt aed3818273 点击模板消息跳到微信详情页面 2016-04-20 14:44:10 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
huang b1f47fe120 历史版本不能删除问题 2016-04-19 11:19:29 +08:00
huang a907089bd0 附件历史版本可以删除 2016-04-19 10:41:48 +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
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 16:52:15 +08:00
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
 2016-04-15 16:51:37 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-15 14:13:44 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
cxt 96accf1e7a 未发布的作业不应进行作业的积分统计 2016-04-14 15:35:27 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +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
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
cxt 76cfa83666 微信模板消息接口 2016-04-14 10:47:53 +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 5a3b68816a 冲突 2016-04-12 15:57:18 +08:00
cxt e420be8ee9 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-12 15:56:08 +08:00
cxt 2898805aa7 回复的模板消息 2016-04-12 15:12:40 +08:00
cxt 275895f805 模板消息的重构 2016-04-12 11:00:47 +08:00
guange beec2b3246 merge 2016-04-09 18:17:07 +08:00
huang a2a3d6b6b9 Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop 
Conflicts:
	app/models/blog_comment.rb
 2016-04-09 17:01:20 +08:00
cxt c041f742c1 缺陷和留言的回复 2016-04-09 16:21:13 +08:00
guange 2d41d0a2f6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-09 16:02:24 +08:00
cxt 007fee95bd 作业和留言回复的模板消息 2016-04-09 14:41:45 +08:00
cxt 3f365e75b5 讨论区的模板消息 2016-04-09 14:13:59 +08:00
guange 96dfeead0f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 21:46:56 +08:00
cxt 281fcf315f 点击模板消息页面为空 2016-04-08 21:01:15 +08:00
huang f951d22d56 发布博客500问题 2016-04-08 20:53:30 +08:00
guange 3ff19364dc merge 2016-04-08 20:02:19 +08:00
cxt 845b1cdab8 模板 2016-04-08 19:54:33 +08:00
cxt 440ba27fa4 回复 2016-04-08 18:52:26 +08:00
guange 3ba7372523 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-08 17:34:11 +08:00
guange 612b79410b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 17:33:41 +08:00
guange b627513bae 中文问题 2016-04-08 17:33:00 +08:00
cxt d6daa906b6 回复 2016-04-08 16:58:27 +08:00
huang 9fa50e0452 编码问题 2016-04-08 16:19:38 +08:00
guange ce611bc725 merge 2016-04-08 14:17:56 +08:00
guange e9ab2a482b key3修改 2016-04-08 14:17:09 +08:00
cxt 4df5f3114d 模板消息 2016-04-08 14:00:01 +08:00
cxt c870b92489 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-04-08 11:59:21 +08:00
cxt a3097c2752 truncate函数 2016-04-08 11:59:13 +08:00
guange 6baf0b46f7 模板消息修改 2016-04-08 11:37:58 +08:00
guange f62b393d7d 模板消息修改 2016-04-08 11:23:28 +08:00
guange 5cc0ac04e6 模板消息修改 2016-04-08 11:19:05 +08:00
guange aa9cb4e579 merge 2016-04-08 10:44:36 +08:00
cxt 88c39512b9 journal的修改 2016-04-01 21:32:33 +08:00
Yiang Gan af2bd66847 回复api 2016-04-01 18:23:12 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
Yiang Gan 536394663a 微信消息模板 2016-03-31 20:46:36 +08:00
ouyangxuhua 0f4d2e40fb 添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整 2016-03-25 19:09:25 +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
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
ouyangxuhua 589f939bbd 消息类型“学生再次提交作业”中的链接，应该打开学生作品 2016-03-24 11:39:38 +08:00
ouyangxuhua 3fc988757c 组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索 2016-03-24 10:14:25 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
huang 7967066b05 附件添加动态发送方式改变 2016-03-22 15:06:54 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
huang 51bd745b8d 课程讨论区限制改成20000 2016-03-18 13:39:28 +08:00
huang 8a8c9bf7c3 注释修改 2016-03-18 12:41:07 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +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
huang 03597b85ff 解决项目被淹没问题 2016-03-17 16:02:36 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
alan 0ac12f3400 Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop 2016-03-16 11:16:52 +08:00
alan 5343759f2f Merge branch 'FX-alan-search-404' into alan_develop 2016-03-16 11:16:41 +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
huang 7c624cd571 公共资源只包括公开资源 2016-03-14 16:35:18 +08:00
ouyangxuhua a7312a6191 修改游客下载组织资源的权限 2016-03-14 14:43:30 +08:00
alan 3eaa4b08a3 解决删除用户报500错误 2016-03-14 11:06:29 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
alan 2f5ce553e2 refactor user find 2016-03-14 10:46:02 +08:00
alan 0998ca3974 Merge branch 'develop' into FX-alan-search-404 2016-03-14 10:25:39 +08:00
alan ce6d63ccaf 重构user.find 2016-03-14 10:24:50 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt a845da5c17 点赞有延迟 2016-03-11 19:25:24 +08:00
guange 45c51ef8db merge 2016-03-11 18:51:41 +08:00
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-03-10 14:52:23 +08:00
cxt 5b4ff5ec8a 学生列表中的作业积分为负分 2016-03-10 09:22:49 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +08:00
huang 9beaa62d6d 课程活跃度 2016-03-04 11:36:34 +08:00
huang 085729f91b 课程活跃度中添加作业留言得分 2016-03-03 18:51:28 +08:00
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +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
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop 2016-02-26 16:18:17 +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
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
ouyangxuhua 991613d760 在转发表forwards记录发送帖子、通知 2016-02-25 16:22:42 +08:00
ouyangxuhua 11231d0ff9 1.解决组织配置报500的错误；2.增加转发表 2016-02-24 16:01:32 +08:00
huang 90208e166f 项目统计数小于0情况判断 2016-02-23 13:24:20 +08:00