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

4590 Commits

Author SHA1 Message Date
cxt 834e72b0f8 未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除 2016-07-11 14:43:22 +08:00
huang 1283690250 Merge branch 'rep_quality' into develop 2016-07-11 11:34:07 +08:00
huang 831006f3c6 css for sqale_index 2016-07-11 10:57:46 +08:00
huang cb148c3b9c fixed 500 2016-07-11 10:48:44 +08:00
guange 99a27766be . 2016-07-09 10:34:05 +08:00
guange 09a97fc9d8 . 2016-07-09 10:23:49 +08:00
guange 8279d9385c 区分是课程邀请，还是意见反馈 2016-07-09 10:13:05 +08:00
huang f77bad34ad 缩短时间 2016-07-08 21:29:47 +08:00
huang 8785264e07 Merge branch 'rep_quality' into develop 2016-07-08 20:39:43 +08:00
huang 62cb7d4568 add css 2016-07-08 20:35:21 +08:00
cxt 320db4ddd9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	.access_token
 2016-07-08 20:01:55 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
cxt 1a15c0f567 新建班级发布作业报500 2016-07-08 19:25:26 +08:00
cxt 6115b7fa4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 18:23:05 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
huang 011b7ef4d4 Merge branch 'rep_quality' into develop 2016-07-08 16:59:05 +08:00
huang 5a40174910 change show data's method 2016-07-08 16:19:33 +08:00
cxt c224f97905 样式调整、线下作业的作品评分、导出作业成绩报500 2016-07-08 15:02:50 +08:00
huang 040b6d4b9d Merge branch 'rep_quality' into develop 2016-07-08 14:26:40 +08:00
huang b22882aead some data for css 2016-07-08 14:22:20 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
huang e588321ada Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 11:31:02 +08:00
huang 61e2e427fd Merge branch 'rep_quality' into develop 2016-07-08 11:30:53 +08:00
huang 406d636aac add error system 2016-07-08 11:27:03 +08:00
yuanke 06f7594680 Merge branch 'yuanke' into develop 2016-07-08 09:15:55 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
huang b90c90bc60 add model error_list 2016-07-07 14:22:48 +08:00
huang 92b6171c36 sonar error puts 2016-07-07 11:08:29 +08:00
yuanke a732efa6c6 1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复 2016-07-07 10:42:51 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
huang 88f8752490 添加权限 2016-07-06 16:37:19 +08:00
huang 2f8079e85c 版本 库存 2016-07-06 16:07:17 +08:00
huang f50c4a879b modified total commits 2016-07-05 17:35:56 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
cxt 83617f8475 我的资源--》课程资源下不应出现已删除课程的资源 2016-07-05 16:48:20 +08:00
daiao cc72ca8473 Merge branch 'develop' into daiao_dev 
Conflicts:
	db/schema.rb
 2016-07-05 15:44:47 +08:00
cxt 5f41e191b1 在线测验的提示信息 2016-07-05 10:06:46 +08:00
yuanke da19bbd3a0 优化了下修改资料界面的代码 2016-07-05 09:02:34 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
cxt 0dd7ef4460 帖子列表的回复数与实际不符 2016-07-04 14:45:50 +08:00
cxt 599cedaa18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2016-07-04 14:15:56 +08:00
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复 2016-07-04 14:14:51 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
guange b010ce2e61 发送课程完成 2016-07-02 23:46:45 +08:00
huang d346679eaf Merge branch 'rep_quality' into develop 2016-07-01 21:34:49 +08:00
txz 6ac7d322b9 some added 2016-07-01 21:31:50 +08:00
huang 171130ed74 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 20:28:51 +08:00
txz 61b5a100eb delete log messages 2016-07-01 20:25:58 +08:00
yuanke bc30f1128e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 20:06:53 +08:00
yuanke 1bfb2918f0 KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题 2016-07-01 20:06:12 +08:00
txz 8cc4b7a878 public questions 2016-07-01 20:00:23 +08:00
huang 67cad6fc25 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:54:38 +08:00
huang 374a905d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:53:47 +08:00
huang e74a2ba275 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:53:29 +08:00
cxt e834d09469 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 17:52:29 +08:00
yuanke a7ecfba23b Merge branch 'yuanke_org' into develop 2016-07-01 17:52:23 +08:00
txz 25e77497e7 consloe pring 2016-07-01 17:50:08 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
yuanke 8db5852a61 激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决 2016-07-01 15:49:25 +08:00
txz 7178c50b1d branch's total commits 2016-07-01 15:37:39 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
txz 1fbb65b906 获取结果ajax加载中 2016-07-01 14:39:40 +08:00
cxt b2aee9b1b8 新建课程大纲的描述 2016-07-01 13:52:22 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 11:31:51 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke dfd381fc99 Merge branch 'yuanke_org' into develop 
Conflicts:
	db/schema.rb
 2016-07-01 09:31:19 +08:00
