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

11260 Commits

Author SHA1 Message Date
Tim 51ff1b0aa6 滚动栏效果调整 2016-05-04 15:43:46 +08:00
guange e8adcf8cc7 添加sso model 2016-05-04 15:40:18 +08:00
huang a691fb7eb7 添加或者取消提交时候弹框自动消失 2016-05-04 15:19:26 +08:00
huang 65a907bc99 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 15:06:20 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Linda cbec7cc8f8 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-05-04 14:41:54 +08:00
Linda 0fc142d822 组织配置logo样式 2016-05-04 14:40:25 +08:00
Tim 80ff421853 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-05-04 14:09:20 +08:00
Tim 714deebe21 二级导航调整 2016-05-04 14:08:57 +08:00
guange 0635c1e98b 添加单点登录controller 2016-05-04 14:05:46 +08:00
huang efb91abfb0 分页不跳转问题 2016-05-04 14:03:18 +08:00
huang c0acaab404 首页logo上传图片 2016-05-04 13:55:27 +08:00
huang f8ba77dc20 banner点击添加图片 2016-05-04 11:32:11 +08:00
huang daa154db02 鼠标经过字母录显示结构 2016-05-04 11:16:25 +08:00
cxt 467af47386 私有题库的作业详情页面不显示 2016-05-04 11:13:52 +08:00
huang 578982faba subdomain 404跳转 2016-05-04 11:08:16 +08:00
huang 7fbf6f4011 模式二帖子列表添加分页 2016-05-04 11:04:41 +08:00
yuanke 411ae6f89e 1.修改贴吧分页显示问题2列表优化 2016-05-04 11:03:08 +08:00
cxt ff160ff793 题库的申请改为绿色按钮 2016-05-04 10:15:22 +08:00
huang fd543828ac Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/controllers/sub_document_comments_controller.rb
	app/views/sub_document_comments/_show_newstyle.html.erb
	app/views/sub_document_comments/show.html.erb
 2016-05-04 09:46:26 +08:00
huang 557e731343 模式二添加回复功能，模式一回复超过三行则隐藏 2016-05-04 09:45:02 +08:00
Tim 765d52a2ce 详情页面格式调整 2016-05-04 09:40:20 +08:00
cxt 70910c5238 “我的作业”中不应出现已删除课程的作业 2016-05-04 09:40:18 +08:00
Tim 399f757811 0 2016-05-04 09:01:51 +08:00
huang 39dd62580a 完成2级目录详情页面 2016-05-03 20:08:40 +08:00
huang a9059c4c2e 帖子添加编辑删除功能 2016-05-03 19:32:38 +08:00
yuanke afd176b805 课程项目按更新时间排序 2016-05-03 19:10:04 +08:00
huang 48002eb247 二级目录讨论区添加帖子回复功能 2016-05-03 19:03:28 +08:00
huang d212d4f4c5 Merge branch 'cxt_course' into develop 2016-05-03 18:17:54 +08:00
huang 4489bc13d7 课程列表按创建时间排序 2016-05-03 18:17:03 +08:00
cxt 407af62654 作业动态的分数显示 2016-05-03 18:06:53 +08:00
yuanke 8b672cc7c3 项目、课程列表增加更新时间 2016-05-03 17:57:24 +08:00
cxt bcb02e49d3 课程问答区的名片显示 2016-05-03 17:23:56 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
huang 8446fbe39a Merge branch 'weixin_guange' into develop 
Conflicts:
	app/services/wechat_service.rb
	public/stylesheets/weui/weixin.css
 2016-05-03 17:14:58 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_message.html.erb
 2016-05-03 17:12:38 +08:00
