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

9741 Commits

Author SHA1 Message Date
huang 4c5052dce2 作业按更新时间排序 2016-07-15 17:28:57 +08:00
cxt 5b070b6acc 消息列表的html标签 2016-07-15 16:52:18 +08:00
huang f9e03434c2 Merge branch 'develop' into rep_quality 2016-07-15 16:51:31 +08:00
yuanke 60dc0e72cf 微信我我的资源更多按钮显示 2016-07-15 16:46:27 +08:00
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 16:31:42 +08:00
huang b2a8a0fed6 修复里程碑进度条数据显示错误的问题 2016-07-15 16:28:33 +08:00
cxt 1c967ce569 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/users/_user_message_system.html.erb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-07-15 15:53:32 +08:00
cxt 11e0101f56 导航栏题库中 我的题库放在前面 2016-07-15 15:06:33 +08:00
guange dd892993dd assets 2016-07-15 14:49:23 +08:00
cxt b7e6725e1f 管理员界面的课程名称双击可点击 2016-07-15 14:48:39 +08:00
guange 0e415fffff merge 2016-07-15 14:48:10 +08:00
huang 4e3a7e8df1 新建版本“日期”--》“截止日止” 2016-07-15 14:11:51 +08:00
huang 77e4a66e7e 模式切换刷新后引起的样式问题 2016-07-15 13:50:15 +08:00
cxt fd68479d72 课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级 2016-07-15 11:02:53 +08:00
huang 97b1ea22e7 解决：Firefox浏览器中：资源库，先点击资源描述编辑图标按钮（笔），再点击页面空白处，如图两个资源之间有一段空白 2016-07-15 10:51:44 +08:00
cxt 7ea5d7d934 新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
Tim 2d1d3083d0 引入project.css 2016-07-15 09:51:14 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
cxt b77779ca55 文章的二级回复和组织帖子的二级回复 2016-07-14 17:23:48 +08:00
yuanke d50fd40307 Merge branch 'weixin_guange' into develop 2016-07-14 17:19:47 +08:00
Tim c41a116378 博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改 2016-07-14 17:00:38 +08:00
huang 7da67350fd issue列表进入详情页面，弹出新页面 2016-07-14 15:31:25 +08:00
huang e98d7a213f 系统消息点击跳转列表定位 2016-07-14 15:23:16 +08:00
huang f7c9bc0a19 消息跳转定位 2016-07-14 15:04:58 +08:00
cxt e19efc1c8a 博客的二级回复 2016-07-14 14:44:47 +08:00
huang 3485d48163 Merge branch 'develop' into rep_quality 
Conflicts:
	app/controllers/quality_analysis_controller.rb
 2016-07-14 14:08:03 +08:00
huang 8c6fca87c9 项目动态中，新闻添加快捷操作，所有操作默认显示 2016-07-14 13:57:06 +08:00
huang 00c414c347 issue回复填写正确的样式问题 2016-07-14 11:14:05 +08:00
Tim fdf147326c Merge branch 'develop' into cs_optimize_txz 2016-07-14 11:01:12 +08:00
huang 9b59ca20de 修复issue详情页面，删除回复后再编辑保存issue弹出白色框问题 2016-07-14 10:39:54 +08:00
cxt ded8f48d34 博客的二级回复 2016-07-13 15:20:39 +08:00
huang 61bf6604b1 解决ajax情况下，issue状态选框不显示问题 2016-07-13 12:23:28 +08:00
huang ef931d1491 编辑issue，与回复issue冲突问题（局部刷新） 2016-07-13 12:07:27 +08:00
yuanke 5cd394c4ae 修改微信班级测验报错的BUG 2016-07-13 10:09:47 +08:00
huang 845f36c4f3 解决z注册时候邮箱不能是大写加下划线的形式 2016-07-13 10:00:04 +08:00
cxt 9bf853d2bb 管理员可修改课程名称和英文名称 2016-07-13 09:49:24 +08:00
cxt 16cf8a56a1 管理员和老师可看到课程下的所有班级 2016-07-13 09:34:36 +08:00
huang 191261d3b8 each time to 10s 2016-07-12 17:30:29 +08:00
Tim 73b7b00db9 班级学生列表导航栏下拉框错位调整 2016-07-12 16:45:04 +08:00
cxt c46fcc48b1 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/users/_join_course_course_message.html.erb
 2016-07-12 16:26:13 +08:00
