Commit Graph

335 Commits

Author SHA1 Message Date
txz 717bbe2ffa 回复框多行提交后初始化 2016-07-12 14:33:52 +08:00
txz 4434eb3620 回复框固定在最下显示 2016-07-12 14:10:30 +08:00
txz 9d91e9397b 微信邀请码提示文字修改 2016-07-12 11:01:01 +08:00
txz f33feb7d84 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-12 10:43:26 +08:00
txz 243f0bbe7d 微信详情内容与回复中链接添加蓝色 2016-07-12 10:43:21 +08:00
yuanke d4681eea00 我的资源里面显示来源 和大小 并可以下载课件 2016-07-12 10:25:18 +08:00
yuanke 14b7b04e4d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-11 16:55:56 +08:00
txz dc6127eb78 微信我的资源样式更改 2016-07-11 16:54:58 +08:00
yuanke 70ed5790b8 修改在动态详情点赞返回和点赞状态不一致的BUG 2016-07-11 16:46:07 +08:00
txz bd29859a28 创建课程和参与课程区分样式 2016-07-11 14:46:35 +08:00
txz 0093a0a509 微信邀请提示文字更改 2016-07-11 14:23:53 +08:00
txz 114512d3d9 资源宽度限制 2016-07-11 11:05:49 +08:00
txz 2e75fa4b23 课程动态中新建课程改为新建班级 2016-07-11 10:42:07 +08:00
guange 2b17828844 rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 19:59:16 +08:00
guange 2604f3f0c7 资源搜索中只匹配name 2016-07-08 19:59:10 +08:00
yuanke f8eb150530 新增班级不完成点返回班级会出现再课程列表的BUG 2016-07-08 19:12:26 +08:00
guange 1413fe82dc merge 2016-07-08 17:44:13 +08:00
yuanke 8d8de084ac Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:23:44 +08:00
yuanke c6099177a4 修改微信发送资源平台不显示发送人的问题,删除班级提示文字不居中的问题等 2016-07-08 17:22:58 +08:00
txz ea5bd94e99 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:22:50 +08:00
txz 9ae7461501 资源列表学生进入时也显示为课件;课程tab页样式替换 2016-07-08 17:22:44 +08:00
guange 3c36e97ff1 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 17:11:41 +08:00
guange 3c23560d77 我的资源搜索无效 2016-07-08 17:11:16 +08:00
yuanke d38ce793bd Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-08 16:23:29 +08:00
yuanke bb62ba40b7 修改微信权限问题、管理课程界面等 2016-07-08 16:23:07 +08:00
txz ed39b4b4f1 动态:创建班级;学生进入资源也显示课件;已有班级和新增班级颜色区分 2016-07-08 11:29:33 +08:00
yuanke 3a6470b1f3 删除班级时增加提示确定信息 2016-07-07 14:55:41 +08:00
guange a17a6ed596 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-07 14:35:26 +08:00
guange 10789d2505 added alert2 2016-07-07 14:35:15 +08:00
yuanke 9d46040f7a 课程列表 + - 按钮增加效果,资源发送界面课程列表显示和课程列表界面保持一直 2016-07-06 17:08:22 +08:00
yuanke b994e786ab 我的动态中三类动态之间切换的效果 2016-07-06 11:06:32 +08:00
txz 7a9665bbee 微信详情页面样式调整 2016-07-05 11:18:58 +08:00
txz 8a59623a73 项目问题,项目讨论区,博客,留言详情页面样式更新 2016-07-05 10:15:32 +08:00
txz 64a1d197ee Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-04 17:06:47 +08:00
txz 3066a564bd 课程作业详情页面样式更新 2016-07-04 17:06:43 +08:00
guange 373e3d3422 merge 2016-07-04 17:06:26 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
yuanke 08f263128c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-04 16:53:10 +08:00
yuanke 9d0b5789d9 1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改 2016-07-04 16:50:49 +08:00
txz 45b824938e 课程讨论区与课程通知详情页面样式更新 2016-07-04 16:41:41 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +08:00
txz bd1aae07fd 微信动态页面样式更新 2016-07-04 14:43:51 +08:00
guange 3c295ba5a1 merge 2016-07-04 10:54:03 +08:00
guange b010ce2e61 发送课程完成 2016-07-02 23:46:45 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-07-01 11:30:24 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
guange c248249983 注册没有loading图问题 2016-06-29 21:11:21 +08:00
guange 0bb5c8b5fb 注册绑定问题 2016-06-29 21:09:49 +08:00
guange 047903ddff 重构课程地址 2016-06-28 10:57:58 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00