 yuanke
|
20d9e613b6
|
正式、测试版配置
|
2016-07-28 15:39:27 +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 |
|
Tim
|
318ef2bb30
|
微信定位高度
|
2016-07-28 14:35:50 +08:00 |
|
Tim
|
40bb59ea9d
|
微信定位
|
2016-07-28 10:43:54 +08:00 |
|
yuanke
|
4fe60bfc97
|
微信课程角色修改
|
2016-07-27 14:56:41 +08:00 |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
2016-07-27 14:30:19 +08:00 |
|
Tim
|
82ae7310dc
|
rake db生成文件
|
2016-07-27 09:32:10 +08:00 |
 guange
|
c5dd2eaf41
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-07-26 18:28:28 +08:00 |
|
guange
|
c63639b86a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-26 18:28:08 +08:00 |
|
guange
|
4bdb679352
|
将微信token缓存到rails体系里面
|
2016-07-26 18:27:27 +08:00 |
|
Tim
|
a2acbba34a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-26 17:30:27 +08:00 |
|
Tim
|
e3057566c8
|
各详情页面内容和二级回复样式调整；回复详情内容不显示bug
|
2016-07-26 17:30:02 +08:00 |
 cxt
|
1f8fa1c70a
|
班级动态去掉“>”
|
2016-07-26 17:16:42 +08:00 |
|
cxt
|
d17a9dabd8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/helpers/courses_helper.rb
|
2016-07-26 16:59:20 +08:00 |
 daiao
|
0d59f5a358
|
Merge branch 'daiao_dev' into develop
|
2016-07-26 16:57:18 +08:00 |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
2016-07-26 16:54:34 +08:00 |
|
daiao
|
5886a9898a
|
在单位名称列表的数据库表中，增加用户字段
|
2016-07-26 16:46:31 +08:00 |
 huang
|
f12423e8a6
|
issue动态中不能删除问题
|
2016-07-26 16:29:03 +08:00 |
|
huang
|
d51295127d
|
issue删除回复删除附件的问题 同事关联删除
|
2016-07-26 16:13:20 +08:00 |
|
daiao
|
3661969528
|
修改课程下，课件名称，显示尽可能全
|
2016-07-26 14:48:36 +08:00 |
|
daiao
|
1dcf4918b9
|
非管理员用户在新建帖子时，置顶及锁定功能在页面不显示
|
2016-07-26 14:30:12 +08:00 |
|
huang
|
e7f862458f
|
issue回复问题； 二级回复编辑issue弹空白框问题
|
2016-07-26 12:06:54 +08:00 |
|
daiao
|
6ab2c15504
|
修复先删除课程下的某班级，再删除该课程报错
|
2016-07-26 10:38:04 +08:00 |
|
yuanke
|
1ae23bafe4
|
改回原来的
|
2016-07-26 10:12:49 +08:00 |
|
yuanke
|
e6e8d73a66
|
修改动态详情
|
2016-07-26 09:46:55 +08:00 |
|
huang
|
b01e228d51
|
修复issue回复不能点击的问题
|
2016-07-26 09:19:55 +08:00 |
|
huang
|
77c7f7d07f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-26 09:03:04 +08:00 |
|
huang
|
2c8f94c899
|
去掉ID转换成用户login
|
2016-07-26 09:02:47 +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 |
|
daiao
|
67bdea314a
|
作品列表-分班过滤：点击“请选择分班”过滤显示所有学生
|
2016-07-25 19:53:56 +08:00 |
|
daiao
|
4646d13234
|
1.修改资源课程名称，竟可能显示全。
2.班级动态下，去掉“班级动态>”
|
2016-07-25 18:54:44 +08:00 |
|
daiao
|
a7b758a417
|
Merge branch 'develop' into daiao_dev
|
2016-07-25 18:41:57 +08:00 |
|
guange
|
652e56dec4
|
忽略wechat.yml
|
2016-07-25 18:16:47 +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 |
|
guange
|
5bd3e98f56
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-25 15:36:46 +08:00 |
|
guange
|
fb91309646
|
merge
|
2016-07-25 15:36:29 +08:00 |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
2016-07-25 15:31:44 +08:00 |
|
guange
|
e31fbe9b50
|
解决task报错，找不到uglifier的问题
|
2016-07-25 15:29:47 +08:00 |
|
yuanke
|
b9b9a867f4
|
项目
|
2016-07-25 15:20:01 +08:00 |
|
huang
|
7984affe36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-25 14:10:48 +08:00 |
|
daiao
|
72c23b4a72
|
Merge branch 'daiao_dev' into develop
|
2016-07-25 10:04:59 +08:00 |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
2016-07-25 10:03:50 +08:00 |
|
cxt
|
df80362899
|
增加空格
|
2016-07-25 09:58:17 +08:00 |
|
huang
|
1320097bf9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-25 09:47:37 +08:00 |