 daiao
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
2016-07-29 22:03:45 +08:00 |
 yuanke
|
78e44617e3
|
Merge branch 'weixin_guange' into develop
|
2016-07-29 16:13:38 +08:00 |
|
daiao
|
4d3f4c358a
|
微信功能
|
2016-07-29 16:13:25 +08:00 |
 Tim
|
3d7b7b513b
|
隐藏文字超出省略号显示
|
2016-07-29 16:11:43 +08:00 |
|
Tim
|
43498e79e8
|
项目说明居中对齐
|
2016-07-29 16:09:55 +08:00 |
|
yuanke
|
18862fdee9
|
编辑课程文字修改
|
2016-07-29 16:06:30 +08:00 |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
2016-07-29 15:40:47 +08:00 |
|
yuanke
|
f1859151bc
|
修改新建项目、新建课程中的文字
|
2016-07-29 09:43:18 +08:00 |
|
Tim
|
6b89460295
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-28 17:11:56 +08:00 |
|
Tim
|
37e29404ba
|
微信班级管理图标可点击区域放大
|
2016-07-28 17:11:46 +08:00 |
|
yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
2016-07-28 15:23:12 +08:00 |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
2016-07-28 15:11:04 +08:00 |
|
Tim
|
4bbd72ecd2
|
发送班级页面发送按钮定位
|
2016-07-28 14:58:19 +08:00 |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
2016-07-28 14:49:45 +08:00 |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
2016-07-27 14:30:19 +08:00 |
|
Tim
|
e3057566c8
|
各详情页面内容和二级回复样式调整；回复详情内容不显示bug
|
2016-07-26 17:30:02 +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 |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
2016-07-25 15:31:44 +08:00 |
|
yuanke
|
b9b9a867f4
|
项目
|
2016-07-25 15:20:01 +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 |
|
txz
|
cef08a717c
|
课程名称过长时，邀请码无法点击bug
|
2016-07-22 16:09:47 +08:00 |
|
yuanke
|
cdb7782849
|
除了issue 和news都增加了二级回复显示
|
2016-07-22 15:37:25 +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
|
8fd915bf1a
|
issue标题改为问题
|
2016-07-21 17:18:09 +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
|
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 |
|
txz
|
53feb0bbd4
|
课程列表课程名称宽度限制
|
2016-07-20 09:11:05 +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 |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
2016-07-18 14:24:59 +08:00 |
|
yuanke
|
8968c991ff
|
微信：作业增加发送功能
|
2016-07-18 11:08:02 +08:00 |
|
yuanke
|
67fa6da8ae
|
我的资源界面加载前 不显示暂无数据
|
2016-07-15 19:18:30 +08:00 |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
2016-07-15 19:08:05 +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 |
|
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 |
|
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
|
c476dae15b
|
微信我的资源中 更多按钮暂时隐藏
|
2016-07-15 16:08:04 +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 |