huang e766adf087 add delete to qa 2016-07-12 16:23:30 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
daiao 304f18ac5e 修复课程中，对动态进行筛选的页面呈现方式 2016-07-12 15:05:42 +08:00
cxt 955c258856 复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程 2016-07-12 10:35:52 +08:00
cxt 89819f5ccd 消息列表 2016-07-11 17:33:11 +08:00
huang 22745edb9b Merge branch 'rep_quality' into develop 2016-07-11 17:02:25 +08:00
huang 8b5a2ac1cb message 500 2016-07-11 16:59:37 +08:00
daiao 97599849ee 优化课程中作品下内容显示代码 2016-07-11 16:03:45 +08:00
daiao 00d59a5596 修复课程坐下下，提示内容的表达形式 2016-07-11 15:47:33 +08:00
cxt d21eaf9154 未配置班级列表的班级重命名 2016-07-11 15:32:01 +08:00
cxt b4e6561e50 Merge branch 'cxt_course' into develop 2016-07-11 15:16:27 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
cxt 834e72b0f8 未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除 2016-07-11 14:43:22 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
huang 1283690250 Merge branch 'rep_quality' into develop 2016-07-11 11:34:07 +08:00
huang 0a001b4f76 message 500 for boliang 2016-07-11 11:29:15 +08:00
huang 93e79d9419 add hidden to css 2016-07-11 11:23:59 +08:00
huang bac3e433aa sqlate index nil 2016-07-11 11:07:04 +08:00
huang 831006f3c6 css for sqale_index 2016-07-11 10:57:46 +08:00
daiao 670b443cc4 Merge branch 'develop' into daiao_dev 2016-07-11 10:38:46 +08:00
guange 2a2fe9e81d 解决android缓存问题 2016-07-09 09:22:41 +08:00
guange 8800290db9 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-07-08 20:49:55 +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
guange 135b6ca64b assets 2016-07-08 20:04:24 +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 d25f401afa 管理员界面修改班级名称 2016-07-08 19:16:53 +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
guange 068c8967e1 新增班级时名称为1个字符时报错 2016-07-08 17:04:17 +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
huang fcf32474b6 modified days and hours for nil data 2016-07-08 13:53:54 +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
daiao 41fc812ca4 修复班级配置--添加成员：用户名称太长的问题 2016-07-07 17:34:38 +08:00
Tim 65cbf14d72 提交与取消按钮间添加间距；图标不显示等 2016-07-07 17:06:31 +08:00
daiao 5c4e4e7c8a 修复删除班级后再删除课程，提示错误的问题 2016-07-07 16:55:34 +08:00
cxt 3b418bc44c 如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。 2016-07-07 16:46:41 +08:00
huang ec32204809 sql_index --to chinese 2016-07-07 15:53:07 +08:00
cxt 290abeeaa4 班级名称的显示 2016-07-07 15:36:08 +08:00
cxt 3b91adf689 课程大纲内的编辑图标的显示与隐藏 2016-07-07 15:28:33 +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
Tim b02c1b5995 提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减； 2016-07-07 15:08:34 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
guange a2ba65956c . 2016-07-07 15:03:45 +08:00
daiao c621602050 修复当鼠标移至区域内才会显示icon 2016-07-07 15:02:02 +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
Tim b6716e542a wiki编辑页面更新 2016-07-06 15:59:49 +08:00
Tim 0b764d0dfc RSide样式处理 2016-07-06 15:52:18 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +08:00
daiao db3056f1b1 隐藏班级列别的创建时间和创建名称！ 2016-07-06 09:22:20 +08:00
daiao ad36a1b29e 修复课程下编辑框英文换行缺陷 2016-07-06 09:07:50 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-05 16:49:50 +08:00
Tim b91d6a3273 班级动态筛选框样式调整 2016-07-05 16:31:36 +08:00
daiao cc72ca8473 Merge branch 'develop' into daiao_dev 
Conflicts:
	db/schema.rb
 2016-07-05 15:44:47 +08:00
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
 2016-07-05 15:38:56 +08:00
