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

14934 Commits

Author SHA1 Message Date
cxt 5a22e9a147 作业启动匿评 2016-07-08 15:44:03 +08:00
cxt c224f97905 样式调整、线下作业的作品评分、导出作业成绩报500 2016-07-08 15:02:50 +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
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
daiao 87d99a1908 数据迁移 2016-07-07 15:10:08 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +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
yuanke 6fe8d7ddf5 点击图片弹框右下角统一用“关闭” 2016-07-06 16:03:50 +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 4a5bdc5e48 课程列表中的班级显示适当缩进 2016-07-05 11:01:50 +08:00
cxt f83bd3cf63 课程英文名称输入框去掉拉动图标 2016-07-05 10:52:26 +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
daiao 261f440b3d 迁移 2016-07-05 09:07:09 +08:00
yuanke da19bbd3a0 优化了下修改资料界面的代码 2016-07-05 09:02:34 +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
yuanke 87845bcfda Merge branch 'develop' into yuanke 2016-07-04 08:58:14 +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