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

3803 Commits

Author SHA1 Message Date
yuanke 9e66bcb2ab 微信通知二级回复修改 2016-09-08 18:11:40 +08:00
yuanke 5c626f94b5 微信二级回复框不显示修改 2016-09-08 18:04:37 +08:00
yuanke b43f8cf974 调试 2016-09-08 17:44:38 +08:00
yuanke 8f3a73d400 调试 2016-09-08 17:37:00 +08:00
yuanke b6fdbc11a6 微信回复框修改 2016-09-08 16:22:19 +08:00
yuanke ab383031a6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-08 15:56:21 +08:00
yuanke 58037c3796 微信二级回复修改 2016-09-08 15:56:09 +08:00
Tim e5b1b920e6 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-08 15:37:07 +08:00
Tim ca4c668c9b 邮箱提示位置调整 2016-09-08 15:36:58 +08:00
yuanke e74516cb68 微信修改个人资料 2016-09-08 15:34:48 +08:00
Tim 031ba38655 性别选框样式调整 2016-09-08 15:28:22 +08:00
yuanke 8584d1dccb 修改微信二级回复回复框的BUG 2016-09-08 15:05:27 +08:00
Tim 216c834a40 微信修改资料select框去边框；二级回复显隐点击效果更改 2016-09-08 14:15:00 +08:00
cxt ab0863c9fb 平台的邀请码提示 2016-09-08 13:59:48 +08:00
yuanke 1109eba460 微信上传图片功能先屏蔽 2016-09-08 08:46:29 +08:00
yuanke 18fbf305c1 微信上传头像大小限制为1M 2016-09-07 16:16:53 +08:00
Tim 2bb2a64dde 上传头像按钮和头像重合，并使上传按钮有效 2016-09-07 15:32:48 +08:00
cxt 0ae4d26ec0 课程大纲的内容区域应该和下面的回复区域的宽度一致 2016-09-07 15:22:15 +08:00
yuanke d8a4eb56cf 微信上传头像修改 2016-09-07 15:14:46 +08:00
yuanke 133b8af6ca Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-07 14:19:19 +08:00
yuanke c234a8d2cb 个人资料修改功能 2016-09-07 14:19:07 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例，课程说明 2016-09-07 11:24:38 +08:00
Tim 99e63b1477 班级推荐数字block颜色字体更改；测验学号超出省略号显示 2016-09-06 17:22:38 +08:00
Tim 01246f65ba Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-06 17:10:11 +08:00
Tim bd7cd7e244 二级回复点击显隐效果 2016-09-06 17:09:57 +08:00
yuanke c9c63eeb85 微信修改资料后台代码 2016-09-06 14:41:22 +08:00
Tim 96e7d14060 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-06 09:17:40 +08:00
Tim 05170c43ed 微信动态详情二级回复 2016-09-06 09:17:29 +08:00
cxt 7123c66481 课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面 2016-09-05 16:20:38 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
yuanke f540ac282d Merge branch 'weixin_guange' into develop 2016-09-02 16:37:16 +08:00
Tim 92ae8865f0 删注释 2016-09-02 16:35:16 +08:00
Tim 77c727e18a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-02 16:34:46 +08:00
Tim 7fe1394403 ios自动定位输入框 2016-09-02 16:34:33 +08:00
yuanke 6571b94bf1 Merge branch 'weixin_guange' into develop 2016-09-02 16:08:49 +08:00
yuanke ed7308969c 微信帖子删除后显示 2016-09-02 15:45:07 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
Tim d0a2ea02f2 学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示 2016-09-02 14:27:49 +08:00
Tim 9e317c4a8f 二级回复英文单词过长不折行 2016-09-02 13:54:34 +08:00
Tim 0974153364 课程加入路径显示 2016-09-02 13:49:08 +08:00
daiao 27ad94eac2 组织配置界面，成员列表分页 2016-09-02 13:25:01 +08:00
yuanke 12f854f31b Merge branch 'weixin_guange' into develop 2016-09-02 10:55:43 +08:00
yuanke a6bb19eb60 微信动态回复增加点赞 2016-09-02 10:54:40 +08:00
Tim 2316b3fe7b 回复添加点赞 2016-09-02 10:21:50 +08:00
yuanke 5cda2292d0 Merge branch 'weixin_guange' into develop 2016-09-02 09:48:35 +08:00
yuanke 5d47ee0c43 修改项目班级动态BUG 2016-09-02 09:42:45 +08:00
Tim 0dff52ff09 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-01 16:01:25 +08:00
Tim 40f5510195 侧导航文字和按钮不重合 2016-09-01 16:01:16 +08:00
yuanke aaa263f01e Merge branch 'weixin_guange' into develop 2016-09-01 15:58:16 +08:00
yuanke 0a398b38da 修改按钮颜色 2016-09-01 15:57:29 +08:00
Tim 4d93b860f9 作品信息确认时，描述文字折行 2016-09-01 15:35:45 +08:00
Tim d080f0bb16 Merge branch 'cs_optimize_txz' into develop 2016-09-01 14:34:56 +08:00
Tim 4c64e883ea 加入班级、项目时，增加获取邀请码提示 2016-09-01 14:30:21 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
Tim 76b7469f75 课程列表icon缩小 2016-09-01 14:04:53 +08:00
Tim 27a2da8b7b 意见反馈增加二维码 2016-09-01 13:56:13 +08:00
yuanke a6241afe04 . 2016-09-01 13:36:27 +08:00
yuanke 251fd36748 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-01 11:18:52 +08:00
yuanke d4f8bd29f4 班级项目成员管理BUG修改 2016-09-01 11:18:42 +08:00
huang 52a8a64a69 项目隐藏 项目讨论区发送中去掉课程 2016-09-01 10:48:13 +08:00
Tim 742100d9b5 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-01 10:41:32 +08:00
Tim 2251869881 iphone下视角滚动 2016-09-01 10:40:57 +08:00
yuanke 8644ad178c 修复班级项目 删除成员的BUG 2016-09-01 10:21:29 +08:00
yuanke c3c2516e6b 微信班级、项目增加删除成员和退出功能 2016-08-31 17:19:12 +08:00
daiao 548a263f0f 1.修复项目新闻发送至其他项目后，位于讨论区下的bug 
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
 2016-08-31 17:09:02 +08:00
