 yuanke
|
6191c3636d
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
public/javascripts/homework.js
|
2016-04-22 14:18:30 +08:00 |
|
yuanke
|
f503969702
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-22 14:16:26 +08:00 |
 huang
|
a985f6fee1
|
新建帖子/回帖不发送消息
|
2016-04-22 14:14:21 +08:00 |
|
yuanke
|
016177a078
|
Merge branch 'yuanke' into develop
|
2016-04-22 14:14:15 +08:00 |
|
yuanke
|
f6a5ffc6a5
|
测试代码的时候点击一下然后按钮消失等结果返回才出现
|
2016-04-22 14:13:24 +08:00 |
|
yuanke
|
5c5d212193
|
博客列表
|
2016-04-22 13:52:33 +08:00 |
|
huang
|
17b5832df0
|
Merge branch 'hjq_beidou' into develop
|
2016-04-22 12:45:05 +08:00 |
|
huang
|
c4bd78e442
|
讨论区代码还原及优化
|
2016-04-22 12:44:37 +08:00 |
 cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
2016-04-22 12:40:20 +08:00 |
|
cxt
|
7673fc41fb
|
作品列表页面增加提交作品的入口
|
2016-04-22 12:37:13 +08:00 |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
2016-04-22 11:27:30 +08:00 |
|
huang
|
aaeec3ab6c
|
版本库show页面代码简化封装
|
2016-04-22 10:58:41 +08:00 |
|
huang
|
e23262225a
|
版本库名不能是全数字
|
2016-04-22 10:34:45 +08:00 |
|
cxt
|
4448cb0891
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 17:02:04 +08:00 |
|
cxt
|
3fe2e81c0e
|
作业评分设置时比例NAN
|
2016-04-21 17:01:57 +08:00 |
|
cxt
|
16348654a5
|
启用匿评和禁用匿评时修改评分设置
|
2016-04-21 17:00:30 +08:00 |
|
huang
|
98da0ce6ca
|
修改版本库提示
|
2016-04-21 16:33:20 +08:00 |
|
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 16:21:49 +08:00 |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
2016-04-21 16:21:39 +08:00 |
|
huang
|
cb2033c80f
|
去掉rake中输出
|
2016-04-21 16:20:29 +08:00 |
|
huang
|
81f8559c48
|
gitlab版本库成员同步任务
|
2016-04-21 16:04:00 +08:00 |
|
yuanke
|
eddea2eabd
|
Merge branch 'yuanke' into yuanke_1
|
2016-04-21 14:01:54 +08:00 |
|
cxt
|
e6916f356a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 11:30:07 +08:00 |
 txz
|
d74410610f
|
Merge branch 'weixin_guange' into develop
|
2016-04-21 11:24:50 +08:00 |
|
txz
|
2345eb9d64
|
路径修改
|
2016-04-21 11:22:52 +08:00 |
|
cxt
|
6fe86fb24e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 11:22:14 +08:00 |
|
txz
|
0bab42256c
|
微信loading弹框改
|
2016-04-21 11:21:29 +08:00 |
|
huang
|
42076a137d
|
项目统计添加判断
|
2016-04-21 11:19:21 +08:00 |
|
yuanke
|
5a5afd6d24
|
Merge branch 'yuanke' into develop
|
2016-04-21 11:17:30 +08:00 |
|
yuanke
|
d538d1967b
|
解决管理员界面代码测试列表404的问题
|
2016-04-21 11:16:32 +08:00 |
|
cxt
|
7a90c0ea10
|
评分设置修改多项时不应发多条模板消息
|
2016-04-21 10:51:43 +08:00 |
|
huang
|
ba171c49cc
|
统计 改成 代码统计
|
2016-04-21 10:42:06 +08:00 |
|
txz
|
39c64c9198
|
解决冲突
|
2016-04-21 10:41:54 +08:00 |
|
txz
|
8e254ff722
|
微信loading弹框
|
2016-04-21 10:38:36 +08:00 |
|
huang
|
e8048f8eb7
|
完成版本库时间UTC与北京时间的转换
时间国际化问题
|
2016-04-21 10:09:52 +08:00 |
|
cxt
|
76b37d7670
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-21 10:02:16 +08:00 |
|
cxt
|
26b1aee90d
|
修改周海芳老师四个作业的截止日期和学生得分
|
2016-04-21 10:01:12 +08:00 |
|
yuanke
|
85055f2a84
|
博客列表修改
|
2016-04-21 09:39:21 +08:00 |
|
txz
|
6e6a29cfa6
|
api路径更改
|
2016-04-20 17:04:59 +08:00 |
|
huang
|
449bdf2225
|
完成版本库统计功能
|
2016-04-20 16:40:44 +08:00 |
|
yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 16:14:26 +08:00 |
|
yuanke
|
ff177557c8
|
修改代码测试列表报500
|
2016-04-20 16:13:06 +08:00 |
|
yuanke
|
29115bca3a
|
博客列表修改
|
2016-04-20 16:12:20 +08:00 |
|
txz
|
90a47ac158
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-20 15:45:39 +08:00 |
|
txz
|
0b82bf50c2
|
微信内容中图片正常显示
|
2016-04-20 15:45:33 +08:00 |
|
cxt
|
06f15735fe
|
Merge branch 'weixin_guange' into develop
|
2016-04-20 15:15:54 +08:00 |
|
cxt
|
aed3818273
|
点击模板消息跳到微信详情页面
|
2016-04-20 14:44:10 +08:00 |
|
yuanke
|
4182bb5fe7
|
111
|
2016-04-20 14:39:38 +08:00 |
|
cxt
|
ef987d6bf7
|
模板消息中有html标签
|
2016-04-20 10:44:54 +08:00 |
|
yuanke
|
c6174406fb
|
数据库语句使用rails已有的
|
2016-04-20 10:39:07 +08:00 |