 yuanke
|
7dd26bb5d9
|
邀请码BUG修改
|
2016-07-15 18:19:37 +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
|
69009122e6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 17:39:28 +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
|
7725db9c69
|
题库报500
|
2016-07-15 17:38:32 +08:00 |
|
cxt
|
fcc8a08138
|
课程列表的样式问题
|
2016-07-15 17:38:10 +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 |
 huang
|
4c5052dce2
|
作业按更新时间排序
|
2016-07-15 17:28:57 +08:00 |
|
cxt
|
5b070b6acc
|
消息列表的html标签
|
2016-07-15 16:52:18 +08:00 |
|
huang
|
7b75664b82
|
Merge branch 'rep_quality' into develop
|
2016-07-15 16:52:07 +08:00 |
|
huang
|
f9e03434c2
|
Merge branch 'develop' into rep_quality
|
2016-07-15 16:51:31 +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 |
|
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 |
|
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
|
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 |
|
guange
|
a177c48a29
|
erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 16:00:19 +08:00 |
|
cxt
|
dbc8f87346
|
Merge branch 'yuanke' into develop
|
2016-07-15 15:56:37 +08:00 |
|
cxt
|
f7942e4d3c
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
db/schema.rb
|
2016-07-15 15:55:41 +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 |
|
yuanke
|
2cc42a8f5a
|
微信修改资源更多问题
|
2016-07-15 15:32:40 +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 |
|
huang
|
87e1e0c4b1
|
rake任务，课程作业关联项目后获取最新版本库提交时间
|
2016-07-15 14:45:06 +08:00 |
|
guange
|
8c2ae92d31
|
加入性能分析
|
2016-07-15 14:45:01 +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 |
|
yuanke
|
b540ff7017
|
我的资源里增加更多按钮
|
2016-07-15 14:44:37 +08:00 |
|
huang
|
4e3a7e8df1
|
新建版本“日期”--》“截止日止”
|
2016-07-15 14:11:51 +08:00 |
|
txz
|
5a463721b8
|
资源来源限制宽度
|
2016-07-15 14:09:22 +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 |
|
txz
|
08c6c16cfd
|
课程，项目详情页面属性字体减小
|
2016-07-15 10:56:54 +08:00 |
|
txz
|
54887112e4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 10:52:46 +08:00 |
|
txz
|
df8b995d41
|
作业，项目属性字体减小
|
2016-07-15 10:52:43 +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 |