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

12526 Commits

Author SHA1 Message Date
huang 14e6db457b rake 2016-07-20 09:38:23 +08:00
guange 674c45f1d9 去掉上传的csrf报错 2016-07-19 17:44:27 +08:00
daiao 763ebcbf74 修复课程总学时结果，总学时=理论学时+时间学时 2016-07-19 17:39:20 +08:00
huang 0c0dfbd093 changeset关联 2016-07-19 17:38:11 +08:00
daiao 7808bb5ebe 修复非管理远用户帖子出现管理员帖子置顶的问题 2016-07-19 17:37:39 +08:00
Tim eb503cc3e8 Merge branch 'develop' into cs_optimize_txz 2016-07-19 16:50:30 +08:00
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
huang 26d4be6518 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-19 15:25:54 +08:00
huang 1a129722eb Merge branch 'rep_quality' into develop 2016-07-19 15:25:13 +08:00
huang 4e3bfd9254 some bugs for sonar show 2016-07-19 11:17:54 +08:00
yuanke ea88c92d31 测试用 2016-07-19 10:54:04 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改，我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
huang c50ca34b0e 代码质量分析部分数据转换成整型 2016-07-19 09:48:02 +08:00
huang 04fe06eff9 gitlab数据迁移 2016-07-19 09:39:47 +08:00
Tim 1fc2bbd56a 作业资源库弹框，资源名称与上传者栏增加宽度限制 2016-07-19 09:17:20 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
cxt fdf925a0b8 个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
guange 6c36ee2c28 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 16:35:55 +08:00
guange 058b1e9d69 自动加载 2016-07-18 16:34:50 +08:00
daiao 03d6afd1c4 优化上周动态获取代码 2016-07-18 15:52:04 +08:00
cxt 8e3488132b 导入作业：公共题库中显示的却是我的题库，我的题库中显示的却是公共题库 2016-07-18 14:43:47 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
yuanke ff13d2e572 微信增加作业发送，修改发送的权限，修改菜单 2016-07-18 14:24:59 +08:00
cxt 9e5e7a75b0 编程作业关闭匿评后，老师点击模拟答题，却弹出匿评提示 2016-07-18 14:09:41 +08:00
huang 412d74e295 优化最近动态获取方法 2016-07-18 13:57:00 +08:00
huang 5c046f922e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-18 11:25:57 +08:00
huang 097374df14 去掉全局变量，通过filter获取 2016-07-18 11:25:45 +08:00
cxt a9ee1d10cd 新增班级成员的消息通知，跳转至该班级的成员配置页面 2016-07-18 11:19:56 +08:00
huang 3198f8a473 解决版本库提交记录中：上传图片或者非可以预览文件 显示详情500问题 2016-07-18 11:17:22 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
yuanke 8968c991ff 微信：作业增加发送功能 2016-07-18 11:08:02 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
guange c14979d878 assets 2016-07-15 19:53:38 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
yuanke 596bfe4bfc 邀请码分享问题修改 2016-07-15 19:08:05 +08:00
guange 82aa369687 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 18:11:01 +08:00
guange c02245adfb 邀请码分享 2016-07-15 18:08:19 +08:00
yuanke ba1af901ad 强制更新myresource.js 2016-07-15 17:39:21 +08:00
cxt 48e5a0be7e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 17:38:56 +08:00
cxt fcc8a08138 课程列表的样式问题 2016-07-15 17:38:10 +08:00
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
huang 2af3c50dbc 里程碑区分issue状态“已解决”“已关闭” 对应不同样式 2016-07-15 16:43:07 +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
yuanke 9b17724ebf Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:08:42 +08:00
yuanke c476dae15b 微信我的资源中 更多按钮暂时隐藏 2016-07-15 16:08:04 +08:00
cxt dbc8f87346 Merge branch 'yuanke' into develop 2016-07-15 15:56:37 +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 e260c0b7cc Merge branch 'cxt_course' into develop 2016-07-15 15:49:27 +08:00
cxt 05fe987a8b 新手注册三条留言 2016-07-15 15:43:35 +08:00
cxt 11e0101f56 导航栏题库中 我的题库放在前面 2016-07-15 15:06:33 +08:00
guange fff6f4b310 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 14:50:21 +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
yuanke b540ff7017 我的资源里增加更多按钮 2016-07-15 14:44:37 +08:00
huang 4e3a7e8df1 新建版本“日期”--》“截止日止” 2016-07-15 14:11:51 +08:00
huang 77e4a66e7e 模式切换刷新后引起的样式问题 2016-07-15 13:50:15 +08:00
huang 38cc3c2010 发送过来的资源在项目中添加动态 2016-07-15 11:31:31 +08:00
cxt fd68479d72 课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级 2016-07-15 11:02:53 +08:00
huang 97b1ea22e7 解决：Firefox浏览器中：资源库，先点击资源描述编辑图标按钮（笔），再点击页面空白处，如图两个资源之间有一段空白 2016-07-15 10:51:44 +08:00
yuanke dc2ba96353 用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级 2016-07-15 10:26:37 +08:00
cxt 7ea5d7d934 新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
yuanke 4be95cd9c5 班级内作业课件测验等增加排序 2016-07-15 09:52:57 +08:00
Tim 2d1d3083d0 引入project.css 2016-07-15 09:51:14 +08:00
yuanke b8c8b2c4ae 修改加入班级的提示 2016-07-15 09:48:10 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
yuanke 4c39dcc677 微信：修改班级下有挂起作业所有作业都不显示的BUG，将班级下作业、测验发送按钮屏蔽 2016-07-14 17:39:22 +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
yuanke c524409e4a 修改进入某个班级报错的BUG 2016-07-14 17:15:49 +08:00
Tim c41a116378 博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改 2016-07-14 17:00:38 +08:00
yuanke 9c560e56b6 微信修改 不能直接给数据库对象增加新属性 2016-07-14 16:54:43 +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
yuanke 5bd404322b 修改微信消息通知详情地址 2016-07-14 11:28:28 +08:00
yuanke c2fadc54ef 微信消息通知点击跳转页面修改 2016-07-14 11:16:45 +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
yuanke 1e8f496718 代码查重结果 不显示未提交的作品 2016-07-14 10:06:37 +08:00
daiao dcc37ef847 增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件 2016-07-13 16:58:31 +08:00
yuanke 15ccf5cfbe Merge branch 'yuanke' into develop 2016-07-13 15:56:44 +08:00
yuanke 3ffb909e15 修改发送创建班级的通知消息 2016-07-13 15:54:58 +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
yuanke b4ac13c157 修改编程作业没main函数系统评分100的BUG 2016-07-13 09:36:43 +08:00
cxt 16cf8a56a1 管理员和老师可看到课程下的所有班级 2016-07-13 09:34:36 +08:00
yuanke f63df877db 将未命名课程去掉 2016-07-13 08:44:20 +08:00
huang 191261d3b8 each time to 10s 2016-07-12 17:30:29 +08:00
yuanke 4a7fb0e0b5 点击查看班级详情跳入班级信息页面 2016-07-12 17:08:16 +08:00
yuanke 824f9d9174 新增创建班级的模版消息 2016-07-12 17:00:01 +08:00
guange 4908a68a7d 时间utc问题 2016-07-12 16:49:15 +08:00
Tim 73b7b00db9 班级学生列表导航栏下拉框错位调整 2016-07-12 16:45:04 +08:00
guange ae3212082c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-12 16:35:15 +08:00
guange 8df0dcae7a 调用编辑接口不成功时，打印具体的信息 2016-07-12 16:35:06 +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
yuanke d75e2b740f 微信点击我的课程里面的两个按钮时没绑定会提示绑定 2016-07-12 15:51:58 +08:00
daiao 304f18ac5e 修复课程中，对动态进行筛选的页面呈现方式 2016-07-12 15:05:42 +08:00
cxt 955c258856 复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程 2016-07-12 10:35:52 +08:00
yuanke d4681eea00 我的资源里面显示来源 和大小 并可以下载课件 2016-07-12 10:25:18 +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 d71e10c8ac Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-11 15:16:04 +08:00
cxt 0b4db97756 班级动态 2016-07-11 15:15:38 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
yuanke 374aa9918c 我的资源里面都显示未发布的，新建课程后返回会刷新数据 2016-07-11 14:49:59 +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
huang cb148c3b9c fixed 500 2016-07-11 10:48:44 +08:00
daiao 670b443cc4 Merge branch 'develop' into daiao_dev 2016-07-11 10:38:46 +08:00
guange 99a27766be . 2016-07-09 10:34:05 +08:00
guange 09a97fc9d8 . 2016-07-09 10:23:49 +08:00
guange 8279d9385c 区分是课程邀请，还是意见反馈 2016-07-09 10:13:05 +08:00
guange f5b4bc3e43 merge 2016-07-09 09:23:19 +08:00
guange 2a2fe9e81d 解决android缓存问题 2016-07-09 09:22:41 +08:00
huang 817eaf318a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 21:30:36 +08:00
huang f77bad34ad 缩短时间 2016-07-08 21:29:47 +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 1a15c0f567 新建班级发布作业报500 2016-07-08 19:25:26 +08:00
cxt d25f401afa 管理员界面修改班级名称 2016-07-08 19:16:53 +08:00
yuanke 5ccde8e433 修改课程列表显示不对的BUG 2016-07-08 18:52:21 +08:00
yuanke 189e641d23 课程列表改下 2016-07-08 18:32:30 +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
yuanke 1df1368214 修改课程名修改无效的BUG 2016-07-08 18:12:22 +08:00
yuanke cce503f32f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 18:08:55 +08:00
yuanke f1f61c304a 修改课程列表显示有误的问题 2016-07-08 18:08:31 +08:00
guange 1413fe82dc merge 2016-07-08 17:44:13 +08:00
yuanke c2166811eb 修改管理课程界面刷新显示问题 2016-07-08 17:35:14 +08:00
yuanke c6099177a4 修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等 2016-07-08 17:22:58 +08:00
guange 5c0468f8fd 二维码过期改为一个月有效期 2016-07-08 17:18:09 +08:00
guange 3c36e97ff1 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:11:41 +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
yuanke 3a2e2c1174 未命名课程暂不允许进行课程管理 2016-07-08 16:40:24 +08:00
yuanke bb62ba40b7 修改微信权限问题、管理课程界面等 2016-07-08 16:23:07 +08:00
huang 5a40174910 change show data's method 2016-07-08 16:19:33 +08:00
cxt 5a22e9a147 作业启动匿评 2016-07-08 15:44:03 +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
yuanke 9eee510649 新建课程时创建的班级设为私有 2016-07-06 16:23:12 +08:00
huang 2f8079e85c 版本 库存 2016-07-06 16:07:17 +08:00
Tim b6716e542a wiki编辑页面更新 2016-07-06 15:59:49 +08:00
yuanke 796c5d5666 修改课程列表还显示已删除班级的BUG 2016-07-06 15:58:10 +08:00
Tim 0b764d0dfc RSide样式处理 2016-07-06 15:52:18 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +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
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 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