cxt 9b3e1e0275 Merge branch 'develop' into cxt_course 2016-08-31 15:02:13 +08:00
cxt 9c327fe05e at符号前面是标点符号或没有空格还是弹出用户列表。 2016-08-31 14:59:27 +08:00
Tim eda735db58 footer文字居中 2016-08-31 14:40:34 +08:00
Tim d11f673711 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-31 14:30:32 +08:00
Tim ec15474c3a 成员管理更改时，确定按钮样式变更 2016-08-31 14:30:16 +08:00
yuanke 6c5eaf2779 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-31 14:21:50 +08:00
yuanke 292e778a8c 微信班级项目增加删除和退出功能 2016-08-31 14:21:38 +08:00
cxt a8575f2a15 暂时隐藏个人名片 2016-08-31 14:08:19 +08:00
Tim 48f110bbc8 新增退出项目，成员管理删除 2016-08-31 13:53:11 +08:00
Tim e0fed38f1d 新增退出班级及删除成员 2016-08-31 10:53:58 +08:00
yuanke e37a2fee1e Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-30 14:25:46 +08:00
yuanke b4a5179a1b 修改班级成员管里的配置返回后显示空白及@issue链接无效的问题 2016-08-30 14:25:36 +08:00
Tim 14ece14b78 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-30 14:12:15 +08:00
Tim bc1caf3d54 表情处理 2016-08-30 14:12:05 +08:00
yuanke 4e312595fe Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-30 14:08:23 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等 2016-08-30 14:08:10 +08:00
huang bbe44b3957 Merge branch 'develop' into rep_quality 2016-08-30 11:18:49 +08:00
Tim e30416f6b3 手机表情处理 2016-08-30 10:49:44 +08:00
huang ee2ae456ac unresolved issues for sonar 2016-08-30 10:43:47 +08:00
Tim ac0cc37fe4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 16:39:23 +08:00
Tim ea0211c9ca 组织搜索成员时，页数过多折行问题 2016-08-29 16:39:13 +08:00
cxt 4ff45c15a3 还原质量分析的代码 2016-08-29 15:43:32 +08:00
cxt acb18ca4c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:40:26 +08:00
cxt 3c5afb2b4f Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-29 15:35:04 +08:00
Tim a8d551105b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:28:45 +08:00
Tim 64b7aedd1c footer部分logo与链接替换更新 2016-08-29 15:28:32 +08:00
cxt 1e169985a4 访问计数的颜色调整 2016-08-29 15:23:35 +08:00
cxt 95ec047653 班级名称过长时，动态中标题显示与动态编辑图标按钮重叠 2016-08-29 14:12:42 +08:00
Tim a467338161 iphone定位js 2016-08-29 11:32:11 +08:00
huang a6f9c3375e 代码质量分析加入“未解决质量问题数” 2016-08-29 10:21:42 +08:00
Tim d940f957ec css问题更改 2016-08-26 18:36:59 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
Tim 3f7c623163 新增资源提示框 2016-08-26 15:57:45 +08:00
cxt 62e28f638c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 14:33:18 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
Tim a8f30fe85f 个人主页，课程，项目头像、logo增加编辑按钮 2016-08-26 11:31:54 +08:00
yuanke 82779c99ea 字符串去掉空白时，空格不去掉。 2016-08-26 09:59:00 +08:00
cxt f4b5a5cf4e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-26 09:23:33 +08:00
Tim fbad4ecd8a 班级页面logo及行间距调整；测导航数字大小背景调整 2016-08-25 17:52:19 +08:00
Tim 3e78dec32a 将课程、项目公用类放至public.css中 2016-08-25 16:07:57 +08:00
cxt cb5e5f18ce Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:59:15 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +08:00
yuanke ea238cd407 微信班级发布问题改为发起讨论 2016-08-25 15:45:39 +08:00
yuanke 589df7e498 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 15:34:22 +08:00
yuanke 5b73e7dc19 修改发布帖子标题的长度及班级动态中不显示头像 2016-08-25 15:34:13 +08:00
Tim 6b4e25520d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 14:30:50 +08:00
Tim 78123b5db7 iphone设备输入时，自动定位到输入框 2016-08-25 14:30:42 +08:00
yuanke bb2a1de98c 资源详情返回更多按钮BUG修改 2016-08-25 14:26:31 +08:00
yuanke fd2021a1fe 微信资源界面发送后返回处理 2016-08-25 14:05:21 +08:00
Tim ae09d7ff27 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 13:39:13 +08:00
Tim bb935e42a8 发帖时，标题字符限制；发布按钮不遮住输入框 2016-08-25 13:39:02 +08:00
yuanke aa11f39b2d Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/class.html
	public/javascripts/wechat/controllers/class.js
 2016-08-25 11:24:27 +08:00
