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

1867 Commits

Author SHA1 Message Date
guange bb5a527f9e 配置新菜单 2016-04-05 15:57:19 +08:00
guange ae08031440 开放跨域 2016-04-05 15:54:30 +08:00
guange 1926f0ba53 修改openid路由 2016-04-02 07:49:36 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
Yiang Gan 392c5708f2 作业详情页面 2016-03-31 20:43:06 +08:00
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
Yiang Gan 1c5b22abf4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-03-30 18:02:38 +08:00
Yiang Gan f23c0e7602 最新动态修改 2016-03-30 18:02:33 +08:00
guange b30fad723d 菜单更新 2016-03-30 17:56:45 +08:00
Tim 77e11fe0fe 微信最新动态修改 2016-03-30 17:47:44 +08:00
Yiang Gan 6dc374cf9a 最新动态 2016-03-30 17:41:18 +08:00
guange 91d49e3028 添加附加环境模板 2016-03-30 14:52:11 +08:00
guange 46d5767a6a 去掉elasticsearch多台部署，只要一台即可 2016-03-30 14:45:33 +08:00
cxt c8142b3ee5 作业api 2016-03-30 14:02:35 +08:00
Yiang Gan 4de598873f 动态和作业的api 2016-03-30 10:32:45 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/javascripts/wechat/wechat-dev.js
 2016-03-28 14:47:11 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
Tim 4f7d698076 wechat init 2016-03-26 14:45:57 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +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
linchun 52af5e4303 修复了管理员界面多个列表的题目问题 2016-03-17 15:05:14 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
linchun d3ed89d87e sort 2016-03-15 15:23:43 +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
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-08 11:29:58 +08:00
linchun 3c66a29767 完善课程资源列表，完成项目资源列表 2016-03-08 11:01:08 +08:00
linchun b7f4b584f2 完成管理员界面课程资源列表 2016-03-07 16:46:02 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
cxt 6416b01037 课程里的“课程作业”改为“作业” 2016-03-04 14:28:06 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
guange 79004e1328 修改绑定流程 2016-03-03 23:27:05 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
guange c33b35383d 修改菜单 2016-03-01 17:13:06 +08:00
guange d5e8945619 修改菜单 2016-03-01 17:06:40 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
guange a7220a535e 修改wechat配置 2016-03-01 14:33:36 +08:00
guange 8f5645e5c1 修改wechat配置 2016-03-01 14:32:10 +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 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
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表 2016-02-26 16:26:20 +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
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
huang 40fb140b6d 版本库提交记录diff信息 2016-02-23 15:09:15 +08:00
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop 
Conflicts:
	db/schema.rb
 2016-02-23 13:36:05 +08:00
ouyangxuhua d2267106c2 修复team.trustie.net的侧栏点击后没有显示栏目内容的问题 2016-02-23 13:07:42 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
guange eed6250145 secdomain问题 2016-02-02 17:36:11 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
guange 28035dfc47 子域名处理 2016-02-02 12:40:00 +08:00
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启 2016-01-29 20:31:25 +08:00
ouyangxuhua 7b56dc7f8e 管理员界面，解决编辑组织报错的问题 2016-01-29 18:43:14 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +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
huang 83ff449946 项目、课程资源 浏览 改成 上传文件 2016-01-22 21:51:31 +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 faf1fcaf22 issue回复局部刷新 
附件浏览问题
昵称改成登录名
 2016-01-22 17:27:21 +08:00
ouyangxuhua d7b17b455d Merge branch 'szzh' into develop 2016-01-22 10:27:32 +08:00
ouyangxuhua 5e72734bee 增加3个url定制路由 2016-01-22 09:25:58 +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
huang ff475fb00b Merge branch 'szzh' into develop 2016-01-21 15:35:38 +08:00
huang 524e152b24 Issue截止时间到了邮件提醒 2016-01-21 11:19:08 +08:00
huang 7de48f143e issue状态修改 2016-01-21 10:38:07 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +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
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
guange 96d0b2e717 绑定用户事件 2016-01-19 14:07:59 +08:00
guange 9f667588c4 添加菜单 2016-01-19 11:50:59 +08:00
ouyangxuhua 909e0e846b 路由配置问题 2016-01-18 11:06:08 +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
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
ouyangxuhua c6aaaff8d1 对有子域名的组织，栏目的链接应不含有组织及其id 2016-01-18 10:07:12 +08:00
guange 080cc71912 wechat 路由修改 2016-01-16 11:59:09 +08:00
guange 5f6a3cac04 wechat init 2016-01-16 11:54:59 +08:00
guange 744b246930 配置修改 2016-01-15 23:15:06 +08:00
guange b68eab23ea merge 2016-01-15 17:03:32 +08:00
guange 587d347178 added wechat 2016-01-15 17:01:30 +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
huang 18bc8215e3 路由冲突 2016-01-15 11:35:27 +08:00
guange c8b52db6f9 merge 2016-01-14 20:38:37 +08:00
guange c298adda7c 子域名路由实现 2016-01-14 20:37:56 +08:00
huang 71e155d83a Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 18:26:26 +08:00
huang a114b7525d Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 18:25:56 +08:00
huang b3e6f6acd5 项目删除附件问题 
项目得分添加讨论回复计算
 2016-01-14 18:25:42 +08:00
ouyangxuhua 3697d74d48 子域名路由配置 2016-01-14 18:13:17 +08:00
ouyangxuhua 0f0f1ae056 Merge branch 'dev_hjq' into szzh 
Conflicts:
	db/schema.rb
 2016-01-14 17:54:16 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
huang a105ed6e00 项目得分弹出分类显示 2016-01-14 17:29:55 +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
cxt b73aab1cf6 课程讨论区的点赞 2016-01-13 16:32:05 +08:00
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00
huang 24df6d30d6 项目得分弹出页面 2016-01-13 16:15:46 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +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 6a9dc43d03 版权修改、issue编辑 2016-01-08 14:42:28 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +08:00
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能 2016-01-07 15:09:09 +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
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
ouyangxuhua dab3f0d225 为组织1添加子域名：team 2016-01-05 16:55:21 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +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
cxt 9b974b6170 Merge branch 'cxt_course' into szzh 
Conflicts:
	db/schema.rb
 2015-12-31 15:39:07 +08:00
cxt 7e76a32480 项目/课程讨论区的动态增加设置菜单 2015-12-31 15:36:42 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +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
lizanle b7eda83def 历史资源功能 2015-12-30 17:27:44 +08:00
ouyangxuhua c2c4c032dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:27:22 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
guange aa951cd7b9 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 13:18:40 +08:00
guange 887d2f9f00 添加micros和nubot的链接 2015-12-30 13:14:32 +08:00
ouyangxuhua 40bf109223 给资源栏目增加board 2015-12-30 10:34:37 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +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 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
ouyangxuhua d77625e4e9 Merge branch 'develop' into dev_hjq 2015-12-28 17:04:12 +08:00
huang 900d7d62cb 邮件按天发送添加提示 2015-12-28 16:14:32 +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
cxt d2f56693b4 课程通知新建报404 2015-12-25 19:02:26 +08:00
cxt 11bf8f77dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:59:33 +08:00
huang a16d6803ae Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:48:41 +08:00