cxt ada4407e63 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
huang 0e46d0ac27 二级域名中帖子回复功能 2016-05-03 17:11:08 +08:00
huang 5fb5a2e8bc 二级域名帖子列表两种形式区分 2016-05-03 16:49:13 +08:00
yuanke 96e7c9d134 新闻排序时间改为更新时间 2016-05-03 16:34:31 +08:00
cxt 55297a9daf 统一作业动态中项目的更新时间与tip中的更新时间 2016-05-03 15:19:22 +08:00
cxt c49627913b 更改评分设置中的教师优先，评分未更新 2016-05-03 15:12:56 +08:00
huang 6635ded1e8 组织base中添加二级域名 2016-05-03 14:55:08 +08:00
yuanke 2468010125 课程、项目列表修改 2016-05-03 14:30:35 +08:00
cxt 8ccedaa622 通知详情添加点赞 2016-05-03 14:13:01 +08:00
cxt 14a539bd0a 样式冲突 2016-05-03 11:40:24 +08:00
huang 517db8f105 组织二级域名弹框 2016-05-03 11:24:39 +08:00
yuanke d5805e8103 课程、项目列表不显示已删除的 2016-05-03 11:24:16 +08:00
cxt 151661830f 微信模板消息的样式 2016-05-03 11:03:34 +08:00
cxt 6b1137980e 挂起的作业编辑截止日期后报500 2016-05-03 10:58:49 +08:00
cxt 39c2365338 已拒绝的私有作业不可引用 2016-05-03 10:15:09 +08:00
cxt 3f7a391214 课程和项目的排序 2016-04-29 20:45:14 +08:00
cxt 1cad1626e0 解决冲突 2016-04-29 20:31:31 +08:00
cxt 2ca77d26b6 作业列表报500 2016-04-29 19:49:09 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
cxt 0bb6d42c80 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-29 19:22:08 +08:00
cxt a9cb556a20 题库的切换报500 2016-04-29 19:21:54 +08:00
cxt b0988dc950 Merge branch 'cxt_course' into develop 2016-04-29 17:57:32 +08:00
cxt 389b75f7ab 申请引用私有作业时发送消息 2016-04-29 17:55:57 +08:00
huang 14335d5da3 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
 2016-04-29 17:14:12 +08:00
huang 90a285b35e base中添加二级目录 2016-04-29 17:13:09 +08:00
Tim 56a4a64d09 北斗详情翻页更改；位置超出省略号 2016-04-29 17:09:15 +08:00
cxt 8f3b9ae9fe 动态的？ 2016-04-29 16:54:48 +08:00
cxt c2d60b8958 教师优先的迟交扣分和缺评扣分 2016-04-29 16:38:26 +08:00
huang 253189ea7a 帖子列表中添加分页 2016-04-29 16:33:10 +08:00
cxt 7445c64e46 课程和项目的帖子详情页面添加点赞 2016-04-29 16:23:36 +08:00
huang 0bd34c2099 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
 2016-04-29 16:15:10 +08:00
huang f6c3e89454 二级目录帖子详细页面 2016-04-29 16:14:08 +08:00
cxt 341927506a Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-04-29 15:58:05 +08:00
cxt 26c6c1d915 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-29 15:57:42 +08:00
cxt 1dc0f9dd95 主页的项目和课程排序 2016-04-29 15:55:29 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
cxt 53bf0dcd7a 题库加入所有私有作业、并可通过提交申请来导入私有作业 2016-04-29 15:46:26 +08:00
Tim 388c059047 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 15:38:53 +08:00
Tim 5f1b335cfb 北斗二级菜单显隐 2016-04-29 15:38:38 +08:00
yuanke 789f3906a5 课程列表，列表描述内容去掉空格 2016-04-29 15:07:46 +08:00
huang 2b4f16e5f1 二级目录新界面的帖子列表页面 2016-04-29 14:46:40 +08:00
yuanke 196501bc39 项目列表问题 2016-04-29 14:08:25 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
huang 44f0615763 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-29 11:34:24 +08:00
huang d8480ea3c6 二级目录内容页面 2016-04-29 11:33:56 +08:00
Tim ebe6004833 组织二级目录添加列表 2016-04-29 10:53:04 +08:00
huang 1685449381 二级目录框架及结构 2016-04-28 17:36:29 +08:00
yuanke f185c59e90 Merge branch 'yuanke' into develop 2016-04-28 14:33:30 +08:00
yuanke 2cb9f0cd05 组织还原 2016-04-28 14:31:40 +08:00
yuanke b3fdc45a04 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 12:38:06 +08:00
yuanke 54a8e6871c 问答区列表修改 2016-04-28 11:31:31 +08:00
Tim 5c795b92ee 图片百分百显示； 默认大图尺寸调整 2016-04-28 11:12:44 +08:00
huang 4635c04798 关注添加次数 2016-04-28 10:57:45 +08:00
yuanke dc53b86a4e Merge branch 'cxt_course' into yuanke 
Conflicts:
	app/controllers/student_work_controller.rb
	db/schema.rb
 2016-04-28 10:49:05 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang b8f7a6a300 500问题 2016-04-28 10:43:42 +08:00
