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

273 Commits

Author SHA1 Message Date
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt b7c05fed4a 首页样式和js调整 2016-08-04 16:33:51 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
yuanke f0cf7adcdf 加入项目邀请码 2016-08-01 11:14:03 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
cxt a1149c1104 班级列表的公开私有 2016-07-27 14:07:16 +08:00
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程 2016-07-26 16:45:36 +08:00
huang 463c09f02c 项目邀请弹框 2016-07-26 08:55:07 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
Tim fe105c84ad 弹框定位改为fixed 2016-07-21 10:18:58 +08:00
txz a43da43072 checked.png替换 2016-07-14 17:34:26 +08:00
txz dc6127eb78 微信我的资源样式更改 2016-07-11 16:54:58 +08:00
txz cf304c2b68 dot.png图片更新 2016-07-11 15:10:52 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
 2016-07-01 11:31:51 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
cxt 383483de26 课程大纲的左侧栏base，新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
 2016-06-24 19:17:26 +08:00
guange da09983f9e Merge branch 'weixin_guange' into cxt_course 2016-06-24 15:34:32 +08:00
huang 9f15a8aa4e 代码质量分析样式 2016-06-22 17:40:13 +08:00
guange 4b813ef535 加入班级消息 2016-06-20 17:26:29 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
huang 227f2343a4 登录注册背景图片替换 2016-06-16 17:14:13 +08:00
huang 24b12513e5 铃铛颜色 2016-06-16 11:16:41 +08:00
huang a2c5cc6da1 登录界面base及新页面 2016-06-15 15:41:13 +08:00
huang 2d2e9c540a 默认图片及顺序 2016-06-03 14:14:50 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang 471ed7cbd2 组织logo获取，添加样式图片 2016-05-30 14:58:46 +08:00
huang 3ba4d09336 Merge branch 'weixin_guange' into develop 2016-05-27 15:29:25 +08:00
txz 29faa015ab 微信图标替换，增加空值回复赞文字 2016-05-27 14:01:16 +08:00
huang 25aaa4b5bc 铃铛、搜索颜色 2016-05-27 11:07:27 +08:00
cxt 99c1821b4e Merge branch 'weixin_guange' into develop 2016-05-27 08:56:26 +08:00
txz 9134e55606 动态纯文本模式，图标处理 2016-05-26 17:40:22 +08:00
cxt ff974d6901 Merge branch 'weixin_guange' into develop 
Conflicts:
	app/views/wechats/login.html.erb
 2016-05-26 15:32:00 +08:00
cxt 4d5ee5a722 微信的欢迎图片及欢迎词的修改,测试版的配置 2016-05-26 15:27:31 +08:00
txz 1c95e76209 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-05-26 10:55:18 +08:00
txz c73ce61afe 微信动态可点击，icon图片替换 2016-05-26 10:55:00 +08:00
cxt b1a58ecfb8 Merge branch 'weixin_guange' into develop 
Conflicts:
	1234567
 2016-05-24 20:51:24 +08:00
txz 29ceb7b8e9 微信图标清晰问题，回复点赞右对齐 2016-05-24 15:01:26 +08:00
huang c749fe381b Merge branch 'weixin_guange' into develop 2016-05-20 21:02:01 +08:00
txz d329b60a8a 微信加载中去白底，内容去除固定行高 2016-05-20 20:26:04 +08:00
huang 52c8593b09 组织教师列表sql优化 2016-05-11 16:20:55 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
Tim d0f97275cc 组织二级栏目显隐效果 2016-05-05 16:20:49 +08:00
huang 8a14ce004f 以弹框模式显示二级目录 2016-05-04 15:05:54 +08:00
Tim ebe6004833 组织二级目录添加列表 2016-04-29 10:53:04 +08:00
yuanke 647e6a7f92 Merge branch 'yuanke' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
	config/locales/zh.yml
	db/schema.rb
 2016-04-28 10:45:57 +08:00
huang b596c0d66f 二级目录的创建等 2016-04-28 10:25:26 +08:00