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

12273 Commits

Author SHA1 Message Date
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
yuanke 9eee510649 新建课程时创建的班级设为私有 2016-07-06 16:23:12 +08:00
huang 2f8079e85c 版本 库存 2016-07-06 16:07:17 +08:00
yuanke 796c5d5666 修改课程列表还显示已删除班级的BUG 2016-07-06 15:58:10 +08:00
yuanke b994e786ab 我的动态中三类动态之间切换的效果 2016-07-06 11:06:32 +08:00
daiao db3056f1b1 隐藏班级列别的创建时间和创建名称！ 2016-07-06 09:22:20 +08:00
daiao ad36a1b29e 修复课程下编辑框英文换行缺陷 2016-07-06 09:07:50 +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 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 373e3d3422 merge 2016-07-04 17:06:26 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
yuanke 9d0b5789d9 1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改 2016-07-04 16:50:49 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +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 61b5a100eb delete log messages 2016-07-01 20:25:58 +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
txz 8cc4b7a878 public questions 2016-07-01 20:00:23 +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
cxt 0e2e1b09b5 title修改 2016-07-01 17:51:01 +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
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 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 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 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
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 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 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
huang 0a684227b8 如果sonar没扫描完成则暂时不读取数据 2016-06-28 22:01:44 +08:00
guange 222855ea79 越过course表的validate,以防save invitecode 失败 2016-06-28 19:19:59 +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
guange 3c425edc3c 修复邀请码会变的问题 2016-06-28 17:46:27 +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 cbe34ea0a7 分组作业提交作品时关联成员列表为空 2016-06-28 15:57:56 +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 436de8ce5a 优先取env中的wechat url 2016-06-28 11:33:54 +08:00
guange 57cdc1d5ec 协议修改 2016-06-28 11:30:06 +08:00
guange 047903ddff 重构课程地址 2016-06-28 10:57:58 +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 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
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +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
Your Name 69f7dab04d some modified 2016-06-24 21:33:35 +08:00
huang 012eae9b93 gems 2016-06-24 19:54:01 +08:00
huang 01bedc4bc2 编码问题 2016-06-24 19:40:06 +08:00
huang 4a4c613c55 utf-8编码 2016-06-24 19:38:08 +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 b5c9156c10 加入课程报403 2016-06-24 18:43:12 +08:00
cxt 0d66763026 迟交扣分 2016-06-24 18:23:00 +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
guange 7df9fe7d60 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-24 17:37:11 +08:00
guange b5bfe40693 . 2016-06-24 17:35:55 +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
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 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
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 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
guange 657e506071 . 2016-06-24 15:45:50 +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
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
guange 7e2482167d . 2016-06-24 15:31:45 +08:00
guange 16a9f017b6 error 2016-06-24 15:28:44 +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
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 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
yuanke 64d87b7398 修改组织添加成员的BUG 2016-06-24 13:50:28 +08:00
guange d348981721 加入邀请码 2016-06-24 13:29:36 +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
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +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