cxt 3ccdf7f9ae 课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面 2016-07-05 15:00:41 +08:00
yuanke 5ecb99196e 修改新建项目时公开后面的提示语 2016-07-05 14:48:54 +08:00
cxt eff4780ea9 去掉班级配置页面的自动填充 2016-07-05 14:29:42 +08:00
cxt 17a2686d42 班级左侧头部信息的样式调整 2016-07-05 11:22:58 +08:00
cxt 2956b08f40 分组作业：去掉组员“追加附件”的入口 2016-07-05 10:32:46 +08:00
daiao fff13f426a Merge branch 'daiao_dev' of https://git.trustie.net/jacknudt/trustieforge into daiao_dev 2016-07-05 10:27:27 +08:00
daiao 7ba930f5c6 更改课程列表下动态时间 2016-07-05 10:26:55 +08:00
cxt 23eefc2b7f 班级主页：建议将如图所示适当往上调一点，与左侧头像对齐 2016-07-05 10:15:24 +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 2c13184d9d 修改js引用 2016-07-04 10:52:32 +08:00
guange 201abd6358 assets 2016-07-03 00:08:51 +08:00
guange b010ce2e61 发送课程完成 2016-07-02 23:46:45 +08:00
yuanke 3159d16917 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 21:39:14 +08:00
huang 3737ef40d0 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 21:39:29 +08:00
yuanke 447e624f36 课程大纲bug修复 2016-07-01 21:38:37 +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
yuanke 62a7d56c97 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 20:39:17 +08:00
yuanke 70e26927cb 班级中的课程字样改为班级 2016-07-01 20:38:33 +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 134aa55e04 authoriod 2016-07-01 20:16:06 +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
Tim 28c20c966e 查看标签页面显示bug 2016-07-01 19:28:55 +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 b1a77a036b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:52:35 +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 8b87c141cc bug修复 2016-07-01 17:47:35 +08:00
yuanke 547d5409bb 组织中的课程字样改为班级 2016-07-01 17:43:38 +08:00
cxt 0f8cc584a9 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-07-01 17:27:40 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
yuanke 1edc63721f 修改课程列表班级时间显示问题 2016-07-01 17:03:05 +08:00
Tim afbf62fd64 当课程数为0时，课程列表点击无效 2016-07-01 17:02:52 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
yuanke 8db5852a61 激活邮箱界面显示邮箱，激活邮箱界面留言太长不能留言解决 2016-07-01 15:49:25 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
txz 21be94cbe1 add some links 2016-07-01 15:05:01 +08:00
txz 1fbb65b906 获取结果ajax加载中 2016-07-01 14:39:40 +08:00
cxt f70b51769c Merge branch 'cxt_course' into develop 2016-07-01 14:14:13 +08:00
cxt afe16cc99c 课程大纲列表的js调整 2016-07-01 14:13:40 +08:00
Tim def0d79271 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_syllabus_list.html.erb
 2016-07-01 13:56:07 +08:00
Tim 7633761bbe 课程大纲列表展开收起js 2016-07-01 13:54:00 +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 3b7679b254 课程大纲列表 2016-07-01 11:29:03 +08:00
cxt a50e15b2ab Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_syllabus_list.html.erb
	db/schema.rb
 2016-07-01 11:15:03 +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 a8bd91754d 修改博客详情里面内容前面多空格的BUG 2016-07-01 09:27:46 +08:00
txz 24f1375a4e modified job 2016-06-30 17:36:33 +08:00
Tim 10f52f110f 课程大纲列表点击展开收起，配置按钮链接跳转实现 2016-06-30 16:12:25 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
Tim ba1db91a1e css优化调整 2016-06-30 15:38:00 +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
guange 0bb5c8b5fb 注册绑定问题 2016-06-29 21:09:49 +08:00
huang f7e872cb6c 权限修改，项目成员都可以提交质量分析job 2016-06-29 15:20:14 +08:00
huang daf14178cd 修改权限，只有项目成员能够代码质量分析 2016-06-29 14:20:02 +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
huang b731b05a5a 中文 2016-06-29 14:12:24 +08:00
Your Name 77387778d8 some css 2016-06-29 14:08:30 +08:00
huang 653520763a Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-29 11:22:10 +08:00
huang 1225a33cec 提示 2016-06-29 11:21:46 +08:00
Your Name 3390a2d05f 500 2016-06-29 11:10:19 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
huang 36944e8cce 提示信息 2016-06-29 10:06:23 +08:00
Your Name c8178fc023 allert 2016-06-29 09:59:21 +08:00
Your Name 22b40c082c resole some nil problems 2016-06-29 09:10:47 +08:00
yuanke 233e7d5c91 Merge branch 'lingbing' into yuanke_org 
Conflicts:
	Gemfile
 2016-06-29 08:51:43 +08:00
