Commit Graph

9742 Commits

Author SHA1 Message Date
cxt 313bc8573d 首页访问计数失效 2016-08-29 14:01:40 +08:00
cxt cdffaed1ea 班级主页设置班级为公开私有时刷新资源库页面 2016-08-26 15:11:57 +08:00
cxt eb20ca4ffe 新建班级时班级名称实例要加上课程名称 2016-08-26 14:56:29 +08:00
cxt 0d05d04d2c 头像编辑的样式调整 2016-08-26 14:44:32 +08:00
cxt 62e28f638c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/layouts/new_base_user.html.erb
2016-08-26 14:33:18 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
Tim a8f30fe85f 个人主页,课程,项目头像、logo增加编辑按钮 2016-08-26 11:31:54 +08:00
cxt f4b5a5cf4e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-26 09:23:33 +08:00
Tim fbad4ecd8a 班级页面logo及行间距调整;测导航数字大小背景调整 2016-08-25 17:52:19 +08:00
cxt cb5e5f18ce Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:59:15 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
Tim 27678d09f6 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:55:49 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +08:00
cxt d8117f9576 作品列表页面中分组作业关联项目的综合评分应与项目首页的评分一致 2016-08-25 15:43:11 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
cxt 6af43070c7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-24 13:56:53 +08:00
Tim bb2b51aa8d 收藏按钮增加title 2016-08-24 10:30:20 +08:00
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
cxt 74b15229fb at所有人 2016-08-23 17:15:51 +08:00
cxt 06361246c7 作品列表中的已提交人数无法自动刷新 2016-08-22 15:24:12 +08:00
cxt 572ad5a162 个人主页的课程和项目展开出现重复数据 2016-08-22 10:49:46 +08:00
huang ea3ba1f71e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-14 11:30:54 +08:00
huang 577aa40ea1 time for nil 2016-08-14 11:27:49 +08:00
huang 7c28f97208 get quality analisys update time 2016-08-14 10:45:01 +08:00
huang ff592c106e sonar最新触发时间获取 2016-08-14 10:29:52 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop
Conflicts:
	db/schema.rb
2016-08-14 09:56:17 +08:00
huang 1f4f03d8ed 修改项目列表中的资源链接 2016-08-13 17:31:09 +08:00
cxt a4a0ef139b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 17:04:16 +08:00
cxt 1374444ec1 左侧项目列表的展开 2016-08-13 17:04:09 +08:00
huang 3ce088002a 留言和已关闭流程修改 2016-08-13 16:53:56 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
cxt 35260f2f6d Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-08-13 15:36:48 +08:00
cxt f4e965c9fb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-13 15:35:10 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
huang 9003040d6a 版本库获取动态API修改 2016-08-13 14:42:24 +08:00
huang 93f8ac31f1 项目资源库新分页及ajax刷新 2016-08-13 14:17:50 +08:00
huang 00f032816c 版本库获取方式修改 2016-08-13 13:48:23 +08:00
guange a761bfe3f8 . 2016-08-13 11:37:37 +08:00
huang 37df983009 项目列表 2016-08-13 11:13:11 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
huang ce9c2d3d06 搜索的时候分页刷新 2016-08-12 17:25:20 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
huang 047eea125d 课程资源分页及局部刷新 2016-08-12 17:05:46 +08:00
huang 7efc8ccac6 新建项目,增加项目名称输入例 2016-08-12 14:11:15 +08:00
yuanke 24a0bfea77 分享修改 2016-08-12 12:05:14 +08:00
yuanke 3a000a360a appid 修改 2016-08-11 17:30:06 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定,然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00