 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 |
|
huang
|
3485d48163
|
Merge branch 'develop' into rep_quality
Conflicts:
app/controllers/quality_analysis_controller.rb
|
2016-07-14 14:08:03 +08:00 |
|
huang
|
8c6fca87c9
|
项目动态中，新闻添加快捷操作，所有操作默认显示
|
2016-07-14 13:57:06 +08:00 |
|
huang
|
00c414c347
|
issue回复填写正确的样式问题
|
2016-07-14 11:14:05 +08:00 |
|
huang
|
9b59ca20de
|
修复issue详情页面，删除回复后再编辑保存issue弹出白色框问题
|
2016-07-14 10:39:54 +08:00 |
 yuanke
|
15ccf5cfbe
|
Merge branch 'yuanke' into develop
|
2016-07-13 15:56:44 +08:00 |
|
huang
|
61bf6604b1
|
解决ajax情况下，issue状态选框不显示问题
|
2016-07-13 12:23:28 +08:00 |
|
huang
|
ef931d1491
|
编辑issue，与回复issue冲突问题（局部刷新）
|
2016-07-13 12:07:27 +08:00 |
|
huang
|
845f36c4f3
|
解决z注册时候邮箱不能是大写加下划线的形式
|
2016-07-13 10:00:04 +08:00 |
|
yuanke
|
b4ac13c157
|
修改编程作业没main函数系统评分100的BUG
|
2016-07-13 09:36:43 +08:00 |
|
huang
|
191261d3b8
|
each time to 10s
|
2016-07-12 17:30:29 +08:00 |
 guange
|
4908a68a7d
|
时间utc问题
|
2016-07-12 16:49:15 +08:00 |
|
guange
|
ae3212082c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-12 16:35:15 +08:00 |
|
guange
|
8df0dcae7a
|
调用编辑接口不成功时，打印具体的信息
|
2016-07-12 16:35:06 +08:00 |
|
huang
|
e766adf087
|
add delete to qa
|
2016-07-12 16:23:30 +08:00 |
 cxt
|
66c40ba139
|
动态的更新时间
|
2016-07-12 09:41:00 +08:00 |
|
cxt
|
89819f5ccd
|
消息列表
|
2016-07-11 17:33:11 +08:00 |
|
huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
2016-07-11 17:02:25 +08:00 |
|
huang
|
8b5a2ac1cb
|
message 500
|
2016-07-11 16:59:37 +08:00 |
|
cxt
|
d21eaf9154
|
未配置班级列表的班级重命名
|
2016-07-11 15:32:01 +08:00 |
|
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
2016-07-11 15:16:27 +08:00 |
|
cxt
|
d71e10c8ac
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-11 15:16:04 +08:00 |
|
cxt
|
0b4db97756
|
班级动态
|
2016-07-11 15:15:38 +08:00 |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
|
cxt
|
834e72b0f8
|
未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除
|
2016-07-11 14:43:22 +08:00 |
|
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
2016-07-11 11:34:07 +08:00 |
|
huang
|
0a001b4f76
|
message 500 for boliang
|
2016-07-11 11:29:15 +08:00 |
|
huang
|
93e79d9419
|
add hidden to css
|
2016-07-11 11:23:59 +08:00 |
|
huang
|
bac3e433aa
|
sqlate index nil
|
2016-07-11 11:07:04 +08:00 |
|
huang
|
831006f3c6
|
css for sqale_index
|
2016-07-11 10:57:46 +08:00 |
|
huang
|
cb148c3b9c
|
fixed 500
|
2016-07-11 10:48:44 +08:00 |
|
cxt
|
8e8d6a8439
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
2016-07-11 08:48:03 +08:00 |
|
cxt
|
239f4e67eb
|
Merge branch 'develop' into cxt_course
|
2016-07-11 08:47:32 +08:00 |
|
guange
|
c7bb53d2bd
|
在服务端加上imagemagick
|
2016-07-09 13:39:50 +08:00 |
|
guange
|
99a27766be
|
.
|
2016-07-09 10:34:05 +08:00 |
|
guange
|
09a97fc9d8
|
.
|
2016-07-09 10:23:49 +08:00 |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
2016-07-09 10:13:05 +08:00 |
|
guange
|
f5b4bc3e43
|
merge
|
2016-07-09 09:23:19 +08:00 |
|
guange
|
2a2fe9e81d
|
解决android缓存问题
|
2016-07-09 09:22:41 +08:00 |
|
guange
|
0984c389ae
|
菜单配置
|
2016-07-09 09:20:00 +08:00 |
|
huang
|
817eaf318a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 21:30:36 +08:00 |
|
huang
|
f77bad34ad
|
缩短时间
|
2016-07-08 21:29:47 +08:00 |
|
yuanke
|
c33bb4709c
|
微信正式版配置
|
2016-07-08 21:01:10 +08:00 |
|
guange
|
8800290db9
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-07-08 20:49:55 +08:00 |
|
guange
|
9c00b38358
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 20:49:31 +08:00 |
|
huang
|
ee149d15bf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 20:39:50 +08:00 |
|
huang
|
8785264e07
|
Merge branch 'rep_quality' into develop
|
2016-07-08 20:39:43 +08:00 |
|
huang
|
62cb7d4568
|
add css
|
2016-07-08 20:35:21 +08:00 |