Commit Graph

10770 Commits

Author SHA1 Message Date
yuanke 2468010125 课程、项目列表修改 2016-05-03 14:30:35 +08:00
yuanke d5805e8103 课程、项目列表不显示已删除的 2016-05-03 11:24:16 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
yuanke 789f3906a5 课程列表,列表描述内容去掉空格 2016-04-29 15:07:46 +08:00
yuanke 196501bc39 项目列表问题 2016-04-29 14:08:25 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
yuanke 2cb9f0cd05 组织还原 2016-04-28 14:31:40 +08:00
yuanke 54a8e6871c 问答区列表修改 2016-04-28 11:31:31 +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 22fc31eb82 先把隐藏课程信息的功能去掉 2016-04-28 10:39:11 +08:00
yuanke dd00533084 帖子显示三行好点 2016-04-28 10:32:32 +08:00
yuanke c729c1252d 项目、课程列表显示修改 2016-04-28 10:19:59 +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
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
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
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
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
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 8f6b116c51 作品详情打不开 2016-04-22 14:46:58 +08:00
yuanke 6191c3636d Merge branch 'yuanke' into yuanke_1
Conflicts:
	public/javascripts/homework.js
2016-04-22 14:18:30 +08:00