yuanke 22fc31eb82 先把隐藏课程信息的功能去掉 2016-04-28 10:39:11 +08:00
yuanke dd00533084 帖子显示三行好点 2016-04-28 10:32:32 +08:00
huang 7aaa13ca1a 左一只取一个 2016-04-28 10:26:41 +08:00
huang ae8bb8e83b Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-28 10:25:42 +08:00
huang b596c0d66f 二级目录的创建等 2016-04-28 10:25:26 +08:00
huang e48189ae97 项目获取数 2016-04-28 10:24:53 +08:00
yuanke c729c1252d 项目、课程列表显示修改 2016-04-28 10:19:59 +08:00
Tim 6b02acb329 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-28 10:18:22 +08:00
Tim 024667d035 title多行实现省略号效果，默认页面不对齐显示问题，高度控制，标题单行省略显示等 2016-04-28 10:17:59 +08:00
huang 002d0c18ba Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-27 17:03:25 +08:00
huang 9fbf713709 完成组织二级域名 2016-04-27 17:02:44 +08:00
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 698dfdab4a 组织点赞不能用 2016-04-27 16:25:17 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
yuanke c357971e8a 课程列表、项目列表等修改 2016-04-27 16:02:52 +08:00
Tim 5d7c8c0b61 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-04-27 15:18:50 +08:00
Tim 5d44dc5bba 滚动栏js效果修改 2016-04-27 15:16:23 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
yuanke dac717bd97 列表左边菜单收缩 2016-04-27 14:12:56 +08:00
huang 811c3a065e 完成左中一模块定制 2016-04-27 14:09:15 +08:00
huang ddf1e6f2db 组织模式3完成 2016-04-27 11:29:01 +08:00
huang 70fa3fddfd Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-27 10:41:15 +08:00
huang cded1802cc 右上模块定制完成 2016-04-27 10:41:05 +08:00
cxt 78c7db1150 Merge branch 'weixin_guange' into develop 2016-04-27 10:36:24 +08:00
cxt 0222038899 缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息 2016-04-27 10:28:36 +08:00
yuanke aabb969588 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-27 10:03:15 +08:00
yuanke 51245d44fa 编程作业未发布是 由于代码查重按钮的原因导致布局问题。 2016-04-27 10:02:43 +08:00
Tim c9cc4739aa 北斗组织微信块调整 2016-04-27 09:57:41 +08:00
yuanke 23f48b7189 项目列表、项目讨论区列表 2016-04-27 09:54:49 +08:00
huang b6f5bfc450 右下版本模块定制 2016-04-27 09:45:56 +08:00
Tim c8dde5565e Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/views/layouts/base_org2.html.erb
 2016-04-27 09:38:29 +08:00
Tim b8d6ca0229 北斗组织门户样式更改 2016-04-27 09:36:54 +08:00
huang b589d5b2ff 末班六定配完成 2016-04-26 18:27:01 +08:00
huang 17b2e82963 banner类型 2016-04-26 16:23:08 +08:00
Tim 86751e31fb 题库加入私有课程题目，可申请使用 2016-04-26 15:35:42 +08:00
yuanke 43c1120b19 课程问答区 项目讨论区列表 2016-04-26 15:10:47 +08:00
huang 32d7927eb9 组织新界面 2016-04-26 11:06:18 +08:00
huang 76f93a54c6 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	app/helpers/organizations_helper.rb
	app/views/layouts/base_org2.html.erb
	app/views/organizations/_org_content.html.erb
 2016-04-26 11:03:21 +08:00
huang d8f71da1fb 完成模块8配置 2016-04-26 11:01:12 +08:00
Tim 9ba0d50f26 拉代码更新 2016-04-26 10:16:23 +08:00
Tim 53e6b41d93 北斗登录效果调整 2016-04-26 10:02:16 +08:00
cxt 49a7e2ce1d 关注和绑定登录后发送欢迎消息 2016-04-26 09:03:01 +08:00
guange 98f84bb0ab Merge remote-tracking branch 'origin/develop' into guange_dev 2016-04-25 21:22:28 +08:00
huang 255d7e07bc 北斗新界面样式 2016-04-25 18:54:21 +08:00
huang dae6a5ecae 配置八种类型更新 2016-04-25 16:00:52 +08:00
huang 81210fd475 顶部导航及样式 2016-04-25 15:35:32 +08:00
huang 5b763927cc 顶部用户路由 2016-04-25 14:14:26 +08:00
yuanke bb80cad1e3 Merge branch 'yuanke' into yuanke_1 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-25 14:03:27 +08:00
cxt 3382355086 conflicts 2016-04-25 11:15:44 +08:00
cxt 9a6ea9757d 微信模板消息的颜色、去掉模板消息的最后一行 2016-04-25 11:12:34 +08:00
yuanke 639749f02b 修改作业未发布时 加了代码查重按钮 显示错乱的问题. 2016-04-25 11:00:56 +08:00
yuanke d34b3780c8 课程列表修改 2016-04-25 10:44:46 +08:00
huang c1437bb75b 北斗界面 2016-04-24 14:39:33 +08:00
yuanke f6d09e0554 配置中增加一个 隐藏课程信息的功能 2016-04-24 14:23:08 +08:00
guange 2c23b88998 boards#index性能优化 2016-04-24 12:48:03 +08:00
yuanke c8eaf293e7 课程列表 2016-04-24 10:49:33 +08:00
yuanke 81cd30cbda Merge branch 'cxt_course' into yuanke_1 
Conflicts:
	db/schema.rb
 2016-04-23 13:22:28 +08:00
