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

4514 Commits

Author SHA1 Message Date
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
huang dcb3d8659b Merge branch 'cxt_course' into develop 2016-06-12 15:02:33 +08:00
huang c9021eb70f 版本库附件打包下载从配置文件获取 2016-06-12 15:01:28 +08:00
cxt 9d36c74d7f 作业回复的删除 2016-06-12 14:59:00 +08:00
cxt 24f5e245df 鼠标经过消息通知时弹窗显示最新的5条未读消息 2016-06-12 14:20:55 +08:00
huang 3e3c300273 Merge branch 'cxt_course' into develop 2016-06-08 11:37:58 +08:00
huang 90aaaa544a 最新动态按创建时间排序 2016-06-08 11:36:32 +08:00
huang 2f9dcc8a31 文章点击500问题 2016-06-08 11:23:16 +08:00
huang 49406681ef 详情页面留言为空的问题 2016-06-08 10:02:10 +08:00
huang 67f0cad331 组织网站动态新页面 2016-06-08 09:40:05 +08:00
huang e4f48f046b 子页面没有内容显示 2016-06-08 09:16:57 +08:00
huang fdb1846f75 Merge branch 'hjq_beidou' into develop 2016-06-07 17:37:38 +08:00
huang a8b68d64ee 导航权限控制 2016-06-07 17:19:19 +08:00
huang 3e2810129b 课程留言动态过滤掉 2016-06-07 16:24:02 +08:00
cxt 768d91278d 微信提示信息的修改 2016-06-07 16:15:25 +08:00
huang c5bccf1adb 组织动态按更新时间排序 2016-06-07 16:02:46 +08:00
cxt 196c92f9c4 动态回复最多只加赞三条，点击展开更多时才加载余下的回复 2016-06-07 16:02:00 +08:00
huang acf4a64e6a 二级帖子子页面 2016-06-07 15:40:28 +08:00
huang 59988f17da 帖子目录界面 2016-06-07 14:48:43 +08:00
huang 1553eadc58 宽度改成1000二级目录模式二样式调整 2016-06-07 10:17:16 +08:00
huang b8d49f0079 0 2016-06-06 18:24:12 +08:00
huang 21197c95b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-06 15:11:59 +08:00
huang d3c6c0ca99 二级目录未登录时回复提示 2016-06-06 14:29:33 +08:00
huang c6d36bd738 未登录留言判断 2016-06-06 14:21:58 +08:00
cxt 6a25adb37e 最新动态改成我的动态，提示修改 2016-06-06 11:13:35 +08:00
cxt fe22cfa5c5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 18:02:41 +08:00
huang e4ff4ad156 Merge branch 'cxt_course' into develop 2016-06-03 17:55:42 +08:00
huang 57f3cf713c 去掉搜索 2016-06-03 17:50:40 +08:00
cxt 07941233d8 题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的 2016-06-03 17:03:53 +08:00
cxt ffe447e5bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-03 16:28:23 +08:00
cxt d27a050ffa 消息弹窗的显示 2016-06-03 16:28:11 +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 5ec9e31626 精品项目，精品课程按照动态数排序 2016-06-03 13:10:03 +08:00
huang 3af115ee54 组织新版样式，及方法优化 2016-06-03 12:42:02 +08:00
huang ca3b072f85 热门项目按照项目得分排序及设置界面中默认设置 2016-06-03 10:31:29 +08:00
huang 432baebdc3 组织默认activite status 2016-06-03 09:38:24 +08:00
huang 6fbad6d53d 右二优化 2016-06-03 08:45:43 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang e2848f4dec 创建栏目时默认状态 2016-06-02 21:10:07 +08:00
huang 52bc4aab81 右二（未完） 2016-06-02 18:46:15 +08:00
huang 31f3d74b0f 组织栏目中，匿名用户可以回复 2016-06-02 13:37:38 +08:00
huang 76732a3034 新模式有一 2016-06-02 13:17:38 +08:00
cxt 747128750c Merge branch 'weixin_guange' into cxt_course 2016-06-02 10:42:04 +08:00
cxt b72ad364db 微信模板消息：用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
huang e5eeba90f6 组织精品课程，热门项目 2016-06-02 09:52:06 +08:00
huang 27a9170318 组织添加设为精品项目，热门课程 2016-06-01 17:38:41 +08:00
cxt 32dca93b59 统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名 2016-06-01 15:35:26 +08:00
cxt fa73171818 点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列 2016-06-01 14:58:59 +08:00
guange 814fde878e 从后台获取openid即可 2016-05-31 20:19:45 +08:00
guange e01da32c75 tempate=>file 2016-05-31 19:54:45 +08:00
guange ac5d91a428 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:51:38 +08:00
guange 1c5a31e8f1 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:49:57 +08:00
guange 49a1a9de32 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:46:30 +08:00
guange e73c946806 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:43:27 +08:00
guange 7b5a7a93f5 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:40:54 +08:00
guange 6e44e8355c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-31 19:21:08 +08:00
guange 7f811d7551 用户动态如果没有绑定则跳到绑定页面. 2016-05-31 19:20:15 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
cxt ed84783f26 私有课程作业的公开作品 2016-05-31 17:03:50 +08:00
huang 8f897cbf89 组织管理员模式，二级目录局部刷新 2016-05-31 13:47:05 +08:00
huang c333a0c55d 组织管理员提供学霸功能 2016-05-31 10:31:08 +08:00
guange 858ad47338 作业长度定为50 2016-05-30 18:40:22 +08:00
guange acc323e46d issue7890解决 2016-05-30 18:35:47 +08:00
huang 46e4f2c143 组织新base框架 2016-05-30 14:23:52 +08:00
guange 8b623e3a0c Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-05-27 22:59:11 +08:00
guange 4561bdfd0d code=>params[:code] 2016-05-27 22:18:03 +08:00
guange 622d71c476 已绑定成功的，直接提示 2016-05-27 22:14:41 +08:00
huang ff14809237 Merge branch 'cxt_course' into develop 2016-05-27 15:30:35 +08:00
huang a207f48b94 Merge branch 'hjq_mail' into develop 
Conflicts:
	app/models/news.rb
 2016-05-27 15:27:02 +08:00
huang 9e17db376a 解决组织一级目录二级目录匿名用户问题 2016-05-27 14:44:28 +08:00
cxt 3b84cd3ed2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-27 11:07:42 +08:00
cxt 1fa6ac89ce 微信的配置 2016-05-27 11:07:27 +08:00
huang 213b0f75b0 Merge branch 'hjq_resource' into develop 2016-05-27 09:33:44 +08:00
huang ab4aa0f06f 公共资源多个资源发送功能 2016-05-27 09:32:24 +08:00
cxt 6fea9c2ba8 微信文字和图片的显示 2016-05-26 17:14:52 +08:00
cxt ff974d6901 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/views/wechats/login.html.erb
 2016-05-26 15:32:00 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00