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

3404 Commits

Author SHA1 Message Date
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
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +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
huang 4d79f93079 Merge branch 'cs_optimize_txz' into develop 2016-07-22 16:43:17 +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
yuanke 37a6adf428 二级回复代码统一写到comment_reply里面 2016-07-22 16:42:34 +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 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 1e28ff880d 新版课程大纲 2016-07-22 10:20:28 +08:00
yuanke 178222858c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 17:37:18 +08:00
yuanke 16fef58885 发送班级界面不显示没班级的课程 2016-07-21 17:37:03 +08:00
txz b638f9aea6 tab页issue标题改为问题 2016-07-21 17:33:20 +08:00
txz 19781ded4e 输入框padding调整 2016-07-21 17:22:03 +08:00
txz 8fd915bf1a issue标题改为问题 2016-07-21 17:18:09 +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
txz 4a58777bb9 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 15:56:31 +08:00
txz 0a0f8aefac 微信加入班级弹框css兼容；app页面meta标签修改 2016-07-21 15:56:27 +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
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange 2016-07-21 14:29:04 +08:00
cxt 60bbe89c0d 博客的自动保存 2016-07-21 14:05:15 +08:00
yuanke 92ffbcfce6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-21 14:03:16 +08:00
yuanke 7cd505ea4b 博客详情动态加入二级回复的展开功能一级一级回复的更多功能。 2016-07-21 14:03:04 +08:00
txz 24ee25e095 课程列表点击管理课程图标，列表展开bug修复 2016-07-21 13:54:03 +08:00
Tim fe105c84ad 弹框定位改为fixed 2016-07-21 10:18:58 +08:00
Tim 541440135f css中引用图片路径修改 2016-07-21 10:11:02 +08:00
Tim dcb541e889 资源库资源列表取消虚线 2016-07-20 17:10:51 +08:00
Tim 2850fe1b2b 预览图片边框阴影效果 2016-07-20 17:08:31 +08:00
Tim 85c9fb5dce 二级回复图片超出显示 2016-07-20 17:00:54 +08:00
Tim bf87ffb992 组织历史版本弹框文件夹图标问题 2016-07-20 16:21:58 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式；作业列表调整 2016-07-20 15:09:01 +08:00
yuanke ff42de619b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-20 14:06:16 +08:00
txz c56f7732a1 二级回复新样式 2016-07-20 14:05:17 +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 53feb0bbd4 课程列表课程名称宽度限制 2016-07-20 09:11:05 +08:00
txz 707df88c7f tab容器宽度百分百 2016-07-19 16:05:39 +08:00
txz 5b3c6cc012 输入框高度控制 2016-07-19 15:41:40 +08:00
txz 2af1a5ffb9 新增班级和管理班级输入框高度控制 2016-07-19 15:07:11 +08:00
txz 27965bee01 加入班级弹框样式统一 2016-07-19 11:17:46 +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
Tim 73401d6b41 下拉图标等显示 2016-07-19 09:09:13 +08:00
cxt fdf925a0b8 个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
Tim 76555680e0 项目css统一 2016-07-18 14:30:01 +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
txz b7477a73e4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 17:31:36 +08:00
txz 6491e16c64 微信课程列表底边重合问题 2016-07-15 17:31:33 +08:00
huang f9e03434c2 Merge branch 'develop' into rep_quality 2016-07-15 16:51:31 +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
huang 2af3c50dbc 里程碑区分issue状态“已解决”“已关闭” 对应不同样式 2016-07-15 16:43:07 +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
huang b2a8a0fed6 修复里程碑进度条数据显示错误的问题 2016-07-15 16:28:33 +08:00
txz 0d08d6b192 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:14:55 +08:00
txz 6063932840 课程管理中，对课程,班级名称编辑时，字体变灰 2016-07-15 16:14:52 +08:00
yuanke 9b17724ebf Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:08:42 +08:00
yuanke c476dae15b 微信我的资源中 更多按钮暂时隐藏 2016-07-15 16:08:04 +08:00
guange a177c48a29 erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 16:00:19 +08:00
yuanke 2cc42a8f5a 微信修改资源更多问题 2016-07-15 15:32:40 +08:00
guange fff6f4b310 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 14:50:21 +08:00
guange dd892993dd assets 2016-07-15 14:49:23 +08:00
cxt b7e6725e1f 管理员界面的课程名称双击可点击 2016-07-15 14:48:39 +08:00
guange 0e415fffff merge 2016-07-15 14:48:10 +08:00
yuanke ae0a4f8ce4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 14:44:48 +08:00
yuanke b540ff7017 我的资源里增加更多按钮 2016-07-15 14:44:37 +08:00
txz 5a463721b8 资源来源限制宽度 2016-07-15 14:09:22 +08:00
txz 08c6c16cfd 课程，项目详情页面属性字体减小 2016-07-15 10:56:54 +08:00
txz 54887112e4 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-15 10:52:46 +08:00
txz df8b995d41 作业，项目属性字体减小 2016-07-15 10:52:43 +08:00
yuanke dc2ba96353 用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级 2016-07-15 10:26:37 +08:00
cxt 7ea5d7d934 新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
yuanke 16e029d340 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-14 17:39:31 +08:00
yuanke 4c39dcc677 微信：修改班级下有挂起作业所有作业都不显示的BUG，将班级下作业、测验发送按钮屏蔽 2016-07-14 17:39:22 +08:00