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

4294 Commits

Author SHA1 Message Date
daiao f39166542f 实训tpm样式调整 2017-03-31 14:07:52 +08:00
huang 3c5807343d 实训新建及编辑的时候添加语言 2017-03-31 10:07:08 +08:00
daiao adf6ca742f 实训宽版tpi 2017-03-30 16:35:37 +08:00
daiao 60355b3276 实训tpi界面调整 2017-03-30 10:55:43 +08:00
daiao eea8939c49 实训tpi 2017-03-30 09:04:52 +08:00
daiao 2aaaf5469a 实训过关/通关弹框 2017-03-29 17:44:02 +08:00
daiao f597027de5 新框架下TPI实训任务 2017-03-29 14:34:14 +08:00
Linda a8c73578e1 减小应用flex样式文件 2017-03-28 14:15:53 +08:00
Linda 101ab9af2a 实训TPI使用flext布局 2017-03-28 14:03:14 +08:00
daiao 483d182cfd 实训编辑 2017-03-24 22:11:05 +08:00
cxt a4be0daaf1 footer的调整 2017-03-24 20:27:38 +08:00
cxt 1f6751a80c Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 20:20:50 +08:00
daiao 61e3e1b5f3 新建编辑阶段行距修改（不能在css中直接影响整体行距） 2017-03-24 20:11:02 +08:00
cxt 1a3ac939d8 文件整理 2017-03-24 19:35:08 +08:00
cxt 51aaf56f7b 搜狗浏览器下当前账号显示有误 2017-03-24 19:33:32 +08:00
Linda db536ece50 行间距修改 2017-03-24 18:35:07 +08:00
cxt e3150716f3 Merge branch 'dev_bigdata' into dev_shixun_project 
Conflicts:
	app/views/layouts/_footer.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/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	db/schema.rb
	public/stylesheets/css/structure.css
	public/stylesheets/font/FontAwesome.otf
	public/stylesheets/font/fontawesome-webfont.eot
	public/stylesheets/font/fontawesome-webfont.svg
	public/stylesheets/font/fontawesome-webfont.ttf
	public/stylesheets/font/fontawesome-webfont.woff
	public/stylesheets/font2/FontAwesome.otf
	public/stylesheets/font2/fontawesome-webfont.eot
	public/stylesheets/font2/fontawesome-webfont.svg
	public/stylesheets/font2/fontawesome-webfont.ttf
	public/stylesheets/font2/fontawesome-webfont.woff
	public/stylesheets/fonts/FontAwesome.otf
	public/stylesheets/fonts/fontawesome-webfont.eot
	public/stylesheets/fonts/fontawesome-webfont.svg
	public/stylesheets/fonts/fontawesome-webfont.ttf
	public/stylesheets/fonts/fontawesome-webfont.woff
 2017-03-24 16:17:01 +08:00
cxt 324d14ee92 新版登录和注册 2017-03-24 16:05:52 +08:00
Linda 6c62d7be0b 头部标题样式修改 
删除成功提示
 2017-03-24 15:41:29 +08:00
Linda 5925b975f2 全部任务tag样式修改 2017-03-24 14:20:27 +08:00
Linda 82fdb9c867 导航选中样式修改 
新建实训选中提示修改
 2017-03-24 14:05:47 +08:00
huang c3708d723e Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 17:41:48 +08:00
huang 62ab862516 tpm权限控制 
及index一些统计
 2017-03-23 17:41:32 +08:00
daiao e4985ce3bd 实训任务 2017-03-23 16:51:32 +08:00
daiao 6f00a89cfa 保存修改-宽版 2017-03-23 09:30:19 +08:00
daiao 2a90ed3a42 实训任务 2017-03-22 14:24:22 +08:00
huang 9f0128a878 shixun新建和编辑同步 2017-03-22 10:30:20 +08:00
daiao a9ccb3b7b9 实训任务 2017-03-21 14:15:01 +08:00
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
cxt c4d9f3c67c Merge branch 'develop' into dev_bigdata 
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-15 15:28:56 +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