Commit Graph

4211 Commits

Author SHA1 Message Date
cxt 099fcde246 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2017-02-24 15:20:34 +08:00
daiao 4c21ef8004 css样式添加 2017-02-24 14:54:15 +08:00
daiao a8588a5670 课程样式调整 2017-02-24 14:51:44 +08:00
cxt 3e3ad381b1 竞赛:改了提交截止日期,显示的还是提交已截止 2017-02-24 14:29:41 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
daiao 9e7ce0fd6a 实训任务样式调整 2017-02-24 09:41:15 +08:00
Linda b369b9c281 实训任务标题样式修改 2017-02-23 17:13:56 +08:00
Linda 95f06e50ff 实训任务动态标题样式修改 2017-02-23 16:01:23 +08:00
daiao b36c249a6b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:29:21 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +08:00
daiao 8bd9fc81d6 账号未激活提示页提交留言机制修改(从发送到管理员留言改到贴吧) 2017-02-23 10:09:56 +08:00
daiao fa7b15db47 注册成功提示页与账号未激活提示页,增加‘更换邮箱的功能’ 2017-02-23 09:32:13 +08:00
daiao 807129aeff 项目实训任务二级回复样式调整 2017-02-22 10:55:24 +08:00
Linda 7451838509 syllablus.css和sy.public.css简化转移到 css文件夹;修改页面中引用这两个样式的路径 2017-02-21 14:51:48 +08:00
Linda 1fb79f717c 留言界面,留言与留言直接间隔修改 2017-02-20 11:27:18 +08:00
Linda 54eb9b0bca 网站底部版权信息居中 2017-02-20 10:48:36 +08:00
Linda dae19d7be6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/projects/settings/_new_modules.html.erb
2017-02-19 15:30:38 +08:00
Linda 89dc320027 合作伙伴图片 及项目管理脚本录入界面 2017-02-19 15:28:57 +08:00
daiao 2aa025cf32 实训项目新建页面样式调整 2017-02-19 15:17:46 +08:00
cxt c3cd2ea153 班级的编程作业在新建和编辑时,需要增加输入输出样例的录入入口 2017-02-18 18:00:52 +08:00
cxt 9ef33daa39 学生列表各积分标题的tip请统一放在右侧提示区(参照班级邀请码tip) 2017-02-18 15:07:48 +08:00
cxt c1301bbd7d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-17 15:02:24 +08:00
daiao 3cad78a991 增加合作伙伴的显示 2017-02-17 10:09:10 +08:00
daiao 9af54a9288 我发布的issue列表,标题没有居中对齐,视觉上有错位 2017-02-16 14:09:15 +08:00
cxt 11eba7637f 班级头部信息展示由三行更新成两行 2017-02-14 16:29:28 +08:00
daiao 0d76162d93 Issue列表的编辑和删除按钮悬浮效果失效 2017-02-14 09:48:26 +08:00
cxt 52834f4b21 作业评分设置弹框,如图弹框不能移动导致显示不全 2017-02-13 14:49:06 +08:00
daiao 6ea90fb74f 项目里程碑,pullrequest样式调整(tab下样式边窄了) 2017-02-13 13:54:13 +08:00
cxt 3bb932d691 班级/项目资源库:设置延期发布,当移动如图时间下拉条时,整个浏览器窗口中页面移位了 2017-02-10 15:44:48 +08:00
cxt 4a0310f88c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/public.css
2017-02-10 14:37:28 +08:00
cxt e4ebd4dd2c 班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成) 2017-02-10 14:35:43 +08:00
daiao c0508fcfbe ID为2528的项目描述显示有问题 2017-02-09 11:05:51 +08:00
daiao 3e705fabb8 平台底部调整(去除底部图片,增加合作伙伴一栏) 2017-02-09 10:47:18 +08:00
cxt 61d6a6a7c3 竞赛基本信息页面的“竞赛介绍”的默认提示信息丢失了 2017-02-09 09:45:46 +08:00
cxt 18ff7deca2 超级管理员恢复竞赛要有类似于恢复成功的提示 2017-02-08 14:16:40 +08:00
cxt 0b510df8b1 班级资源的延期发布精确到小时、班级、项目资源上传弹框改版 2017-02-08 13:54:04 +08:00
daiao eb5f5f9ede 资源库:上传资源弹框使用新样式 2017-02-08 13:42:53 +08:00
daiao 0cfd2fc1ef 我发布的issue与我收到的issue页面,检索栏的icon鼠标悬浮效果不对 2017-02-07 14:47:30 +08:00
cxt f0a94302a0 编程作业答题时,测试集很长的显示默认收起,点击才展开 2017-02-07 10:35:21 +08:00
cxt 532db3dec9 参与问卷答题,提交弹框点击确定时,总是提示如下“确认导航”弹框,容易让用户误解 2017-01-20 15:00:46 +08:00
cxt 65bfaedb3a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2017-01-20 13:56:34 +08:00
daiao c12c335d8c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-20 13:45:06 +08:00
huang dd2fc230d0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-20 13:42:24 +08:00
cxt 6b9a847fe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
	public/stylesheets/css/courses.css
2017-01-20 13:39:44 +08:00
daiao c90d60e881 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
	public/stylesheets/css/public.css
2017-01-20 13:39:26 +08:00
daiao 548f4e457b 项目配置-成员翻页更新成新版样式 2017-01-20 11:13:27 +08:00
huang d13940af61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-20 10:26:28 +08:00
cxt ac80805932 班级统计功能(暂未完成) 2017-01-20 10:16:51 +08:00
huang c50266e264 开源检索按钮调整 2017-01-20 10:13:30 +08:00
daiao 6619ee9c20 开源检索功能 2017-01-20 09:52:10 +08:00