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

9869 Commits

Author SHA1 Message Date
guange 3df2a8a3cc 添加适合微信图文的图片 2016-01-20 22:03:18 +08:00
guange 5831068fbd 添加适合微信图文的图片 2016-01-20 22:02:07 +08:00
guange e576b5a800 关闭iphone首字大写 2016-01-20 21:57:48 +08:00
guange a5cc5d3761 更改页面样式 2016-01-20 21:52:36 +08:00
guange a585d618f1 更改页面样式 2016-01-20 21:49:22 +08:00
guange f39631169d 认证后回复消息 2016-01-19 15:29:03 +08:00
guange 7f5bb11a5f 认证后回复消息 2016-01-19 15:25:36 +08:00
guange 3a0f98ebea openid出错 2016-01-19 15:17:56 +08:00
guange f098e5358d openid出错 2016-01-19 15:12:00 +08:00
guange babf30af0a 界面优化 2016-01-19 15:06:40 +08:00
guange 349f511c12 开发环境不要弄9200报错 2016-01-19 14:56:52 +08:00
guange 527b695fab 绑定认证接口 bind 2016-01-19 14:46:16 +08:00
guange 0b1b8a4fcd 绑定认证接口 bind 2016-01-19 14:40:39 +08:00
guange 2681cc97dd 绑定用户前先录入用户资料 2016-01-19 14:39:31 +08:00
guange 80feca0c8c . 2016-01-19 14:32:22 +08:00
guange 8e66ab6a41 绑定认证接口 bind 2016-01-19 14:28:13 +08:00
guange 96d0b2e717 绑定用户事件 2016-01-19 14:07:59 +08:00
guange 571196ad2d wechat model完善 2016-01-19 12:00:13 +08:00
guange 08e193ea3c 添加微信用户表 2016-01-19 11:51:37 +08:00
guange 40047ff818 添加菜单事件 2016-01-19 11:51:26 +08:00
guange 5f6a3cac04 wechat init 2016-01-16 11:54:59 +08:00
guange b68eab23ea merge 2016-01-15 17:03:32 +08:00
guange 587d347178 added wechat 2016-01-15 17:01:30 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 15:42:36 +08:00
huang 86516df88a Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/helpers/application_helper.rb
 2016-01-15 15:41:02 +08:00
huang c936304314 课程默认收起 2016-01-15 15:37:17 +08:00
ouyangxuhua b9359b1cee 显示url申请 2016-01-15 13:15:17 +08:00
huang b6ae14a1ce 课程更多字体12 2016-01-15 12:51:50 +08:00
huang 81b32ea643 点击铃铛弹出新tab页 2016-01-15 12:39:38 +08:00
ouyangxuhua 16a3a7d06d 隐藏url定制 2016-01-14 21:42:28 +08:00
ouyangxuhua def640cd31 Merge branch 'dev_hjq' into develop 2016-01-14 21:31:29 +08:00
ouyangxuhua 7ad377f458 修改一些bug 2016-01-14 21:29:43 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
huang 9bbb1e0f90 修改fork时候项目ID问题 2016-01-14 20:48:12 +08:00
ouyangxuhua 5097f19ec8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/layouts/_user_projects.html.erb
	app/views/projects/set_public_or_private.js.erb
 2016-01-14 18:30:05 +08:00
ouyangxuhua 1c62edbed4 项目设为私有title更新 2016-01-14 18:26:36 +08:00
huang a114b7525d Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 18:25:56 +08:00
huang b3e6f6acd5 项目删除附件问题 
项目得分添加讨论回复计算
 2016-01-14 18:25:42 +08:00
cxt 894c97304c 冲突 2016-01-14 18:24:07 +08:00
cxt 25cc959576 Merge branch 'szzh' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb
 2016-01-14 18:22:57 +08:00
cxt 57cfe49602 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 18:08:19 +08:00
cxt cef9fd96cd 组织帖子的动态点赞 2016-01-14 18:05:58 +08:00
ouyangxuhua 0f0f1ae056 Merge branch 'dev_hjq' into szzh 
Conflicts:
	db/schema.rb
 2016-01-14 17:54:16 +08:00
ouyangxuhua 276b07df8a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 17:53:22 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
处理冲突
 2016-01-14 17:35:25 +08:00
huang a105ed6e00 项目得分弹出分类显示 2016-01-14 17:29:55 +08:00
cxt 7b4b575240 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 16:58:51 +08:00
cxt eb63ac59f2 作品提交不成功 2016-01-14 16:58:40 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +08:00