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

4260 Commits

Author SHA1 Message Date
daiao 6a9684937e Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-21 12:38:21 +08:00
daiao d7d47629ce Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 
Conflicts:
	app/views/games/_tree.html.erb
 2017-03-21 12:38:04 +08:00
huang 63d12a7b36 版本库border 2017-03-21 12:36:20 +08:00
daiao 966ec377a4 实训任务 2017-03-21 12:35:55 +08:00
huang f5ba99393e 版本库样式冲突 2017-03-21 10:28:56 +08:00
daiao bc0c995a0c 实训tpi 2017-03-21 09:17:35 +08:00
daiao 6f4e4bea4c 实训tpi放大缩小效果 2017-03-20 20:04:50 +08:00
daiao 1d22b7e2b9 实训界面扩大缩小功能 2017-03-20 17:14:05 +08:00
daiao 8708fa4afc 实训任务 2017-03-20 15:41:56 +08:00
daiao 69e116806e 实训任务 2017-03-20 14:35:40 +08:00
daiao a11d527bf9 控制底部导航的位置 2017-03-19 15:39:09 +08:00
daiao 152da0ea37 实训新建任务添加标签 2017-03-17 13:40:03 +08:00
daiao 40d101119e 实训全部任务页面 2017-03-16 17:30:52 +08:00
huang 61db8041a4 输出结果关联 2017-03-16 10:26:02 +08:00
daiao d2bb822d84 新建阶段样例设置-添加样式输入与输出 2017-03-15 17:19:26 +08:00
huang c7cf576aae games下一关方法封装，部分模块封装 2017-03-15 17:15:41 +08:00
daiao 8886949dc9 实训 2017-03-14 17:25:06 +08:00
huang 6d55409a85 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-14 14:56:33 +08:00
huang 5992bcc128 版本库文件局部刷新 2017-03-14 14:56:08 +08:00
daiao fe021e04c2 实训tpm，新建实训页面 2017-03-14 14:52:37 +08:00
daiao fc673fb704 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 
Conflicts:
	public/stylesheets/css/taskstyle.css
 2017-03-14 14:41:50 +08:00
daiao 0b82b3e994 TPM实训index页面 2017-03-14 14:39:05 +08:00
huang 92d23ebb7b base myshixun框架，新字体引入 2017-03-14 13:38:02 +08:00
huang 38ff90a8bf myshixun模板 2017-03-14 11:25:01 +08:00
huang 6ec7769c0e Merge branch 'dev_bigdata' into dev_shixun_project 
Conflicts:
	app/controllers/account_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_logined_header.html.erb
	app/views/layouts/base_contest_community.html.erb
	app/views/layouts/base_contests.html.erb
	app/views/layouts/base_course_community.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_project_community.html.erb
	app/views/layouts/base_syllabus.html.erb
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/layouts/new_base_user_show.html.erb
	public/stylesheets/css/structure.css
 2017-03-14 09:30:02 +08:00
cxt 95595c6fe6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-03-03 15:37:55 +08:00
cxt 96312c6dfa Merge branch 'cxt_course' into develop 2017-03-03 14:45:30 +08:00
cxt 4688fbaec9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-03 14:45:17 +08:00
cxt f30507b6f0 在线测验改版 2017-03-03 14:43:51 +08:00
daiao d75cf47079 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-02 13:44:46 +08:00
daiao f15d00f0bd 新建项目如果描述为空的时候显示怪异 2017-03-01 09:40:20 +08:00
daiao 7fbfeef8f3 首页显示的个人信息区域需要更新显示 2017-02-28 15:24:28 +08:00
cxt baabce13b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
	public/stylesheets/css/common.css
	public/stylesheets/css/courses.css
 2017-02-28 10:15:33 +08:00
Linda ec6206d9d8 我的缺陷列表样式重写，需要重新加入后台元素 2017-02-27 17:00:43 +08:00
cxt 6329578f9b 没有登录平台或者没有加入竞赛的用户在点击作品提交时，请给出相应的提示 2017-02-27 14:12:49 +08:00
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