yuanke 3673ed3f1d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 10:55:59 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +08:00
huang 61fe0fc77c 项目讨论区发帖时 标题为空 内容为空给出提示 2016-08-25 10:50:18 +08:00
yuanke f35c3e8528 微信新闻、issue增加二级回复等 2016-08-25 09:45:23 +08:00
Tim 7682a4d45d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-24 17:03:11 +08:00
Tim a13ec60173 修复无效的css 2016-08-24 17:02:59 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
cxt 6af43070c7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-24 13:56:53 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
yuanke c26f59e697 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-23 16:53:05 +08:00
yuanke c612104fab 微信增加发帖功能 2016-08-23 16:52:35 +08:00
Tim c8c5f5d415 iphone下flex无效 2016-08-23 16:36:59 +08:00
Tim 7d671c7758 调整输入框padding值 2016-08-23 15:04:48 +08:00
Tim 34acb1aa2f 课程项目增加发布按钮 2016-08-23 11:05:49 +08:00
yuanke e473a18487 提交错分支 还原 2016-08-23 10:26:39 +08:00
yuanke 55512f9eb2 Merge branch 'develop' into weixin_guange 2016-08-23 10:24:46 +08:00
Tim bbc0277d39 iphone端输入框js控制 2016-08-23 10:23:55 +08:00
yuanke 965d8930dc 班级增加动态 2016-08-23 10:23:46 +08:00
Tim 863ec9d396 iphone下输入框位置调整 2016-08-22 16:50:14 +08:00
yuanke 864c6c821f Merge branch 'weixin_guange' into develop 2016-08-22 16:50:13 +08:00
Tim 4f3f6358fc Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-22 14:30:00 +08:00
Tim a846eda77b 输入框padding调整；发帖样式新增 2016-08-22 14:29:43 +08:00
yuanke 75d81d5dba 前端判断是否绑定屏蔽 2016-08-22 14:09:29 +08:00
cxt 572ad5a162 个人主页的课程和项目展开出现重复数据 2016-08-22 10:49:46 +08:00
Tim 19becbfdf3 邀请内容更改 2016-08-14 16:06:37 +08:00
Tim 2659b742fd 成员管理头像高度不一致；邀请内容格式调整 2016-08-14 15:30:57 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
yuanke 8ab003d5ee 分享页提交回复未关注公众号会跳到二维码界面 2016-08-14 09:38:47 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
guange 70d58ccf85 恢复授权页 2016-08-13 15:24:52 +08:00
huang 0c6e1b2ccb 版本库样式修改，显示全时间 2016-08-13 14:42:51 +08:00
guange 4a88fbe3db . 2016-08-13 13:36:15 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
Tim 083d5453d4 加入课程、项目弹框，在内容部分不能拖拽 2016-08-13 10:00:31 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
Tim 6734904945 班级详情页面定位 2016-08-12 15:34:53 +08:00
Tim 5eb397aa2a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/login_tip.html
 2016-08-12 14:49:21 +08:00
