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

328 Commits

Author SHA1 Message Date
daiao 2aaaf5469a 实训过关/通关弹框 2017-03-29 17:44:02 +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
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
huang 5992bcc128 版本库文件局部刷新 2017-03-14 14:56:08 +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
daiao 7fbfeef8f3 首页显示的个人信息区域需要更新显示 2017-02-28 15:24:28 +08:00
Linda 89dc320027 合作伙伴图片 及项目管理脚本录入界面 2017-02-19 15:28:57 +08:00
daiao 3cad78a991 增加合作伙伴的显示 2017-02-17 10:09:10 +08:00
daiao 3e705fabb8 平台底部调整（去除底部图片，增加合作伙伴一栏） 2017-02-09 10:47:18 +08:00
daiao eb5f5f9ede 资源库：上传资源弹框使用新样式 2017-02-08 13:42:53 +08:00
huang 9dc6b6a5ce 样式修改 2017-01-25 10:31:44 +08:00
huang a9429a81ef 样式调整 2017-01-24 10:46:41 +08:00
huang de41150f26 新版一些改动 2017-01-23 18:34:33 +08:00
huang 2009520c7a 首页改版 2017-01-23 15:44:09 +08:00
huang 4c0b40fd88 首页登录等功能 2017-01-20 15:26:20 +08:00
Linda b631c9402f 删除不需要图片 2017-01-11 09:19:27 +08:00
cxt 44e1a09906 竞赛图片上传 2017-01-06 15:03:01 +08:00
黄井泉 74b37947f1 Merge branch 'develop' into 'develop' 
本周上限任务



See merge request !95
 2016-12-30 17:33:30 +08:00
cxt cde8a8957c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-30 16:37:43 +08:00
cxt 6ba5f124e3 竞赛相关icon更换 2016-12-30 13:58:40 +08:00
cxt 619dfa7a7a 竞赛首页的图标更改 2016-12-30 11:30:28 +08:00
cxt c1b5f8d77d 786竞赛图片更换 2016-12-28 10:21:11 +08:00
daiao 64c6fa1f37 首页显示的个人信息区域北京，换成灰度背景 2016-12-28 09:55:59 +08:00
huang 01d9fbbef3 组织base框架 2016-12-22 14:47:42 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +08:00
cxt 0338e80f34 班级左侧导航栏的“+” 2016-11-18 19:39:36 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
cxt 79b6a99324 班级左侧导航栏的发布icon简化 2016-11-15 09:30:45 +08:00
cxt 0ed878e718 404、403、500页面 2016-11-14 15:36:36 +08:00
huang 459c592f68 项目名称样式调整 2016-10-28 16:20:36 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
daiao 3d5509593b 配置页面，里程碑页面点击名字跳错路径 2016-10-28 09:04:16 +08:00
Tim acda8ca15c 单选题增加操作栏；多选题增加选项上下限；数字随选项数实时变化js实现 2016-10-27 09:02:56 +08:00
huang 5368d6755e 没有数据可供显示提示 2016-10-26 19:11:50 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
huang db50d32f78 二级回复样式 2016-10-24 11:33:06 +08:00
huang ac54d02bdc pull request 列表页面 2016-10-21 11:19:56 +08:00
daiao 295524af5c 项目里程碑样式 2016-10-20 13:58:41 +08:00
Tim 7d3847656b 分班名称过长折行显示问题；分班编辑按钮定位；分班icon css 2016-09-30 17:01:55 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
Tim 13f3ffec9f 侧导航调整 2016-09-23 16:47:12 +08:00
daiao 7b5fc8b323 issues列表功能 2016-09-23 14:53:36 +08:00
Tim 86a3ce185d 个人主页侧导航宽度限制更改，提示框效果及js实现 2016-09-23 14:17:23 +08:00
daiao b300c85227 issue界面功能调整 2016-09-23 09:05:26 +08:00
Tim a0772332da 项目侧导航快捷按钮样式更改 2016-09-22 17:04:45 +08:00
Tim 7cd2a98f11 侧导航课程、班级名称长度控制；箭头替换；tip显示更改 2016-09-14 16:50:46 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
Tim 76b7469f75 课程列表icon缩小 2016-09-01 14:04:53 +08:00
Tim 64b7aedd1c footer部分logo与链接替换更新 2016-08-29 15:28:32 +08:00