txz db1ad932c6 Function : update jenkins job 2016-07-01 09:31:05 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
daiao 2eb7aa7c38 修改精品课程下-全部课程下 除序列、主讲老师和课程名外的所有列进行排序！ 2016-06-30 11:32:14 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
Your Name 5c83414828 update 2016-06-30 10:17:53 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality 
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
 2016-06-29 14:18:17 +08:00
Your Name 3390a2d05f 500 2016-06-29 11:10:19 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
Your Name c8178fc023 allert 2016-06-29 09:59:21 +08:00
Your Name e887ac5c7c git data from sonar 2016-06-29 09:38:30 +08:00
Your Name 3c3fb29bb2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-29 09:11:13 +08:00
Your Name 22b40c082c resole some nil problems 2016-06-29 09:10:47 +08:00
yuanke 376ec39035 Merge branch 'develop' into yuanke_org 2016-06-29 08:48:07 +08:00
huang 0a684227b8 如果sonar没扫描完成则暂时不读取数据 2016-06-28 22:01:44 +08:00
guange 7fdfc02821 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-28 17:47:32 +08:00
Your Name 300ad68405 default path for sonar 2016-06-28 17:39:58 +08:00
Your Name a08edcca8a quanxian 2016-06-28 17:18:50 +08:00
cxt cbe34ea0a7 分组作业提交作品时关联成员列表为空 2016-06-28 15:57:56 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
Your Name dd6b19a8b5 some status of sonar 2016-06-28 14:48:09 +08:00
guange 436de8ce5a 优先取env中的wechat url 2016-06-28 11:33:54 +08:00
guange 57cdc1d5ec 协议修改 2016-06-28 11:30:06 +08:00
Your Name f930bbddad modified create 2016-06-28 09:45:45 +08:00
Your Name e5b93ac7ed modified main method 2016-06-27 18:13:46 +08:00
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:03:55 +08:00
yuanke ab99645148 Merge branch 'yuanke' into develop 2016-06-27 15:52:01 +08:00
yuanke 5c2ac3e02f 修改删除组织成员跨域的BUG 2016-06-27 15:47:06 +08:00
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 11:09:31 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
Your Name 69f7dab04d some modified 2016-06-24 21:33:35 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
Your Name c658296e2b config 2016-06-24 19:12:07 +08:00
Your Name 537f152562 0 2016-06-24 18:47:54 +08:00
cxt 0d66763026 迟交扣分 2016-06-24 18:23:00 +08:00
guange b5bfe40693 . 2016-06-24 17:35:55 +08:00
guange 9e61f2229e Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 17:15:10 +08:00
guange 084b545be9 修改为正式版 2016-06-24 17:14:58 +08:00
cxt 0611ddcc43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:54:19 +08:00
guange 2c2e1892e5 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 16:53:58 +08:00
cxt 76e7c50bf4 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 16:52:00 +08:00
guange 4436e87c84 . 2016-06-24 16:35:27 +08:00
cxt c0e58d19fa 导出的作业成绩中的缺评、迟交扣分应与作品列表的一致 2016-06-24 16:25:29 +08:00
Your Name eae70f9c71 some config 2016-06-24 16:18:17 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
guange 9a9f6400da . 2016-06-24 15:42:00 +08:00
guange c522d7160c . 2016-06-24 15:40:27 +08:00
guange 9ec1f916b6 . 2016-06-24 15:38:46 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
guange 7e2482167d . 2016-06-24 15:31:45 +08:00
guange 16a9f017b6 error 2016-06-24 15:28:44 +08:00
yuanke c6be37020f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_reply_to.html.erb
 2016-06-24 15:11:52 +08:00
guange 485d0e3743 ticket处理 2016-06-24 14:59:50 +08:00
Your Name 06fe02890f index for sonar result 2016-06-24 14:59:17 +08:00
yuanke 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +08:00
yuanke 64d87b7398 修改组织添加成员的BUG 2016-06-24 13:50:28 +08:00
Your Name 128f6721be stoped the zhizhen 2016-06-24 13:00:02 +08:00
Your Name de80403e8d add address to config 2016-06-24 12:38:39 +08:00
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +08:00
Your Name e6b263feb5 issues from sonar 2016-06-24 09:58:51 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
cxt e457593416 作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况 2016-06-23 17:34:46 +08:00
Your Name 53b9cbee72 added hightcharts and added some api for sonar 2016-06-23 17:21:18 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
Your Name 3fe5d9a1a3 get date froma sonar 2016-06-23 11:24:58 +08:00
guange d466b09f3f . 2016-06-22 17:20:34 +08:00
Your Name ce6e6116b5 get data from sonar API 2016-06-22 17:09:54 +08:00
guange 1470cafe57 . 2016-06-22 17:09:49 +08:00
guange 9b42b4e7f7 . 2016-06-22 17:04:01 +08:00
guange 40217d5c56 . 2016-06-22 16:57:01 +08:00
guange 0929d2ac28 . 2016-06-22 16:48:34 +08:00
guange 7700445c17 加入课程 2016-06-22 16:42:20 +08:00
yuanke 9461c41fa7 激活留言修改 2016-06-22 14:14:36 +08:00
yuanke b68e227531 没激活的帐号界面 2016-06-22 14:04:47 +08:00
guange 8129e29d5b . 2016-06-22 12:52:26 +08:00
guange f791f37205 . 2016-06-22 12:36:46 +08:00
guange 5b087179eb . 2016-06-22 12:31:47 +08:00
guange 833c5a5ede . 2016-06-22 12:27:23 +08:00
guange 4663f48496 修改跳转菜单 2016-06-22 12:13:50 +08:00
guange 13273d02de 修正了安全问题，不暴露openid 2016-06-22 12:11:34 +08:00
Your Name 2275fe6d23 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-22 11:26:03 +08:00
Your Name 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
huang 494b69c89b sonar数据获取 2016-06-22 09:12:57 +08:00
huang dee53a1383 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 
Conflicts:
	app/views/repositories/_quality_analyses.html.erb
 2016-06-21 16:51:58 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
