Commit Graph

2051 Commits

Author SHA1 Message Date
daiao 63bad2383b 首页左侧导航栏课程,项目,我发布的issue等数字样式调整 2016-12-21 11:03:38 +08:00
daiao 80657e4ee7 顶部导航栏的各个入口,点击打开新的页面 2016-12-21 10:38:02 +08:00
daiao d92f4ee6c6 贴吧个模块的具体帖子显示的贴吧标题,加入链接,点击进入具体的贴吧 2016-12-20 17:17:38 +08:00
huang 3bf6c35d0e 我(Ta)的主页 课程、项目链接修改 2016-12-19 11:33:14 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误,新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
cxt fc67e6e3be Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/_anonymous_evaluation_list.html.erb
2016-12-17 10:25:48 +08:00
cxt d6c51cce2a 首页:如图关注列表中添加关注、取消关注后关注数统计未自动刷新 2016-12-17 10:20:08 +08:00
daiao b76dd30b6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 10:17:34 +08:00
daiao 882ceb6a63 个人主页样式调整 2016-12-17 10:12:56 +08:00
cxt d876962f05 课程社区和项目社区的左侧列表无法收回 2016-12-17 09:53:23 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop'
个人主页功能

个人主页功能

See merge request !67
2016-12-16 20:57:21 +08:00
daiao 0c8774416e 个人主页样式调整 2016-12-16 20:50:48 +08:00
cxt d8f098c6f4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/_user_message_course.html.erb
2016-12-16 16:56:21 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00
cxt 23e1f2b3bd 作业匿评期间,小铃铛消息、作业动态以及作品详情的回复显示,暴露了评阅人或匿评对象的信息 2016-12-14 13:37:52 +08:00
daiao 54687793ec 铃铛样式重新排版 2016-12-13 17:22:30 +08:00
cxt ec476cbd74 班级头部的调整 2016-12-13 16:16:32 +08:00
daiao fb62d4f1b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/project.css
2016-12-09 20:00:07 +08:00
daiao 92bc7aa813 个人首页的7个tab 2016-12-09 19:32:00 +08:00
cxt b0559788db 班级作业的左侧“班级活跃度”、“班级英雄榜”“班级推荐”修改文字 2016-12-09 10:12:05 +08:00
cxt abdbfd87b0 班级的邀请码增加“停用”和“启用”功能,停用的邀请码不允许用户主动加入班级 2016-12-08 13:40:11 +08:00
daiao 224c0b686c 个人首页的课程社区 2016-12-08 09:59:22 +08:00
cxt 9a830fc907 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop
Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/new_base_user.html.erb
2016-12-07 15:21:25 +08:00
cxt 27d800a94a 新版首页架构 2016-12-07 15:15:00 +08:00
daiao 69d9228808 个人主页的消息页面 2016-12-07 15:13:51 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
daiao 35fdf9a8a7 个人首页头部及其左侧导航(未完) 2016-12-06 09:36:13 +08:00
cxt fced64cc96 点击子域名申请消息报404 2016-11-29 16:22:58 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
daiao c640535cca 项目头部样式调整 2016-11-25 17:39:55 +08:00
huang 636721699e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 15:16:09 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
daiao bff5a36577 pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果 2016-11-25 11:32:45 +08:00
cxt eeacd76aa9 首页班级列表的归档 2016-11-22 10:27:56 +08:00
yuanke 6cb711d66b Merge branch 'develop' into yuanke_youhua 2016-11-21 10:14:08 +08:00
yuanke 14552abd56 博客人气排序修改,个人主页关注BUG修改 2016-11-21 10:08:27 +08:00
cxt 94c4afd6de 样式调整 2016-11-18 20:11:32 +08:00
huang b1b456e63e 项目标题去掉姓名,单词不换行 2016-11-18 16:57:45 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
2016-11-18 15:48:40 +08:00
daiao cd32353d91 Merge branch 'dai_ao' into develop 2016-11-18 15:45:35 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
daiao d45b1c7d4c 我的issue 2016-11-15 14:03:57 +08:00
yuanke 5134418388 Merge branch 'yuanke_youhua' into develop 2016-11-14 15:14:05 +08:00
yuanke 5fd00ae472 关注官方微信改为关注微信APP 2016-11-14 10:35:40 +08:00
huang 561c96b485 用户图像下拉列表中我的课程、组织链接改成登录名 2016-11-11 18:02:17 +08:00
huang bb871b5a77 个人主页 博客 粉丝 关注url的id改成登录名 2016-11-11 17:57:31 +08:00