Linda c24fdee134 个人资料页面新版修改 2016-06-29 08:48:13 +08:00
yuanke 376ec39035 Merge branch 'develop' into yuanke_org 2016-06-29 08:48:07 +08:00
daiao cb11cac506 Merge branch 'develop' into daiao_dev 
Conflicts:
	app/views/admin/excellent_all_courses.html.erb
 2016-06-28 18:39:32 +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 4983d5283b 关联成员能多次添加 2016-06-28 16:30:33 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
daiao d8284e45ed 在课程列表下增加动态时间一栏 2016-06-28 15:06:08 +08:00
Your Name dd6b19a8b5 some status of sonar 2016-06-28 14:48:09 +08:00
daiao 863cdee37c 在精品课程的全部课程界面下增加公开属性 2016-06-28 14:39:43 +08:00
guange 57cdc1d5ec 协议修改 2016-06-28 11:30:06 +08:00
guange 047903ddff 重构课程地址 2016-06-28 10:57:58 +08:00
Your Name e5b93ac7ed modified main method 2016-06-27 18:13:46 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00
guange f6f329b00f erge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:06:20 +08:00
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:03:55 +08:00
huang 845141a189 注释掉代码质量分析入口 2016-06-27 16:03:43 +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
daiao ad3626d53a 将搜索页面：“登陆”改为“登录” 2016-06-27 15:36:31 +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
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
cxt f984a01cdc 跳转协议问题 2016-06-24 18:50:47 +08:00
Your Name 537f152562 0 2016-06-24 18:47:54 +08:00
cxt 8d5501615c 加入课程的样式调整 2016-06-24 18:09:18 +08:00
cxt 492b2f895c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-24 17:58:56 +08:00
cxt 4f342142e6 组织文章的展开更多 2016-06-24 17:58:50 +08:00
Your Name e5ad64831a 0 2016-06-24 17:50:26 +08:00
huang 6bc4dec636 列表界面 2016-06-24 17:46:21 +08:00
Your Name 244c178758 666 2016-06-24 17:39:10 +08:00
yuanke e3c094cb07 Merge branch 'yuanke' into develop 2016-06-24 17:19:25 +08:00
yuanke f1682edf64 修改创建贴吧BUG 2016-06-24 17:18:04 +08:00
cxt b2f939fa92 代码调整 2016-06-24 17:01:35 +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 c39a982093 二维码 2016-06-24 16:51:40 +08:00
cxt eab000306c 动态回复的展开更多、收起，组织文章回复不可用 2016-06-24 16:38:36 +08:00
Your Name eae70f9c71 some config 2016-06-24 16:18:17 +08:00
cxt d558a4d357 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 16:12:31 +08:00
cxt afc8fad7fd 通过邀请码加入课程 2016-06-24 16:12:24 +08:00
Tim a542ba46a4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:55:07 +08:00
Tim ec33569033 取消拖拽 2016-06-24 15:54:56 +08:00
huang 4ea210a05b 重复改成代码重复 2016-06-24 15:46:04 +08:00
Tim a3738c4cb2 新建组织，题库和资源库弹框样式检查 2016-06-24 15:42:42 +08:00
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:36:03 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
cxt ac629440b1 课程邀请码 2016-06-24 15:33:45 +08:00
huang 09b78fc546 中文 2016-06-24 15:13:09 +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
Your Name 06fe02890f index for sonar result 2016-06-24 14:59:17 +08:00
yuanke c61c14fa97 Merge branch 'yuanke' into develop 2016-06-24 14:35:59 +08:00
yuanke 86a5eccae6 组织设置中添加成员BUG解决 2016-06-24 14:16:39 +08:00
Tim a28d775cb2 资源库，题库样式检查 2016-06-24 14:01:49 +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
Your Name e4e0e7b166 helper 2016-06-24 12:17:05 +08:00
yuanke 2a971c3bc6 修改有的组织添加成员的BUG 2016-06-24 11:24:48 +08:00
yuanke e818b5fb07 旧的注册页面去掉 2016-06-24 11:22:43 +08:00
cxt 2959391438 作业列表：没有作业时下拉框被点击后，显示一条记录：目前尚未发布作业 2016-06-24 11:20:48 +08:00
Your Name e17aa4c5d8 color 2016-06-24 11:20:39 +08:00
cxt a41d18dd0e 编程作业的作品详情在顶部增加“收起” 2016-06-24 11:02:29 +08:00
Your Name 580b232d62 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-24 10:47:28 +08:00
Your Name 05eb71036d some css to added 2016-06-24 10:47:24 +08:00
huang a0635bbb2d 所占百分比 2016-06-24 10:47:21 +08:00
Your Name e6b263feb5 issues from sonar 2016-06-24 09:58:51 +08:00
Tim 8a6bbf50a9 css文件替换 2016-06-24 09:30:46 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
Your Name 0dc1a1c047 get status 2016-06-23 18:24:22 +08:00
huang eca189335b 统计图 2016-06-23 17:40:27 +08:00
Your Name 53b9cbee72 added hightcharts and added some api for sonar 2016-06-23 17:21:18 +08:00
cxt 8940c5f4ca 禁用匿评的作品列表不应显示“导出匿评情况、导出缺评情况”链接 2016-06-23 15:05:16 +08:00
Your Name 3964631ed1 hight charts 2016-06-23 14:58:09 +08:00
huang 5cf108030f hight char钟表图 2016-06-23 14:48:55 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
Your Name 8438bc7bcd somethint to added 2016-06-23 14:31:23 +08:00
huang 723540044d 检测列表页面 2016-06-23 13:59:45 +08:00
huang ad6e3c3364 质量分析权限 2016-06-23 13:52:03 +08:00
Your Name 3fe5d9a1a3 get date froma sonar 2016-06-23 11:24:58 +08:00
huang 9f15a8aa4e 代码质量分析样式 2016-06-22 17:40:13 +08:00
Your Name ce6e6116b5 get data from sonar API 2016-06-22 17:09:54 +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 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
guange b6892cfc2d 把angularjs换成7牛cdn 2016-06-22 10:00:07 +08:00
huang 494b69c89b sonar数据获取 2016-06-22 09:12:57 +08:00
cxt 1b12c56960 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 16:53:36 +08:00
cxt 3f8beaf97c 动态回复banner的代码重构 2016-06-21 16:53:31 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
daiao 97d07134a5 修改上传资源名过长造成溢出框架 2016-06-21 16:20:07 +08:00
daiao 8037bccb17 将延迟发布统一修改为延期发布 2016-06-21 16:08:45 +08:00
Tim fd765b1d73 设置课程大纲弹框js控制 2016-06-21 15:17:24 +08:00
daiao 15f3a42a8a 修改缺陷：新建在线测试发布时间与截止时间相同时，提示信息不正确 2016-06-21 15:12:10 +08:00
Tim 1a4865be09 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-21 15:03:51 +08:00
cxt 44334913ee 未读消息弹窗漏了一条消息 2016-06-21 14:28:26 +08:00
cxt 4a12b56223 Merge branch 'cxt_course' into develop 2016-06-21 13:58:50 +08:00
cxt c4cea93a44 消息列表的“展开更多”指针手势修改 2016-06-21 13:58:17 +08:00
cxt 2176ad1ede Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-21 11:18:37 +08:00
cxt 53614197aa Merge branch 'cxt_course' into develop 2016-06-21 11:18:28 +08:00
cxt 4f80e259e8 消息弹窗的延时显示 2016-06-21 11:16:45 +08:00
daiao 8e7095c82d 修改了课件名称显示不全的缺陷 2016-06-21 10:46:32 +08:00
yuanke 64a4af21eb Merge branch 'yuanke' into develop 2016-06-20 17:36:08 +08:00
yuanke 40792ff222 更新资源版本描述默认显示 2016-06-20 17:34:35 +08:00
yuanke 0ebbf29b54 Merge branch 'yuanke' into develop 2016-06-20 17:14:14 +08:00
yuanke a5ffd013b9 修改更新资源版本的样式问题 2016-06-20 17:13:14 +08:00
yuanke 301556b9c3 Merge branch 'yuanke' into develop 2016-06-20 16:41:23 +08:00
yuanke fde06a2327 更新资源描述样式修改 2016-06-20 16:35:16 +08:00
guange 29a815aeaf 添加weui 2016-06-20 16:09:04 +08:00
cxt f4d67bc027 未读消息弹窗“点击展开”显示10条未读消息 2016-06-20 16:03:57 +08:00
Tim 3548c23aad Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-20 15:43:15 +08:00
cxt 048bb7fed5 头像下拉菜单、未读消息的延时 2016-06-20 15:38:43 +08:00
guange 05ddbe5874 修改code 2016-06-20 15:28:19 +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
cxt b26a6b5195 消息弹窗的链接无效 2016-06-20 11:24:34 +08:00
daiao dbc8f420ed 按照要求：将延期发布在资源上传界面叫延迟发布，在资源配置按钮中叫延期发布，见附件，同一功能的按钮名称应该统一。统一修改为延迟发布。 2016-06-20 10:17:08 +08:00
yuanke 0719313f01 Merge branch 'yuanke' into develop 2016-06-20 09:41:26 +08:00
yuanke 4b7fa3a040 修改有的组织不能修改资源描述的问题 2016-06-20 09:19:50 +08:00
huang fce93de296 500问题 2016-06-17 18:03:58 +08:00
huang e4105b538a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 17:36:14 +08:00
huang 6af0bf7b83 组织样式 2016-06-17 17:35:46 +08:00
yuanke f3014c3993 Merge branch 'yuanke' into develop 2016-06-17 17:25:53 +08:00
yuanke 948ec58248 作业二级回复未登录显示样式问题 2016-06-17 17:18:36 +08:00
cxt 3492f65a9b 编程作业匿评时的列表宽度调整 2016-06-17 16:57:11 +08:00
Tim 4b62a39b15 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-17 16:49:57 +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 811afbdf33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 14:43:25 +08:00
huang 7d68df79a0 组织合并凌彬代码500问题 2016-06-17 14:44:12 +08:00
yuanke fde3fd0d94 新建贴吧跳入该贴吧帖子列表，组织栏目配置默认选择第一个栏目类型 2016-06-17 14:40:00 +08:00
yuanke d6d9a366f2 Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-06-17 14:36:12 +08:00
huang 0f17ac0e9e Merge branch 'lingbing' into develop 
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
 2016-06-17 14:33:31 +08:00