yuanke a4d250e168 博客列表 2016-04-23 13:20:49 +08:00
cxt 379859db67 评分设置 2016-04-22 17:33:49 +08:00
cxt 1d1a44f85f Merge branch 'cxt_course' into develop 2016-04-22 16:33:57 +08:00
cxt 5695bcdda9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-22 16:33:04 +08:00
cxt e2b18b3f48 作业编辑报500 2016-04-22 16:32:59 +08:00
cxt 8f6b116c51 作品详情打不开 2016-04-22 14:46:58 +08:00
huang eb0e88d805 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-22 14:21:07 +08:00
yuanke 6191c3636d Merge branch 'yuanke' into yuanke_1 
Conflicts:
	public/javascripts/homework.js
 2016-04-22 14:18:30 +08:00
yuanke f503969702 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-22 14:16:26 +08:00
huang a985f6fee1 新建帖子/回帖不发送消息 2016-04-22 14:14:21 +08:00
yuanke 016177a078 Merge branch 'yuanke' into develop 2016-04-22 14:14:15 +08:00
yuanke f6a5ffc6a5 测试代码的时候点击一下然后按钮消失等结果返回才出现 2016-04-22 14:13:24 +08:00
yuanke 5c5d212193 博客列表 2016-04-22 13:52:33 +08:00
huang 17b5832df0 Merge branch 'hjq_beidou' into develop 2016-04-22 12:45:05 +08:00
huang c4bd78e442 讨论区代码还原及优化 2016-04-22 12:44:37 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 7673fc41fb 作品列表页面增加提交作品的入口 2016-04-22 12:37:13 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
huang aaeec3ab6c 版本库show页面代码简化封装 2016-04-22 10:58:41 +08:00
huang e23262225a 版本库名不能是全数字 2016-04-22 10:34:45 +08:00
cxt 4448cb0891 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 17:02:04 +08:00
cxt 3fe2e81c0e 作业评分设置时比例NAN 2016-04-21 17:01:57 +08:00
cxt 16348654a5 启用匿评和禁用匿评时修改评分设置 2016-04-21 17:00:30 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
huang ab8c1a0bad Merge branch 'hjq_beidou' into develop 2016-04-21 16:21:39 +08:00
yuanke eddea2eabd Merge branch 'yuanke' into yuanke_1 2016-04-21 14:01:54 +08:00
huang 42076a137d 项目统计添加判断 2016-04-21 11:19:21 +08:00
yuanke 5a5afd6d24 Merge branch 'yuanke' into develop 2016-04-21 11:17:30 +08:00
yuanke d538d1967b 解决管理员界面代码测试列表404的问题 2016-04-21 11:16:32 +08:00
cxt 7a90c0ea10 评分设置修改多项时不应发多条模板消息 2016-04-21 10:51:43 +08:00
huang ba171c49cc 统计 改成 代码统计 2016-04-21 10:42:06 +08:00
huang e8048f8eb7 完成版本库时间UTC与北京时间的转换 
时间国际化问题
 2016-04-21 10:09:52 +08:00
yuanke 85055f2a84 博客列表修改 2016-04-21 09:39:21 +08:00
huang 449bdf2225 完成版本库统计功能 2016-04-20 16:40:44 +08:00
yuanke 8f62cccfd6 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 16:14:26 +08:00
yuanke ff177557c8 修改代码测试列表报500 2016-04-20 16:13:06 +08:00
yuanke 29115bca3a 博客列表修改 2016-04-20 16:12:20 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt aed3818273 点击模板消息跳到微信详情页面 2016-04-20 14:44:10 +08:00
yuanke 4182bb5fe7 111 2016-04-20 14:39:38 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
yuanke c6174406fb 数据库语句使用rails已有的 2016-04-20 10:39:07 +08:00
yuanke dc3837da76 Merge branch 'cxt_course' into yuanke 
Conflicts:
	db/schema.rb
 2016-04-20 09:59:37 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop 
Conflicts:
	db/schema.rb
 2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改 
2.代码查重按钮位置
3.查重结果样式
 2016-04-20 09:51:51 +08:00
huang 4e4cb309a9 版本库目录最新动态 2016-04-19 15:03:47 +08:00
cxt 87619f4078 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-19 13:03:22 +08:00
cxt 1ded6ddf04 学生无法编辑已提交的编程作品 2016-04-19 13:03:12 +08:00
huang b1f47fe120 历史版本不能删除问题 2016-04-19 11:19:29 +08:00
huang 43f5f821d5 组织未登录用户不显示设置按钮 2016-04-19 11:10:58 +08:00