Your Name 26b7c3e70b aqulity analysis 2016-06-21 16:46:34 +08:00
cxt 7e25ec1a00 登录报500 2016-06-21 15:07:37 +08:00
Your Name d5631defb5 added xml to jenkins and added some gems 2016-06-20 17:53:56 +08:00
guange 1d6d100983 . 2016-06-20 17:37:35 +08:00
guange 6f14b61cce . 2016-06-20 17:28:21 +08:00
guange 4b813ef535 加入班级消息 2016-06-20 17:26:29 +08:00
guange c940527694 . 2016-06-20 17:12:53 +08:00
guange 62a1b5de7c 加入班级更新 2016-06-20 17:04:42 +08:00
huang 96e00f7bf3 jenkins连接 2016-06-20 16:21:37 +08:00
guange c6f04db19e wechat 2016-06-20 15:50:52 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
guange b7230333dc code获取修改 2016-06-20 15:21:13 +08:00
guange 3f98562c0f 打包 2016-06-20 14:45:19 +08:00
huang 36e47fa8b1 代码质量分析，弹框参数传递 2016-06-20 14:21:40 +08:00
guange 9d19caa736 . 2016-06-17 18:48:27 +08:00
guange 7aec37bb3a . 2016-06-17 18:25:55 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
cxt 7b1efe193d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 14:45:16 +08:00
cxt eb3694dbe6 消息报500 2016-06-17 14:45:07 +08:00
yuanke fde3fd0d94 新建贴吧跳入该贴吧帖子列表，组织栏目配置默认选择第一个栏目类型 2016-06-17 14:40:00 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-06-17 11:33:48 +08:00
huang 35ee17c4ca Merge branch 'yuanke' into develop 2016-06-17 11:32:50 +08:00
huang d0791253d9 quality 2016-06-17 11:29:49 +08:00
cxt 1dac05c6d1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 11:26:58 +08:00
huang fea21fe7cd Merge branch 'develop' into rep_quality 2016-06-17 10:36:09 +08:00
yuanke 70a762220a 组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放 2016-06-16 16:55:25 +08:00
cxt e3ee99b486 消息通知中过滤掉已删除的课程消息、 
at消息不显示
 2016-06-16 15:46:16 +08:00
yuanke 049a21c7d0 不上线的先还原 2016-06-16 14:08:54 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
cxt 03b92f8570 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 17:23:23 +08:00
yuanke 1023b94f0d 新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项 2016-06-15 17:22:39 +08:00
huang 9b6f40bb02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 15:43:42 +08:00
yuanke 5a7f7da1f7 新建贴吧和组织配置默认选项暂时还原。 2016-06-15 15:34:13 +08:00
huang d75a8bc35a Merge branch 'hjq_beidou' into develop 2016-06-15 14:49:10 +08:00
yuanke 7b6e8fbc53 修改组织点击登录后可回复报500的BUG 2016-06-15 14:33:25 +08:00
cxt caa966c85a 分组作业的作品列表提示的修改 
分组作业提交作品时的最小人数限制不起作用
 2016-06-15 14:12:42 +08:00
cxt c50d307e89 分组作业添加成员后再次打开，数据未保存 2016-06-14 17:36:12 +08:00
huang 5515fb660f 完成资源更新的时候 描述继承问题，并且可以修改描述 2016-06-14 14:47:02 +08:00
huang d21df48961 代码质量分析弹框及参数传入 2016-06-14 14:10:33 +08:00
cxt 6100abe0da 课程大纲 2016-06-14 10:38:11 +08:00
huang 9029fd91e0 rails 代码中调用shell命令调用 2016-06-14 09:57:29 +08:00
huang 0c25e3b13d 版本库质量分析 ssh链接 2016-06-13 15:21:29 +08:00
yuanke e86419c28b 组织配置里面栏目类型默认为帖子 2016-06-13 13:35:01 +08:00
cxt 3a8a61e404 在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序 2016-06-13 11:10:28 +08:00
cxt be47331213 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-12 15:08:43 +08:00