huang 8741917823 访问统计 （自2016年5月） 2016-06-17 14:31:42 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00
cxt a105f4eaf0 课程动态中：课程讨论区、课程通知 
项目动态中：项目issue、项目新闻、项目讨论区
个人动态：如上动态
未登录时不显示齿轮
 2016-06-17 14:09:43 +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
yuanke 3ae26a6530 组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。 2016-06-17 11:23:49 +08:00
huang fea21fe7cd Merge branch 'develop' into rep_quality 2016-06-17 10:36:09 +08:00
huang d127c6e12c 访问添加自某年某月 2016-06-17 09:45:10 +08:00
cxt 795917688c 留言内容无法展开、收起 2016-06-17 09:34:48 +08:00
cxt 28ee609eed 学生查看测验的统计结果 2016-06-16 16:58:59 +08:00
yuanke 70a762220a 组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放 2016-06-16 16:55:25 +08:00
cxt 439841fbd7 从课程动态页面打开的匿评设置日期选择界面显示为英文，从作业页面打开的匿评设置日期选择界面为中文，应该统一为中文 2016-06-16 16:10:42 +08:00
cxt 30db43eb13 作业开启匿评之后，如果是普通作业，会提示学生提交的作业不会进入匿评，也不能对其他人进行匿评，如果是编程作业，在打开作业时则无此提示，应该统一，均进行提示 2016-06-16 15:58:34 +08:00
huang 312fa61489 输入框线条 2016-06-16 15:57:30 +08:00
huang 6707868915 登录页面新样式 2016-06-16 15:52:54 +08:00
cxt e3ee99b486 消息通知中过滤掉已删除的课程消息、 
at消息不显示
 2016-06-16 15:46:16 +08:00