Tim bdeb8297cb 关注提示页面 2016-08-12 14:45:33 +08:00
yuanke 2cfd876f2f 调试 2016-08-12 14:17:50 +08:00
yuanke 3b42861a54 分享修改 2016-08-12 13:33:57 +08:00
yuanke 822ca15c78 分享修改 2016-08-12 11:34:09 +08:00
yuanke c0dc070c15 分享修改 2016-08-12 11:25:43 +08:00
yuanke 5c42cdb39c 分享内容时改为用户信息授权方式 2016-08-12 10:40:36 +08:00
yuanke 6af15b7121 微信自动绑定用户修改 2016-08-12 09:23:09 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
yuanke c26e2a9acc 私有动态BUG修改 2016-08-11 14:09:41 +08:00
yuanke d74924ff67 私有动态提示修改 2016-08-11 13:51:20 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke 0d69fa0cc0 微信私有动态内容加上提示 2016-08-11 10:33:22 +08:00
yuanke 61ffa58896 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-11 09:59:00 +08:00
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
huang 56afad9242 质量分析列表中添加时间和版本 2016-08-11 09:48:29 +08:00
Tim 8d753f55dc 班级、项目动态增加“私有内容，谨慎传播”提示 2016-08-10 17:10:22 +08:00
Tim b5af6f2c7f 绑定说明页面 2016-08-10 16:45:31 +08:00
Tim f5f88c5204 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-10 16:09:13 +08:00
yuanke 57737ff15d 微信细节优化 2016-08-10 16:08:30 +08:00
Tim e85f9373c8 点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改 2016-08-10 15:37:08 +08:00
cxt fa07f2532f 题库弹框样式修改 2016-08-10 11:16:04 +08:00
cxt 0ed508a887 题库预览弹窗的调整 2016-08-09 17:09:36 +08:00
yuanke 66357c4024 修改分享链接 2016-08-09 17:01:06 +08:00
cxt 9594aada50 Merge branch 'cxt_course' into develop 
Conflicts:
	public/javascripts/application.js
 2016-08-09 16:42:23 +08:00
cxt fc3df1c26f 题库预览弹框的样式调整 2016-08-09 16:38:17 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
cxt 4a527dc84e Merge branch 'cs_optimize_txz' into develop 2016-08-09 15:25:01 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
yuanke b53979d91c 修改微信头像不显示的BUG，动态暂时全部去掉认证！ 2016-08-09 10:20:21 +08:00
yuanke bd908af765 修改报错BUG 2016-08-09 09:33:34 +08:00
yuanke 61ba668818 函数写错名称 2016-08-09 09:30:30 +08:00
yuanke 57f3aaa9e8 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-09 09:23:19 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
Tim cd30f94d72 题库发送预览弹框位置及可拖拽js更新 2016-08-05 18:01:11 +08:00
Tim d4f08f6498 课程logo替换，邀请码样式更改，班级路径显示主讲教师 2016-08-05 17:30:13 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop 
Conflicts:
	app/helpers/users_helper.rb
 2016-08-05 16:32:10 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
Tim e8d4bc0772 弹框可拖拽 2016-08-05 16:13:37 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang dd768c2913 Merge branch 'cs_optimize_txz' into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-08-05 15:30:03 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00