 huang
|
5c046f922e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-18 11:25:57 +08:00 |
|
huang
|
097374df14
|
去掉全局变量，通过filter获取
|
2016-07-18 11:25:45 +08:00 |
|
huang
|
3198f8a473
|
解决版本库提交记录中：上传图片或者非可以预览文件 显示详情500问题
|
2016-07-18 11:17:22 +08:00 |
 yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
2016-07-15 19:53:33 +08:00 |
 guange
|
c14979d878
|
assets
|
2016-07-15 19:53:38 +08:00 |
 cxt
|
c9e0143fe8
|
作业动态的时间
|
2016-07-15 19:36:46 +08:00 |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
2016-07-15 19:08:05 +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 |
|
yuanke
|
ba1af901ad
|
强制更新myresource.js
|
2016-07-15 17:39:21 +08:00 |
|
cxt
|
48e5a0be7e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-15 17:38:56 +08:00 |
|
cxt
|
fcc8a08138
|
课程列表的样式问题
|
2016-07-15 17:38:10 +08:00 |
|
huang
|
4c5052dce2
|
作业按更新时间排序
|
2016-07-15 17:28:57 +08:00 |
|
cxt
|
5b070b6acc
|
消息列表的html标签
|
2016-07-15 16:52:18 +08:00 |
|
huang
|
f9e03434c2
|
Merge branch 'develop' into rep_quality
|
2016-07-15 16:51:31 +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 |
|
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 |
|
cxt
|
dbc8f87346
|
Merge branch 'yuanke' into develop
|
2016-07-15 15:56:37 +08:00 |
|
cxt
|
1c967ce569
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/users/_user_message_system.html.erb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-07-15 15:53:32 +08:00 |
|
cxt
|
e260c0b7cc
|
Merge branch 'cxt_course' into develop
|
2016-07-15 15:49:27 +08:00 |
|
cxt
|
05fe987a8b
|
新手注册三条留言
|
2016-07-15 15:43:35 +08:00 |
|
cxt
|
11e0101f56
|
导航栏题库中 我的题库放在前面
|
2016-07-15 15:06:33 +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
|
b540ff7017
|
我的资源里增加更多按钮
|
2016-07-15 14:44:37 +08:00 |
|
huang
|
4e3a7e8df1
|
新建版本“日期”--》“截止日止”
|
2016-07-15 14:11:51 +08:00 |
|
huang
|
77e4a66e7e
|
模式切换刷新后引起的样式问题
|
2016-07-15 13:50:15 +08:00 |
|
huang
|
38cc3c2010
|
发送过来的资源在项目中添加动态
|
2016-07-15 11:31:31 +08:00 |
|
cxt
|
fd68479d72
|
课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级
|
2016-07-15 11:02:53 +08:00 |
|
huang
|
97b1ea22e7
|
解决：Firefox浏览器中：资源库，先点击资源描述编辑图标按钮（笔），再点击页面空白处，如图两个资源之间有一段空白
|
2016-07-15 10:51:44 +08:00 |
|
yuanke
|
dc2ba96353
|
用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级
|
2016-07-15 10:26:37 +08:00 |
|
cxt
|
7ea5d7d934
|
新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示
|
2016-07-15 10:21:59 +08:00 |
|
yuanke
|
4be95cd9c5
|
班级内作业课件测验等增加排序
|
2016-07-15 09:52:57 +08:00 |
|
yuanke
|
b8c8b2c4ae
|
修改加入班级的提示
|
2016-07-15 09:48:10 +08:00 |
|
yuanke
|
6ab1269c01
|
修改微信反馈框加入重复班级提示有误的问题
|
2016-07-15 09:16:37 +08:00 |
|
yuanke
|
4c39dcc677
|
微信：修改班级下有挂起作业所有作业都不显示的BUG，将班级下作业、测验发送按钮屏蔽
|
2016-07-14 17:39:22 +08:00 |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
2016-07-14 17:23:48 +08:00 |
|
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
2016-07-14 17:19:47 +08:00 |
|
yuanke
|
c524409e4a
|
修改进入某个班级报错的BUG
|
2016-07-14 17:15:49 +08:00 |
|
yuanke
|
9c560e56b6
|
微信修改 不能直接给数据库对象增加新属性
|
2016-07-14 16:54:43 +08:00 |
|
huang
|
7da67350fd
|
issue列表进入详情页面，弹出新页面
|
2016-07-14 15:31:25 +08:00 |
|
huang
|
e98d7a213f
|
系统消息点击跳转列表定位
|
2016-07-14 15:23:16 +08:00 |
|
huang
|
f7c9bc0a19
|
消息跳转定位
|
2016-07-14 15:04:58 +08:00 |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
2016-07-14 14:44:47 +08:00 |