huang d2d15710b5 解决chrome浏览器背景黄色问题 2016-06-16 15:25:43 +08:00
yuanke f9f66bac7b 修改课程资源描述为空时提示 2016-06-16 14:15:46 +08:00
yuanke 7df91ebf70 修改课程资源描述空白的提示语 2016-06-16 14:14:54 +08:00
yuanke 4cd321f363 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-16 14:11:17 +08:00
yuanke 049a21c7d0 不上线的先还原 2016-06-16 14:08:54 +08:00
huang 072807fe37 1、登录下划线去掉2、登录改成注册3、默认的改成勾选协议 2016-06-16 14:07:37 +08:00
yuanke 82ebd1e4c9 Merge branch 'yuanke' into develop 2016-06-16 14:04:53 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
Tim 24458ecb48 table可拖拽，在线测验表格布局优化 2016-06-16 11:31:39 +08:00
huang 8f73cba44b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-16 10:36:40 +08:00
huang 41bb68d0e1 Merge branch 'hjq_login' into develop 2016-06-16 10:36:30 +08:00
huang 5e3df51ad9 完成新版登录注册 2016-06-16 10:21:21 +08:00
Tim 9cd1630651 优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换 2016-06-16 08:52:13 +08:00
huang aa42044199 注册登录 2016-06-15 17:58:02 +08:00
huang 06f97d5cb7 注册页面（未完） 2016-06-15 17:24:46 +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
yuanke ec4273fc49 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 17:08:24 +08:00
yuanke a17fb86a17 组织回复点登录直接跳入登录页面 2016-06-15 17:07:29 +08:00
cxt 43192b8648 分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值 2016-06-15 17:04:53 +08:00
huang 9b6f40bb02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 15:43:42 +08:00
huang a2c5cc6da1 登录界面base及新页面 2016-06-15 15:41:13 +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
huang 45f185bf9b Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-06-15 14:38:16 +08:00
huang c15ef27fc0 管理员能看到组织资源 2016-06-15 14:36:38 +08:00
yuanke 7b6e8fbc53 修改组织点击登录后可回复报500的BUG 2016-06-15 14:33:25 +08:00
cxt caa966c85a 分组作业的作品列表提示的修改 
分组作业提交作品时的最小人数限制不起作用
 2016-06-15 14:12:42 +08:00
