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

1006 Commits

Author SHA1 Message Date
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +08:00
yuanke 653b98d832 微信增加项目相关内容 2016-07-27 14:30:19 +08:00
yuanke e6e8d73a66 修改动态详情 2016-07-26 09:46:55 +08:00
yuanke 04e9551450 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-26 08:52:52 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
yuanke 4f803ce0de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-25 17:02:52 +08:00
yuanke db7c267a47 微信单个项目动态 2016-07-25 17:02:42 +08:00
guange 9d2900d58f 解决没绑定用户不跳转到绑定页问题 2016-07-25 16:59:52 +08:00
txz 12e845c3ab 课程列表与项目列表样式统一 2016-07-25 15:31:44 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +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
txz 216d590140 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-22 16:44:20 +08:00
txz c4f4908c62 资源tab定位 2016-07-22 16:44:16 +08:00
yuanke cedd7ae520 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-22 16:42:47 +08:00
cxt 27afee03b2 编辑课程的英文名称时输入框不清空 2016-07-22 16:38:09 +08:00
txz 7d2ba823e9 缓存动态页tab，详情返回到对应tab页 2016-07-22 16:26:43 +08:00
txz cef08a717c 课程名称过长时，邀请码无法点击bug 2016-07-22 16:09:47 +08:00
yuanke cdb7782849 除了issue 和news都增加了二级回复显示 2016-07-22 15:37:25 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
yuanke 0622978920 微信新用户注册后返回公众号 2016-07-21 16:59:47 +08:00
yuanke 9ababc5aa4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 16:50:32 +08:00
yuanke 5a8f1b3d83 绑定成功后返回公众号 2016-07-21 16:50:15 +08:00
txz 00c3e880e6 微信详情页面返回定位js 2016-07-21 16:21:00 +08:00
yuanke 86731c34d5 单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示! 2016-07-21 15:21:09 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
cxt 60bbe89c0d 博客的自动保存 2016-07-21 14:05:15 +08:00
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。 2016-07-21 14:03:04 +08:00
yuanke 67e87df4d5 微信动态详情回复显示修改 2016-07-20 13:34:58 +08:00
yuanke bf600e8f76 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-20 10:09:37 +08:00
yuanke 1ce7b22c0e 博客动态回复二级回复修改 2016-07-20 10:09:27 +08:00
txz 5b3c6cc012 输入框高度控制 2016-07-19 15:41:40 +08:00
yuanke 80843d5084 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-19 10:50:46 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改，我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
txz bc0d8cd299 管理班级重命名字体变灰 2016-07-19 10:25:45 +08:00
cxt fdf925a0b8 个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
yuanke ff13d2e572 微信增加作业发送，修改发送的权限，修改菜单 2016-07-18 14:24:59 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
yuanke 8968c991ff 微信：作业增加发送功能 2016-07-18 11:08:02 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
guange c14979d878 assets 2016-07-15 19:53:38 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
yuanke 67fa6da8ae 我的资源界面加载前 不显示暂无数据 2016-07-15 19:18:30 +08:00
yuanke 596bfe4bfc 邀请码分享问题修改 2016-07-15 19:08:05 +08:00
yuanke 7dd26bb5d9 邀请码BUG修改 2016-07-15 18:19:37 +08:00
guange 82aa369687 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 18:11:01 +08:00
guange c02245adfb 邀请码分享 2016-07-15 18:08:19 +08:00
yuanke 6385cc892f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:46:36 +08:00
yuanke 60dc0e72cf 微信我我的资源更多按钮显示 2016-07-15 16:46:27 +08:00
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 16:31:42 +08:00