Tim f7832b00c9 更新历史版本时描述位置调整 2016-06-15 14:02:09 +08:00
cxt c50d307e89 分组作业添加成员后再次打开，数据未保存 2016-06-14 17:36:12 +08:00
guange ada15b4212 格式上的调整, 现在可以分开写,但发布时打成一个js提高性能 2016-06-14 16:03:10 +08:00
cxt 254e1f44f6 评分设置提示的修改与提交时的判断 2016-06-14 15:44:03 +08:00
Linda 01bd394a59 门户首页按照祎欣0613版本设计修改 2016-06-14 15:08:13 +08:00
huang 5515fb660f 完成资源更新的时候 描述继承问题，并且可以修改描述 2016-06-14 14:47:02 +08:00
huang d21df48961 代码质量分析弹框及参数传入 2016-06-14 14:10:33 +08:00
cxt e7499c95c5 点击打开测验作品列表中某作品，在作品详情页面增加返回统计列表的快捷操作 2016-06-14 14:08:54 +08:00
huang c6bd5e6d31 饼状图 2016-06-14 09:57:53 +08:00
yuanke 44c9265fee 个人主页个性签名增加自动识别url 2016-06-13 15:29:15 +08:00
huang 0c25e3b13d 版本库质量分析 ssh链接 2016-06-13 15:21:29 +08:00
cxt 6c7237509d “当前作品未进行评分，是否确定提交”改为“您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？” 2016-06-13 14:08:30 +08:00
yuanke e86419c28b 组织配置里面栏目类型默认为帖子 2016-06-13 13:35:01 +08:00
cxt 3a8a61e404 在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序 2016-06-13 11:10:28 +08:00
yuanke 3a46a409a9 Merge branch 'develop' into yuanke 2016-06-13 09:46:17 +08:00
yuanke f2903ae903 新建贴吧后自动跳入该贴吧 2016-06-13 09:45:11 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
cxt 02e2831980 管理员界面的留言列表优化 2016-06-12 17:17:37 +08:00
huang d4d4e38c41 门户模式中含有三级域名的用户图像https问题 2016-06-12 16:48:35 +08:00
huang 9d3bb44682 简洁模式 2016-06-12 16:04:26 +08:00